summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2019-01-09 11:14:08 -0800
committerJoffrey F <joffrey@docker.com>2019-01-09 11:18:40 -0800
commit72f4f527ad60b2a677b883dc54669ebe98f0879f (patch)
tree403923054d1b5242366c7385e62ed257e39b9bb6 /docker
parent5fc7f62ec478e98c9230fe6e0f9a1e1146e4e904 (diff)
downloaddocker-py-fix_test_deps.tar.gz
Update test dependencies to latest version, fix some flake8 errorsfix_test_deps
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/auth.py2
-rw-r--r--docker/types/containers.py11
2 files changed, 6 insertions, 7 deletions
diff --git a/docker/auth.py b/docker/auth.py
index 58b35eb..638ab9b 100644
--- a/docker/auth.py
+++ b/docker/auth.py
@@ -273,7 +273,7 @@ class AuthConfig(dict):
'Password': data['Secret'],
})
return res
- except dockerpycreds.CredentialsNotFound as e:
+ except dockerpycreds.CredentialsNotFound:
log.debug('No entry found')
return None
except dockerpycreds.StoreError as e:
diff --git a/docker/types/containers.py b/docker/types/containers.py
index d040c0f..fd8cab4 100644
--- a/docker/types/containers.py
+++ b/docker/types/containers.py
@@ -51,8 +51,7 @@ class LogConfig(DictType):
... host_config=hc)
>>> client.inspect_container(container)['HostConfig']['LogConfig']
{'Type': 'json-file', 'Config': {'labels': 'production_status,geo', 'max-size': '1g'}}
-
- """ # flake8: noqa
+ """ # noqa: E501
types = LogConfigTypesEnum
def __init__(self, **kwargs):
@@ -320,10 +319,10 @@ class HostConfig(dict):
if not isinstance(ulimits, list):
raise host_config_type_error('ulimits', ulimits, 'list')
self['Ulimits'] = []
- for l in ulimits:
- if not isinstance(l, Ulimit):
- l = Ulimit(**l)
- self['Ulimits'].append(l)
+ for lmt in ulimits:
+ if not isinstance(lmt, Ulimit):
+ lmt = Ulimit(**lmt)
+ self['Ulimits'].append(lmt)
if log_config is not None:
if not isinstance(log_config, LogConfig):