summaryrefslogtreecommitdiff
path: root/docker/utils/__init__.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-08-03 16:48:41 -0700
committerJoffrey F <joffrey@docker.com>2016-08-03 16:48:41 -0700
commit9d48b4f60323db22c45437892e450bf8e545d3ef (patch)
treea22d3d7e3bb0783697952707efc0b6295774a5da /docker/utils/__init__.py
parent67098f38df6606ab7c75d7db64c1552efbda8f49 (diff)
downloaddocker-py-test_fixes_1.12.tar.gz
Test fixes and updated Makefile for 1.12 testingtest_fixes_1.12
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/utils/__init__.py')
-rw-r--r--docker/utils/__init__.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/docker/utils/__init__.py b/docker/utils/__init__.py
index ccc3819..41df004 100644
--- a/docker/utils/__init__.py
+++ b/docker/utils/__init__.py
@@ -1,11 +1,12 @@
+# flake8: noqa
from .utils import (
compare_version, convert_port_bindings, convert_volume_binds,
mkbuildcontext, tar, exclude_paths, parse_repository_tag, parse_host,
- kwargs_from_env, convert_filters, datetime_to_timestamp, create_host_config,
- create_container_config, parse_bytes, ping_registry, parse_env_file,
- version_lt, version_gte, decode_json_header, split_command,
+ kwargs_from_env, convert_filters, datetime_to_timestamp,
+ create_host_config, create_container_config, parse_bytes, ping_registry,
+ parse_env_file, version_lt, version_gte, decode_json_header, split_command,
create_ipam_config, create_ipam_pool, parse_devices, normalize_links,
-) # flake8: noqa
+)
-from .types import Ulimit, LogConfig # flake8: noqa
-from .decorators import check_resource, minimum_version, update_headers #flake8: noqa
+from .types import Ulimit, LogConfig
+from .decorators import check_resource, minimum_version, update_headers