commit 97b87769efdb48d85f292b5a9f6aad189aff9eab
Author: Radek Pazdera <rpazdera(a)redhat.com>
Date: Fri Oct 19 11:41:51 2012 +0200
cleanup: Adjusting except statement syntax
This patch replaces the old python's except statement syntax
except Exception, exc:
with the current one
except Exception as exc:
in the whole project.
Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com>
Common/Daemon.py | 4 ++--
Common/Logs.py | 2 +-
Common/RecipePath.py | 2 +-
Common/SshUtils.py | 10 +++++-----
Common/XmlProcessing.py | 14 +++++++-------
Common/XmlTemplates.py | 2 +-
NetTest/NetTestController.py | 4 ++--
Tests/TestTCPConnect.py | 10 +++++-----
Tests/TestTCPListen.py | 14 +++++++-------
netconfig.py | 2 +-
nettestslave.py | 2 +-
switchconfig.py | 2 +-
swswitch.py | 2 +-
13 files changed, 35 insertions(+), 35 deletions(-)
---
diff --git a/Common/Daemon.py b/Common/Daemon.py
index 38bacf8..cf7dd22 100644
--- a/Common/Daemon.py
+++ b/Common/Daemon.py
@@ -41,7 +41,7 @@ class Daemon:
def _del_pidfile(self):
try:
os.remove(self._pidfile)
- except OSError, e:
+ except OSError as e:
if e.errno != 2:
raise(e)
@@ -67,6 +67,6 @@ class Daemon:
pid = os.getpid()
self._write_pid(pid)
logging.info("deamonized with pid %d" % pid)
- except OSError, e:
+ except OSError as e:
logging.error("fork failed: %d (%s)\n" % (e.errno, e.strerror))
sys.exit(1)
diff --git a/Common/Logs.py b/Common/Logs.py
index 745ed5b..8dde988 100644
--- a/Common/Logs.py
+++ b/Common/Logs.py
@@ -189,7 +189,7 @@ class Logs:
def clean_root_log_folder(cls, logRootPath):
try:
shutil.rmtree(logRootPath)
- except OSError, e:
+ except OSError as e:
if e.errno != 2:
raise
os.makedirs(logRootPath)
diff --git a/Common/RecipePath.py b/Common/RecipePath.py
index 60d035d..84c6acc 100644
--- a/Common/RecipePath.py
+++ b/Common/RecipePath.py
@@ -92,7 +92,7 @@ class HttpRecipePath(RecipePathGeneric):
try:
f = urlopen(url)
self._data = f.read()
- except IOError, err:
+ except IOError as err:
msg = "Unable to resolve path: %s (%s)" % (url, str(err))
raise Exception(msg)
diff --git a/Common/SshUtils.py b/Common/SshUtils.py
index f44f603..d287970 100644
--- a/Common/SshUtils.py
+++ b/Common/SshUtils.py
@@ -154,9 +154,9 @@ def _remote_login(session, username, password, prompt, timeout=10):
elif match == 6: # prompt
logging.log(logging.INFO, "Got shell prompt -- logged in")
break
- except ShellProcess.ProcessTimeoutError, e:
+ except ShellProcess.ProcessTimeoutError as e:
raise LoginTimeoutError(e.output)
- except ShellProcess.ProcessTerminatedError, e:
+ except ShellProcess.ProcessTerminatedError as e:
raise LoginProcessTerminatedError(e.status, e.output)
@@ -225,7 +225,7 @@ def wait_for_login(host, port, username, password, prompt, linesep="\n",
return remote_login(host, port, username, password, prompt,
linesep, log_filename, internal_timeout,
command)
- except LoginError, e:
+ except LoginError as e:
logging.debug(e)
time.sleep(2)
# Timeout expired; try one more time but don't catch exceptions
@@ -302,12 +302,12 @@ def _remote_scp(session, password_list, transfer_timeout=600, login_timeout=10):
"""elif match == 3: #Exit transfer correctly.
logging.log(logging.DEBUG2, "SCP process terminated with status 0")
break"""
- except ShellProcess.ProcessTimeoutError, e:
+ except ShellProcess.ProcessTimeoutError as e:
if authentication_done:
raise SCPTransferTimeoutError(e.output)
else:
raise SCPAuthenticationTimeoutError(e.output)
- except ShellProcess.ProcessTerminatedError, e:
+ except ShellProcess.ProcessTerminatedError as e:
if e.status == 0:
logging.log(logging.DEBUG2, "SCP process terminated with status 0")
break
diff --git a/Common/XmlProcessing.py b/Common/XmlProcessing.py
index 42057dc..d313be5 100644
--- a/Common/XmlProcessing.py
+++ b/Common/XmlProcessing.py
@@ -114,7 +114,7 @@ class XmlDomTreeInit:
self._filename = os.path.basename(filename)
try:
dom = parseString(xml_text, self._sax)
- except sax.SAXParseException, err:
+ except sax.SAXParseException as err:
pos = {"file": self._filename,
"line": err.getLineNumber(),
"col": err.getColumnNumber()}
@@ -172,7 +172,7 @@ class XmlParser(object):
if conversion_cb:
try:
converted = conversion_cb(string)
- except ValueError, err:
+ except ValueError as err:
raise XmlProcessingError("Conversion error: " + str(err), node)
return converted
@@ -259,7 +259,7 @@ class RecipeParser(XmlParser):
try:
handler = self._event_handlers[event_id]
- except KeyError, err:
+ except KeyError as err:
logging.warn("No handler found for %s event, ignoring", event_id)
return
@@ -299,7 +299,7 @@ class RecipeParser(XmlParser):
try:
dom = dom_init.parse_string(xmlstr,
filename=source_rp.abs_path())
- except IOError, err:
+ except IOError as err:
msg = "Unable to resolve include: %s" % str(err)
raise XmlProcessingError(msg, node)
@@ -335,7 +335,7 @@ class RecipeParser(XmlParser):
try:
attr_val = self._template_proc.expand_string(raw_attr_val)
- except XmlTemplateError, err:
+ except XmlTemplateError as err:
raise XmlProcessingError(str(err), node)
return self._convert_string(node, attr_val, conversion_cb)
@@ -346,7 +346,7 @@ class RecipeParser(XmlParser):
try:
content = self._template_proc.expand_string(raw_content)
- except XmlTemplateError, err:
+ except XmlTemplateError as err:
raise XmlProcessingError(str(err), node)
return self._convert_string(node, content, conversion_cb)
@@ -369,5 +369,5 @@ class RecipeParser(XmlParser):
try:
self._template_proc.define_alias(name, value)
- except XmlTemplateError, err:
+ except XmlTemplateError as err:
raise XmlProcessingError(str(err), node)
diff --git a/Common/XmlTemplates.py b/Common/XmlTemplates.py
index 9a62481..8f0d6e3 100644
--- a/Common/XmlTemplates.py
+++ b/Common/XmlTemplates.py
@@ -306,7 +306,7 @@ class XmlTemplates:
try:
recipe = self._find_definition("recipe")
return recipe
- except XmlTemplateError, err:
+ except XmlTemplateError as err:
msg = "Cannot resolve %s(): " % template_name
msg += str(err)
raise XmlTemplateError(msg)
diff --git a/NetTest/NetTestController.py b/NetTest/NetTestController.py
index 3d01310..13eefb4 100644
--- a/NetTest/NetTestController.py
+++ b/NetTest/NetTestController.py
@@ -294,7 +294,7 @@ class NetTestController:
slave_root_path = os.path.join(self._log_root_path, address)
try:
os.mkdir(slave_root_path)
- except OSError, e:
+ except OSError as e:
if e.errno != 17:
raise
@@ -484,7 +484,7 @@ class NetTestController:
slave_logging_dir = os.path.join(logging_root, hostname)
try:
os.mkdir(slave_logging_dir)
- except OSError, err:
+ except OSError as err:
if err.errno != 17:
msg = "Cannot access the logging directory %s" \
% slave_logging_dir
diff --git a/Tests/TestTCPConnect.py b/Tests/TestTCPConnect.py
index f4020f0..50e9748 100644
--- a/Tests/TestTCPConnect.py
+++ b/Tests/TestTCPConnect.py
@@ -52,7 +52,7 @@ class ConnectionWorker():
try:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- except socket.error, msg:
+ except socket.error as msg:
logging.debug(msg)
return
@@ -60,12 +60,12 @@ class ConnectionWorker():
try:
s.connect((self._host, self._port))
- except socket.timeout, msg:
+ except socket.timeout as msg:
logging.debug("Could not connect to %s port %s" %
(self._host, self._port))
s.close()
continue
- except socket.error, msg:
+ except socket.error as msg:
logging.debug(msg)
s.close()
break
@@ -91,7 +91,7 @@ class ConnectionWorker():
data = s.sendall(rnd_str)
except socket.timeout:
continue
- except socket.error, msg:
+ except socket.error as msg:
logging.debug(msg)
s.settimeout(0)
try:
@@ -196,7 +196,7 @@ class TestTCPConnect(TestGeneric):
for w in workers:
try:
w.join()
- except OSError, e:
+ except OSError as e:
continue
workers.remove(w)
diff --git a/Tests/TestTCPListen.py b/Tests/TestTCPListen.py
index 3cf0798..4de1083 100644
--- a/Tests/TestTCPListen.py
+++ b/Tests/TestTCPListen.py
@@ -67,7 +67,7 @@ class TestTCPListen(TestGeneric):
try:
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.settimeout(1)
- except socket.error, msg:
+ except socket.error as msg:
logging.debug(msg)
return
@@ -75,7 +75,7 @@ class TestTCPListen(TestGeneric):
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.bind((host, port))
s.listen(1)
- except socket.error, msg:
+ except socket.error as msg:
logging.debug(msg)
s.close()
return
@@ -87,9 +87,9 @@ class TestTCPListen(TestGeneric):
while conn == None and not closecon.value:
try:
conn, addr = s.accept()
- except socket.timeout, e:
+ except socket.timeout as e:
continue
- except socket.error, e:
+ except socket.error as e:
logging.debug(e)
s.close()
return
@@ -110,9 +110,9 @@ class TestTCPListen(TestGeneric):
while not closecon.value:
try:
data = conn.recv(1024)
- except socket.timeout, e:
+ except socket.timeout as e:
continue
- except socket.error, e:
+ except socket.error as e:
logging.debug(e)
if conn:
conn.shutdown(socket.SHUT_RDWR)
@@ -129,7 +129,7 @@ class TestTCPListen(TestGeneric):
try:
conn.shutdown(socket.SHUT_RDWR)
conn.close()
- except socket.error, msg:
+ except socket.error as msg:
logging.debug(msg)
s.close()
return
diff --git a/netconfig.py b/netconfig.py
index c0baf97..6012667 100755
--- a/netconfig.py
+++ b/netconfig.py
@@ -120,7 +120,7 @@ def main():
"dhc:m:a:",
["debug", "help", "config=", "machine-config=", "action="]
)
- except getopt.GetoptError, err:
+ except getopt.GetoptError as err:
print str(err)
usage()
sys.exit()
diff --git a/nettestslave.py b/nettestslave.py
index 365ebdd..29528ff 100755
--- a/nettestslave.py
+++ b/nettestslave.py
@@ -41,7 +41,7 @@ def main():
"dhei:p:",
["debug", "help", "daemonize", "pidfile", "port"]
)[0]
- except getopt.GetoptError, err:
+ except getopt.GetoptError as err:
print str(err)
usage()
sys.exit()
diff --git a/switchconfig.py b/switchconfig.py
index ef38581..ed2b95e 100755
--- a/switchconfig.py
+++ b/switchconfig.py
@@ -38,7 +38,7 @@ def main():
"dhc:m:a:",
["debug", "help", "config=", "machine-config=", "action="]
)
- except getopt.GetoptError, err:
+ except getopt.GetoptError as err:
print str(err)
usage()
sys.exit()
diff --git a/swswitch.py b/swswitch.py
index aa8716d..42ef900 100755
--- a/swswitch.py
+++ b/swswitch.py
@@ -44,7 +44,7 @@ def main():
"dhm:p:",
["debug", "help", "machine-config=", "port="]
)
- except getopt.GetoptError, err:
+ except getopt.GetoptError as err:
print str(err)
usage()
sys.exit()
