ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-27 12:51:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Some beginning python3 porting for modules which have unittests

Browse source
This commit is contained in:
Toshio Kuratomi 2016-04-27 07:17:05 -07:00 • committed by Matt Clay
parent 8397c8169c
commit 5f0dc2b90f
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/cloud/docker/docker.py
View file

@ -528,7 +528,12 @@ import sys
import json import json
import os import os
import shlex import shlex
from urlparse import urlparse try:
from urlparse import urlparse
except ImportError:
# python3
from urllib.parse import urlparse
try: try:
import docker.client import docker.client
import docker.utils import docker.utils

6
lib/ansible/modules/packaging/os/apt.py
View file

@ -487,7 +487,8 @@ def install_deb(m, debs, cache, force, install_recommends, allow_unauthenticated
# to install so they're all done in one shot # to install so they're all done in one shot
deps_to_install.extend(pkg.missing_deps) deps_to_install.extend(pkg.missing_deps)
except Exception, e: except Exception:
e = get_exception()
m.fail_json(msg="Unable to install package: %s" % str(e)) m.fail_json(msg="Unable to install package: %s" % str(e))
# and add this deb to the list of packages to install # and add this deb to the list of packages to install
@ -643,7 +644,8 @@ def download(module, deb):
f.write(data) f.write(data)
f.close() f.close()
deb = package deb = package
except Exception, e: except Exception:
e = get_exception()
module.fail_json(msg="Failure downloading %s, %s" % (deb, e)) module.fail_json(msg="Failure downloading %s, %s" % (deb, e))
return deb return deb