Correct syntax for try/except statements.

In earlier versions of python commas (,) could
be used in except statements. The new way is to
use 'as'.

4 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py
index a018e68fb..e296561bf 100644
--- a/src/lib/Client/Tools/YUMng.py
+++ b/src/lib/Client/Tools/YUMng.py
@@ -742,7 +742,7 @@ class YUMng(Bcfg2.Client.Tools.PkgTool):
                 else:
                     self.logger.error("Second pass yum install failed.")
                     self.logger.debug("   %s" % restring)
-            except yum.Errors.YumBaseError, e:
+            except yum.Errors.YumBaseError as e:
                 self.logger.error("Yum transaction error: %s" % str(e))
 
             self.yb.conf.skip_broken = skipBroken
diff --git a/src/lib/Server/Lint/Genshi.py b/src/lib/Server/Lint/Genshi.py
index 552c495b2..ceb7e0bcf 100755
--- a/src/lib/Server/Lint/Genshi.py
+++ b/src/lib/Server/Lint/Genshi.py
@@ -22,6 +22,6 @@ class Genshi(Bcfg2.Server.Lint.ServerPlugin):
                     try:
                         loader.load(sdata.name,
                                     cls=genshi.template.NewTextTemplate)
-                    except genshi.template.TemplateSyntaxError, err:
+                    except genshi.template.TemplateSyntaxError as err:
                         self.LintError("genshi-syntax-error",
                                        "Genshi syntax error: %s" % err)
diff --git a/src/lib/Server/Plugins/FileProbes.py b/src/lib/Server/Plugins/FileProbes.py
index 2d64c3343..5d3c35e5f 100644
--- a/src/lib/Server/Plugins/FileProbes.py
+++ b/src/lib/Server/Plugins/FileProbes.py
@@ -137,7 +137,7 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin,
             self.logger.info("Writing new probed file %s" % fileloc)    
             try:
                 os.makedirs(os.path.dirname(fileloc))
-            except OSError, err:
+            except OSError as err:
                 if err.errno == errno.EEXIST:
                     pass
                 else:
diff --git a/src/lib/Server/Plugins/Svn2.py b/src/lib/Server/Plugins/Svn2.py
index b8a8e6b7e..e189748b1 100644
--- a/src/lib/Server/Plugins/Svn2.py
+++ b/src/lib/Server/Plugins/Svn2.py
@@ -72,7 +72,7 @@ class Svn2(Bcfg2.Server.Plugin.Plugin,
             self.revision = self.client.update(self.datastore, recurse=True)[0]
             self.logger.info("Svn2: Commited changes. At %s" %
                              self.revision.number)
-        except Exception, err:
+        except Exception as err:
             # try to be smart about the error we got back
             details = None
             if "callback_ssl_server_trust_prompt" in str(err):
@@ -92,7 +92,7 @@ class Svn2(Bcfg2.Server.Plugin.Plugin,
         try:
             old_revision = self.revision.number
             self.revision = self.client.update(self.datastore, recurse=True)[0]
-        except Exception, err:
+        except Exception as err:
             # try to be smart about the error we got back
             details = None
             if "callback_ssl_server_trust_prompt" in str(err):