Update bare exceptions to specify Exception.

This will keep us from accidentally catching program-exiting exceptions
like KeyboardInterupt and SystemExit.
This commit is contained in:
Toshio Kuratomi
2018-09-07 17:59:46 -07:00
parent 5147e792d3
commit 3fba006207
320 changed files with 659 additions and 656 deletions

View File

@@ -890,7 +890,7 @@ try:
else:
from docker.utils.types import Ulimit, LogConfig
from docker.errors import APIError, NotFound
except Exception as dummy:
except Exception:
# missing docker-py handled in ansible.module_utils.docker
pass

View File

@@ -263,7 +263,7 @@ try:
from docker.errors import NotFound
if LooseVersion(docker_version) >= LooseVersion('2.0.0'):
from docker.types import IPAMPool, IPAMConfig
except Exception as dummy:
except Exception:
# missing docker-py handled in ansible.module_utils.docker_common
pass

View File

@@ -471,7 +471,7 @@ from ansible.module_utils._text import to_text
try:
from distutils.version import LooseVersion
from docker import types
except Exception as dummy:
except Exception:
# missing docker-py handled in ansible.module_utils.docker
pass
@@ -846,7 +846,7 @@ class DockerService(DockerBaseClass):
network_id = None
try:
network_id = list(filter(lambda n: n['name'] == network_name, docker_networks))[0]['id']
except Exception as dummy:
except Exception:
pass
if network_id:
networks.append({'Target': network_id})