diff options
| author | Felix Fontein <felix@fontein.de> | 2019-08-09 23:50:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 23:50:11 +0200 |
| commit | 3290b8343cd905182a9be2f184294256c1fd1d0c (patch) | |
| tree | 133c067d69ff7a3c30b844c82b27bf7c6786da11 /contrib | |
| parent | 4f78b694f001a3234ece7024dfe92ecb0ddd0b17 (diff) | |
| download | ansible-3290b8343cd905182a9be2f184294256c1fd1d0c.tar.gz | |
docker: fix sanity errors (#60047)
* Remove sanity check errors.
* More linting.
* Forgot to update places.
* Remove choices which aren't provided in argspec.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/inventory/docker.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/inventory/docker.py b/contrib/inventory/docker.py index 1b92b4c527..489c820a23 100755 --- a/contrib/inventory/docker.py +++ b/contrib/inventory/docker.py @@ -20,6 +20,10 @@ # along with Ansible. If not, see <http://www.gnu.org/licenses/>. # +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + + DOCUMENTATION = ''' Docker Inventory Script @@ -383,7 +387,7 @@ except ImportError as exc: # Client has recently been split into DockerClient and APIClient try: from docker import Client -except ImportError as exc: +except ImportError as dummy: try: from docker import APIClient as Client except ImportError as exc: |