Fixing Docker compile time errors irt exception handling for Python 3
This commit is contained in:
parent
3fa745eef9
commit
e2dbd0f445
3 changed files with 17 additions and 17 deletions
|
@ -724,7 +724,7 @@ class TaskParameters(DockerBaseClass):
|
||||||
if client.module.params.get(param_name):
|
if client.module.params.get(param_name):
|
||||||
try:
|
try:
|
||||||
setattr(self, param_name, human_to_bytes(client.module.params.get(param_name)))
|
setattr(self, param_name, human_to_bytes(client.module.params.get(param_name)))
|
||||||
except ValueError, exc:
|
except ValueError as exc:
|
||||||
self.fail("Failed to convert %s to bytes: %s" % (param_name, exc))
|
self.fail("Failed to convert %s to bytes: %s" % (param_name, exc))
|
||||||
|
|
||||||
self.ports = self._parse_exposed_ports()
|
self.ports = self._parse_exposed_ports()
|
||||||
|
@ -1016,7 +1016,7 @@ class TaskParameters(DockerBaseClass):
|
||||||
limits['hard'] = int(pieces[2])
|
limits['hard'] = int(pieces[2])
|
||||||
try:
|
try:
|
||||||
results.append(Ulimit(**limits))
|
results.append(Ulimit(**limits))
|
||||||
except ValueError, exc:
|
except ValueError as exc:
|
||||||
self.fail("Error parsing ulimits value %s - %s" % (limit, exc))
|
self.fail("Error parsing ulimits value %s - %s" % (limit, exc))
|
||||||
return results
|
return results
|
||||||
|
|
||||||
|
@ -1037,7 +1037,7 @@ class TaskParameters(DockerBaseClass):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return LogConfig(**options)
|
return LogConfig(**options)
|
||||||
except ValueError, exc:
|
except ValueError as exc:
|
||||||
self.fail('Error parsing logging options - %s' % (exc))
|
self.fail('Error parsing logging options - %s' % (exc))
|
||||||
|
|
||||||
def _get_environment(self):
|
def _get_environment(self):
|
||||||
|
@ -1062,7 +1062,7 @@ class TaskParameters(DockerBaseClass):
|
||||||
if network['Name'] == network_name:
|
if network['Name'] == network_name:
|
||||||
network_id = network['Id']
|
network_id = network['Id']
|
||||||
break
|
break
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error getting network id for %s - %s" % (network_name, str(exc)))
|
self.fail("Error getting network id for %s - %s" % (network_name, str(exc)))
|
||||||
return network_id
|
return network_id
|
||||||
|
|
||||||
|
@ -1699,7 +1699,7 @@ class ContainerManager(DockerBaseClass):
|
||||||
if not self.check_mode:
|
if not self.check_mode:
|
||||||
try:
|
try:
|
||||||
self.client.disconnect_container_from_network(container.Id, diff['parameter']['id'])
|
self.client.disconnect_container_from_network(container.Id, diff['parameter']['id'])
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error disconnecting container from network %s - %s" % (diff['parameter']['name'],
|
self.fail("Error disconnecting container from network %s - %s" % (diff['parameter']['name'],
|
||||||
str(exc)))
|
str(exc)))
|
||||||
# connect to the network
|
# connect to the network
|
||||||
|
@ -1715,7 +1715,7 @@ class ContainerManager(DockerBaseClass):
|
||||||
self.log("Connecting conainer to network %s" % diff['parameter']['id'])
|
self.log("Connecting conainer to network %s" % diff['parameter']['id'])
|
||||||
self.log(params, pretty_print=True)
|
self.log(params, pretty_print=True)
|
||||||
self.client.connect_container_to_network(container.Id, diff['parameter']['id'], **params)
|
self.client.connect_container_to_network(container.Id, diff['parameter']['id'], **params)
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error connecting container to network %s - %s" % (diff['parameter']['name'], str(exc)))
|
self.fail("Error connecting container to network %s - %s" % (diff['parameter']['name'], str(exc)))
|
||||||
return self._get_container(container.Id)
|
return self._get_container(container.Id)
|
||||||
|
|
||||||
|
@ -1725,7 +1725,7 @@ class ContainerManager(DockerBaseClass):
|
||||||
if not self.check_mode:
|
if not self.check_mode:
|
||||||
try:
|
try:
|
||||||
self.client.disconnect_container_from_network(container.Id, network['id'])
|
self.client.disconnect_container_from_network(container.Id, network['id'])
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error disconnecting container from network %s - %s" % (network['name'],
|
self.fail("Error disconnecting container from network %s - %s" % (network['name'],
|
||||||
str(exc)))
|
str(exc)))
|
||||||
return self._get_container(container.Id)
|
return self._get_container(container.Id)
|
||||||
|
@ -1740,7 +1740,7 @@ class ContainerManager(DockerBaseClass):
|
||||||
if not self.check_mode:
|
if not self.check_mode:
|
||||||
try:
|
try:
|
||||||
new_container = self.client.create_container(image, **create_parameters)
|
new_container = self.client.create_container(image, **create_parameters)
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error creating container: %s" % str(exc))
|
self.fail("Error creating container: %s" % str(exc))
|
||||||
return self._get_container(new_container['Id'])
|
return self._get_container(new_container['Id'])
|
||||||
return new_container
|
return new_container
|
||||||
|
@ -1752,7 +1752,7 @@ class ContainerManager(DockerBaseClass):
|
||||||
if not self.check_mode:
|
if not self.check_mode:
|
||||||
try:
|
try:
|
||||||
self.client.start(container=container_id)
|
self.client.start(container=container_id)
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error starting container %s: %s" % (container_id, str(exc)))
|
self.fail("Error starting container %s: %s" % (container_id, str(exc)))
|
||||||
return self._get_container(container_id)
|
return self._get_container(container_id)
|
||||||
|
|
||||||
|
@ -1765,7 +1765,7 @@ class ContainerManager(DockerBaseClass):
|
||||||
if not self.check_mode:
|
if not self.check_mode:
|
||||||
try:
|
try:
|
||||||
response = self.client.remove_container(container_id, v=volume_state, link=link, force=force)
|
response = self.client.remove_container(container_id, v=volume_state, link=link, force=force)
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error removing container %s: %s" % (container_id, str(exc)))
|
self.fail("Error removing container %s: %s" % (container_id, str(exc)))
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
@ -1778,7 +1778,7 @@ class ContainerManager(DockerBaseClass):
|
||||||
if not self.check_mode and callable(getattr(self.client, 'update_container')):
|
if not self.check_mode and callable(getattr(self.client, 'update_container')):
|
||||||
try:
|
try:
|
||||||
self.client.update_container(container_id, **update_parameters)
|
self.client.update_container(container_id, **update_parameters)
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error updating container %s: %s" % (container_id, str(exc)))
|
self.fail("Error updating container %s: %s" % (container_id, str(exc)))
|
||||||
return self._get_container(container_id)
|
return self._get_container(container_id)
|
||||||
|
|
||||||
|
@ -1792,7 +1792,7 @@ class ContainerManager(DockerBaseClass):
|
||||||
response = self.client.kill(container_id, signal=self.parameters.kill_signal)
|
response = self.client.kill(container_id, signal=self.parameters.kill_signal)
|
||||||
else:
|
else:
|
||||||
response = self.client.kill(container_id)
|
response = self.client.kill(container_id)
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error killing container %s: %s" % (container_id, exc))
|
self.fail("Error killing container %s: %s" % (container_id, exc))
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
@ -1809,7 +1809,7 @@ class ContainerManager(DockerBaseClass):
|
||||||
response = self.client.stop(container_id, timeout=self.parameters.stop_timeout)
|
response = self.client.stop(container_id, timeout=self.parameters.stop_timeout)
|
||||||
else:
|
else:
|
||||||
response = self.client.stop(container_id)
|
response = self.client.stop(container_id)
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error stopping container %s: %s" % (container_id, str(exc)))
|
self.fail("Error stopping container %s: %s" % (container_id, str(exc)))
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
|
@ -213,7 +213,7 @@ class ImageManager(DockerBaseClass):
|
||||||
for image in images:
|
for image in images:
|
||||||
try:
|
try:
|
||||||
inspection = self.client.inspect_image(image['Id'])
|
inspection = self.client.inspect_image(image['Id'])
|
||||||
except Exception, exc:
|
except Exception as exc:
|
||||||
self.fail("Error inspecting image %s - %s" % (image['Id'], str(exc)))
|
self.fail("Error inspecting image %s - %s" % (image['Id'], str(exc)))
|
||||||
results.append(inspection)
|
results.append(inspection)
|
||||||
return results
|
return results
|
||||||
|
|
|
@ -183,7 +183,7 @@ class LoginManager(DockerBaseClass):
|
||||||
reauth=self.reauthorize,
|
reauth=self.reauthorize,
|
||||||
dockercfg_path=self.config_path
|
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.fail("Logging into %s for user %s failed - %s" % (self.registry_url, self.username, str(exc)))
|
||||||
self.results['login_result'] = response
|
self.results['login_result'] = response
|
||||||
|
|
||||||
|
@ -209,14 +209,14 @@ class LoginManager(DockerBaseClass):
|
||||||
if not os.path.exists(config_path_dir):
|
if not os.path.exists(config_path_dir):
|
||||||
try:
|
try:
|
||||||
os.makedirs(config_path_dir)
|
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.fail("Error: failed to create %s - %s" % (config_path_dir, str(exc)))
|
||||||
self.write_config(path, dict(auths=dict()))
|
self.write_config(path, dict(auths=dict()))
|
||||||
|
|
||||||
def write_config(self, path, config):
|
def write_config(self, path, config):
|
||||||
try:
|
try:
|
||||||
json.dump(config, open(path, "w"), indent=5, sort_keys=True)
|
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)))
|
self.fail("Error: failed to write config to %s - %s" % (path, str(exc)))
|
||||||
|
|
||||||
def update_config_file(self):
|
def update_config_file(self):
|
||||||
|
|
Loading…
Reference in a new issue