internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing Docker compile time errors irt exception handling for Python 3

Browse Source
This commit is contained in:
Mike Mars
2016-06-02 14:30:35 -07:00
committed by Matt Clay
parent 3fa745eef9
commit e2dbd0f445
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/modules/cloud/docker/docker_login.py
View File

@@ -183,7 +183,7 @@ class LoginManager(DockerBaseClass):
reauth=self.reauthorize,
dockercfg_path=self.config_path
)
except Exception, exc:
except Exception as exc:
self.fail("Logging into %s for user %s failed - %s" % (self.registry_url, self.username, str(exc)))
self.results['login_result'] = response
@@ -209,14 +209,14 @@ class LoginManager(DockerBaseClass):
if not os.path.exists(config_path_dir):
try:
os.makedirs(config_path_dir)
except Exception, exc:
except Exception as exc:
self.fail("Error: failed to create %s - %s" % (config_path_dir, str(exc)))
self.write_config(path, dict(auths=dict()))
def write_config(self, path, config):
try:
json.dump(config, open(path, "w"), indent=5, sort_keys=True)
except Exception, exc:
except Exception as exc:
self.fail("Error: failed to write config to %s - %s" % (path, str(exc)))
def update_config_file(self):