py3: Switch to 'except foo as bar' syntax

This is the only form supported in Python 3.x.

Signed-off-by: Stephen Finucane <stephen@that.guru>

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8347 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

6 files changed, 17 insertions, 17 deletions

diff --git a/docutils/test/DocutilsTestSupport.py b/docutils/test/DocutilsTestSupport.py
index 479f0e073..b26fc44d8 100644
--- a/docutils/test/DocutilsTestSupport.py
+++ b/docutils/test/DocutilsTestSupport.py
@@ -230,7 +230,7 @@ class CustomTestCase(StandardTestCase):
             output = '\n'.join(output.splitlines())
         try:
             self.assertEqual(output, expected)
-        except AssertionError, error:
+        except AssertionError as error:
             print('\n%s\ninput:' % (self,), file=sys.stderr)
             print(input, file=sys.stderr)
             try:
@@ -543,7 +543,7 @@ class GridTableParserTestCase(CustomTestCase):
             self.parser.find_head_body_sep()
             self.parser.parse_table()
             output = self.parser.cells
-        except Exception, details:
+        except Exception as details:
             output = '%s: %s' % (details.__class__.__name__, details)
         self.compare_output(self.input, pformat(output) + '\n',
                             pformat(self.expected) + '\n')
@@ -552,7 +552,7 @@ class GridTableParserTestCase(CustomTestCase):
         try:
             output = self.parser.parse(StringList(string2lines(self.input),
                                                   'test data'))
-        except Exception, details:
+        except Exception as details:
             output = '%s: %s' % (details.__class__.__name__, details)
         self.compare_output(self.input, pformat(output) + '\n',
                             pformat(self.expected) + '\n')
@@ -865,7 +865,7 @@ def exception_data(func, *args, **kwds):
     """
     try:
         func(*args, **kwds)
-    except Exception, detail:
+    except Exception as detail:
         return (detail, detail.args,
                 '%s: %s' % (detail.__class__.__name__, detail))
 
diff --git a/docutils/test/package_unittest.py b/docutils/test/package_unittest.py
index 1fb05aee5..57b6c945b 100644
--- a/docutils/test/package_unittest.py
+++ b/docutils/test/package_unittest.py
@@ -64,7 +64,7 @@ def parseArgs(argv=sys.argv):
                 debug =1
         if len(args) != 0:
             usageExit("No command-line arguments supported yet.")
-    except getopt.error, msg:
+    except getopt.error as msg:
         usageExit(msg)
 
 def loadTestModules(path, name='', packages=None):
diff --git a/docutils/test/test_error_reporting.py b/docutils/test/test_error_reporting.py
index 7239c44f7..400e40ad7 100644
--- a/docutils/test/test_error_reporting.py
+++ b/docutils/test/test_error_reporting.py
@@ -19,7 +19,7 @@ instances like, e.g., ::
 
   try:
     something
-  except IOError, error:
+  except IOError as error:
     print('Found %s' % error)
 
 unless the minimal required Python version has this problem fixed.
@@ -219,29 +219,29 @@ class SafeStringTests_locale(unittest.TestCase):
     us = u'\xfc'
     try:
         open(b'\xfc')
-    except IOError, e: # in Python 3 the name for the exception instance
+    except IOError as e: # in Python 3 the name for the exception instance
         bioe = e       # is local to the except clause
     try:
         open(u'\xfc')
-    except IOError, e:
+    except IOError as e:
         uioe = e
     except UnicodeEncodeError:
         try:
             open(u'\xfc'.encode(sys.getfilesystemencoding(), 'replace'))
-        except IOError, e:
+        except IOError as e:
             uioe = e
     try:
         os.chdir(b'\xfc')
-    except OSError, e:
+    except OSError as e:
         bose = e
     try:
         os.chdir(u'\xfc')
-    except OSError, e:
+    except OSError as e:
         uose = e
     except UnicodeEncodeError:
         try:
             os.chdir(u'\xfc'.encode(sys.getfilesystemencoding(), 'replace'))
-        except OSError, e:
+        except OSError as e:
             uose = e
     # wrapped test data:
     wbioe = SafeString(bioe)
diff --git a/docutils/test/test_language.py b/docutils/test/test_language.py
index 9d0203485..69fb36c0f 100755
--- a/docutils/test/test_language.py
+++ b/docutils/test/test_language.py
@@ -144,7 +144,7 @@ class LanguageTestCase(DocutilsTestSupport.CustomTestCase):
                 func, msg = directives.directive(d, module, None)
                 if not func:
                     failures.append('"%s": unknown directive' % d)
-            except Exception, error:
+            except Exception as error:
                 failures.append('"%s": %s' % (d, error))
         inverted = self._invert(module.directives)
         canonical = directives._directive_registry.keys()
@@ -179,7 +179,7 @@ class LanguageTestCase(DocutilsTestSupport.CustomTestCase):
                 method = roles._role_registry[d]
                 #if not method:
                 #    failures.append('"%s": unknown role' % d)
-            except KeyError, error:
+            except KeyError as error:
                 failures.append('"%s": %s' % (d, error))
         inverted = self._invert(module.roles)
         canonical = roles._role_registry.keys()
diff --git a/docutils/test/test_publisher.py b/docutils/test/test_publisher.py
index 43be372f6..93079beb6 100755
--- a/docutils/test/test_publisher.py
+++ b/docutils/test/test_publisher.py
@@ -65,7 +65,7 @@ class PublisherTests(DocutilsTestSupport.StandardTestCase):
         try:
             core.publish_cmdline(argv=['nonexisting/path'],
                                        settings_overrides={'traceback': True})
-        except IOError, e:
+        except IOError as e:
             self.assertTrue(isinstance(e, io.InputError))
 
 
@@ -74,7 +74,7 @@ class PublisherTests(DocutilsTestSupport.StandardTestCase):
         try:
             core.publish_cmdline(argv=['data/include.txt', 'nonexisting/path'],
                                        settings_overrides={'traceback': True})
-        except IOError, e:
+        except IOError as e:
             self.assertTrue(isinstance(e, io.OutputError))
 
 
diff --git a/docutils/test/test_utils.py b/docutils/test/test_utils.py
index 1be74aad5..e5036bc7b 100755
--- a/docutils/test/test_utils.py
+++ b/docutils/test/test_utils.py
@@ -85,7 +85,7 @@ class ReporterTests(unittest.TestCase):
         and hence fails with unicode message"""
         try:
             raise Exception(u'mesidʒ')
-        except Exception, err:
+        except Exception as err:
             sw = self.reporter.system_message(0, err)
             self.assertEqual(sw.pformat(), u"""\
 <system_message level="0" source="test data" type="DEBUG">