diff --git a/lib/ansible/modules/cloud/docker/docker.py b/lib/ansible/modules/cloud/docker/docker.py index 7efde161aa..87c9df2de5 100644 --- a/lib/ansible/modules/cloud/docker/docker.py +++ b/lib/ansible/modules/cloud/docker/docker.py @@ -528,7 +528,12 @@ import sys import json import os import shlex -from urlparse import urlparse +try: + from urlparse import urlparse +except ImportError: + # python3 + from urllib.parse import urlparse + try: import docker.client import docker.utils diff --git a/lib/ansible/modules/packaging/os/apt.py b/lib/ansible/modules/packaging/os/apt.py index 796d1010c9..6f116907da 100644 --- a/lib/ansible/modules/packaging/os/apt.py +++ b/lib/ansible/modules/packaging/os/apt.py @@ -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 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)) # and add this deb to the list of packages to install @@ -643,7 +644,8 @@ def download(module, deb): f.write(data) f.close() deb = package - except Exception, e: + except Exception: + e = get_exception() module.fail_json(msg="Failure downloading %s, %s" % (deb, e)) return deb