summaryrefslogtreecommitdiff
path: root/cloudinit/CloudConfig/cc_update_hostname.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2011-01-26 09:03:46 -0500
committerScott Moser <smoser@ubuntu.com>2011-01-26 09:03:46 -0500
commitbe11324740ad4624c45a6e909643ab84aecdbf16 (patch)
treea7a2a7e8a4b4a05ea5a071610b7c52bf4e6ef810 /cloudinit/CloudConfig/cc_update_hostname.py
parentf69109bb2be91a7210a88bfb1b4467f80dc6ba64 (diff)
downloadvyos-cloud-init-be11324740ad4624c45a6e909643ab84aecdbf16.tar.gz
vyos-cloud-init-be11324740ad4624c45a6e909643ab84aecdbf16.zip
change 'except' syntax to python 3 style.
Everywhere that there occurred: except Exception, e: changed to except Exception as e:
Diffstat (limited to 'cloudinit/CloudConfig/cc_update_hostname.py')
-rw-r--r--cloudinit/CloudConfig/cc_update_hostname.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/CloudConfig/cc_update_hostname.py b/cloudinit/CloudConfig/cc_update_hostname.py
index 3663c0ab..a49f8649 100644
--- a/cloudinit/CloudConfig/cc_update_hostname.py
+++ b/cloudinit/CloudConfig/cc_update_hostname.py
@@ -31,7 +31,7 @@ def handle(name,cfg,cloud,log,args):
hostname = util.get_cfg_option_str(cfg,"hostname",cloud.get_hostname())
prev ="%s/%s" % (cloud.get_cpath('datadir'),"previous-hostname")
update_hostname(hostname, prev, log)
- except Exception, e:
+ except Exception as e:
log.warn("failed to set hostname\n")
raise
@@ -50,7 +50,7 @@ def read_hostname(filename, default=None):
line = line.rstrip()
if line:
return line
- except IOError, e:
+ except IOError as e:
if e.errno != errno.ENOENT: raise
return default
@@ -62,7 +62,7 @@ def update_hostname(hostname, prev_file, log):
try:
hostname_prev = read_hostname(prev_file)
- except Exception, e:
+ except Exception as e:
log.warn("Failed to open %s: %s" % (prev_file, e))
try: