From 6220636536963680a5808dca2943cbc62a2fd409 Mon Sep 17 00:00:00 2001 From: Ben Firshman Date: Wed, 14 Sep 2016 16:54:54 +0100 Subject: [PATCH] Fix a few pep8 issues autopep8 --in-place --recursive --experimental -aaa --ignore E309 . Signed-off-by: Ben Firshman --- docker/__init__.py | 2 +- docker/auth/__init__.py | 2 +- docker/ssladapter/__init__.py | 2 +- docker/ssladapter/ssladapter.py | 1 + docker/tls.py | 2 +- docker/transport/__init__.py | 2 +- docker/transport/npipesocket.py | 1 + docker/types/swarm.py | 7 +++++-- docker/utils/ports/__init__.py | 2 +- tests/unit/api_test.py | 2 +- tests/unit/image_test.py | 6 +++--- 11 files changed, 17 insertions(+), 12 deletions(-) diff --git a/docker/__init__.py b/docker/__init__.py index ad53805e..0f4c8ecd 100644 --- a/docker/__init__.py +++ b/docker/__init__.py @@ -3,4 +3,4 @@ from .version import version, version_info __version__ = version __title__ = 'docker-py' -from .client import Client, AutoVersionClient, from_env # flake8: noqa +from .client import Client, AutoVersionClient, from_env # flake8: noqa diff --git a/docker/auth/__init__.py b/docker/auth/__init__.py index 6fc83f83..50127fac 100644 --- a/docker/auth/__init__.py +++ b/docker/auth/__init__.py @@ -5,4 +5,4 @@ from .auth import ( load_config, resolve_authconfig, resolve_repository_name, -) # flake8: noqa \ No newline at end of file +) # flake8: noqa diff --git a/docker/ssladapter/__init__.py b/docker/ssladapter/__init__.py index 1a5e1bb6..31b8966b 100644 --- a/docker/ssladapter/__init__.py +++ b/docker/ssladapter/__init__.py @@ -1 +1 @@ -from .ssladapter import SSLAdapter # flake8: noqa +from .ssladapter import SSLAdapter # flake8: noqa diff --git a/docker/ssladapter/ssladapter.py b/docker/ssladapter/ssladapter.py index e17dfad9..31f45fc4 100644 --- a/docker/ssladapter/ssladapter.py +++ b/docker/ssladapter/ssladapter.py @@ -24,6 +24,7 @@ if sys.version_info[0] < 3 or sys.version_info[1] < 5: class SSLAdapter(HTTPAdapter): '''An HTTPS Transport Adapter that uses an arbitrary SSL version.''' + def __init__(self, ssl_version=None, assert_hostname=None, assert_fingerprint=None, **kwargs): self.ssl_version = ssl_version diff --git a/docker/tls.py b/docker/tls.py index 7abfa60e..18c72598 100644 --- a/docker/tls.py +++ b/docker/tls.py @@ -42,7 +42,7 @@ class TLSConfig(object): ) if not (tls_cert and tls_key) or (not os.path.isfile(tls_cert) or - not os.path.isfile(tls_key)): + not os.path.isfile(tls_key)): raise errors.TLSParameterError( 'Path to a certificate and key files must be provided' ' through the client_config param' diff --git a/docker/transport/__init__.py b/docker/transport/__init__.py index d647483e..04a46d98 100644 --- a/docker/transport/__init__.py +++ b/docker/transport/__init__.py @@ -3,4 +3,4 @@ from .unixconn import UnixAdapter try: from .npipeconn import NpipeAdapter except ImportError: - pass \ No newline at end of file + pass diff --git a/docker/transport/npipesocket.py b/docker/transport/npipesocket.py index 9010cebe..d3847c3f 100644 --- a/docker/transport/npipesocket.py +++ b/docker/transport/npipesocket.py @@ -26,6 +26,7 @@ class NpipeSocket(object): and server-specific methods (bind, listen, accept...) are not implemented. """ + def __init__(self, handle=None): self._timeout = win32pipe.NMPWAIT_USE_DEFAULT_WAIT self._handle = handle diff --git a/docker/types/swarm.py b/docker/types/swarm.py index 865fde62..49beaa11 100644 --- a/docker/types/swarm.py +++ b/docker/types/swarm.py @@ -8,8 +8,11 @@ class SwarmSpec(dict): self['Orchestration'] = { 'TaskHistoryRetentionLimit': task_history_retention_limit } - if any([snapshot_interval, keep_old_snapshots, - log_entries_for_slow_followers, heartbeat_tick, election_tick]): + if any([snapshot_interval, + keep_old_snapshots, + log_entries_for_slow_followers, + heartbeat_tick, + election_tick]): self['Raft'] = { 'SnapshotInterval': snapshot_interval, 'KeepOldSnapshots': keep_old_snapshots, diff --git a/docker/utils/ports/__init__.py b/docker/utils/ports/__init__.py index 1dbfa3a7..485feec0 100644 --- a/docker/utils/ports/__init__.py +++ b/docker/utils/ports/__init__.py @@ -1,4 +1,4 @@ from .ports import ( split_port, build_port_bindings -) # flake8: noqa +) # flake8: noqa diff --git a/tests/unit/api_test.py b/tests/unit/api_test.py index 389b5f53..c9706fbb 100644 --- a/tests/unit/api_test.py +++ b/tests/unit/api_test.py @@ -327,7 +327,7 @@ class DockerApiTest(DockerClientTest): # mock a stream interface raw_resp = urllib3.HTTPResponse(body=body) setattr(raw_resp._fp, 'chunked', True) - setattr(raw_resp._fp, 'chunk_left', len(body.getvalue())-1) + setattr(raw_resp._fp, 'chunk_left', len(body.getvalue()) - 1) # pass `decode=False` to the helper raw_resp._fp.seek(0) diff --git a/tests/unit/image_test.py b/tests/unit/image_test.py index b2b1dd6d..cca519e3 100644 --- a/tests/unit/image_test.py +++ b/tests/unit/image_test.py @@ -271,9 +271,9 @@ class ImageTest(DockerClientTest): } encoded_auth = auth.encode_header(auth_config) self.client.push( - fake_api.FAKE_IMAGE_NAME, tag=fake_api.FAKE_TAG_NAME, - auth_config=auth_config - ) + fake_api.FAKE_IMAGE_NAME, tag=fake_api.FAKE_TAG_NAME, + auth_config=auth_config + ) fake_request.assert_called_with( 'POST',