Simplify most uses of reraise via a helper function

zopefoundation · Feb 14, 2017 · 1dbc242 · 1dbc242
1 parent eb210fc
commit 1dbc242
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 22 deletions.
diff --git a/ZConfig/_compat.py b/ZConfig/_compat.py
@@ -89,6 +89,11 @@ def exec_(code, globs=None, locs=None): #pragma NO COVER
     raise tp, value, tb
 """)
 
-import abc
 
+def raise_with_same_tb(exception):
+	"Raise an exception having the current traceback (if there is one)"
+	reraise(type(exception), exception, sys.exc_info()[2])
+
+import abc
+# workaround the metaclass diff in Py2/Py3
 AbstractBaseClass = abc.ABCMeta('AbstractBaseClass', (object,), {})
diff --git a/ZConfig/cfgparser.py b/ZConfig/cfgparser.py
@@ -18,7 +18,7 @@
 import ZConfig.url
 
 from ZConfig.substitution import isname, substitute
-from ZConfig._compat import reraise
+from ZConfig._compat import raise_with_same_tb
 
 class ZConfigParser(object):
 
@@ -170,8 +170,10 @@ def replace(self, text):
             raise
 
     def error(self, message):
-        v = ZConfig.ConfigurationSyntaxError(message, self.url, self.lineno)
-        reraise(type(v), v, sys.exc_info()[2])
+        raise_with_same_tb(
+            ZConfig.ConfigurationSyntaxError(
+                message, self.url, self.lineno))
+
 
     def _normalize_case(self, string):
         # This method is factored out solely to allow subclasses to modify

diff --git a/ZConfig/cmdline.py b/ZConfig/cmdline.py
@@ -30,7 +30,7 @@ class from the :mod:`ZConfig.loader` module. This provides support for
 import ZConfig.loader
 import ZConfig.matcher
 
-from ZConfig._compat import reraise
+from ZConfig._compat import raise_with_same_tb
 
 class ExtendedConfigLoader(ZConfig.loader.ConfigLoader):
     """A :class:`~.ConfigLoader` subclass that adds support for
@@ -118,9 +118,8 @@ def basic_key(self, s, pos):
         try:
             return self._basic_key(s)
         except ValueError as e:
-            e = ZConfig.ConfigurationSyntaxError(
-                "could not convert basic-key value: " + str(e), *pos)
-            reraise(type(e), e, sys.exc_info()[2])
+            raise_with_same_tb(ZConfig.ConfigurationSyntaxError(
+                "could not convert basic-key value: " + str(e), *pos))
 
     def add_value(self, name, val, pos):
         if name in self.keypairs:
@@ -185,8 +184,8 @@ def addValue(self, key, value, position):
         try:
             realkey = self.type.keytype(key)
         except ValueError as e:
-            dce = ZConfig.DataConversionError(e, key, position)
-            reraise(type(dce), dce, sys.exc_info()[2])
+            raise_with_same_tb(ZConfig.DataConversionError(e, key, position))
+
         if realkey in self.optionbag:
             return
         ZConfig.matcher.BaseMatcher.addValue(self, key, value, position)

diff --git a/ZConfig/loader.py b/ZConfig/loader.py
@@ -29,6 +29,7 @@
 import ZConfig.url
 
 from ZConfig._compat import reraise
+from ZConfig._compat import raise_with_same_tb
 from ZConfig._compat import urllib2
 from ZConfig._compat import AbstractBaseClass
 from ZConfig._compat import pathname2url
@@ -242,8 +243,7 @@ def _raise_open_error(self, url, message):
         error = ZConfig.ConfigurationError(
             "error opening %s %s: %s" % (what, ident, message),
             url)
-
-        reraise(type(error), error, sys.exc_info()[2])
+        raise_with_same_tb(error)
 
     def normalizeURL(self, url):
         """Return a URL for *url*

diff --git a/ZConfig/matcher.py b/ZConfig/matcher.py
@@ -18,7 +18,7 @@
 import ZConfig
 
 from ZConfig.info import ValueInfo
-from ZConfig._compat import reraise
+from ZConfig._compat import raise_with_same_tb
 
 
 class BaseMatcher(object):
@@ -191,9 +191,9 @@ def constuct(self):
                             try:
                                 s = st.datatype(s)
                             except ValueError as e:
-                                dce = ZConfig.DataConversionError(
-                                    e, s, (-1, -1, None))
-                                reraise(type(dce), dce, sys.exc_info()[2])
+                                raise_with_same_tb(ZConfig.DataConversionError(
+                                    e, s, (-1, -1, None)))
+
                         v.append(s)
                 elif ci.name == '+':
                     v = values[attr]
@@ -207,9 +207,9 @@ def constuct(self):
                     try:
                         v = st.datatype(values[attr])
                     except ValueError as e:
-                        dce = ZConfig.DataConversionError(
-                            e, values[attr], (-1, -1, None))
-                        reraise(type(dce), dce, sys.exc_info()[2])
+                        raise_with_same_tb(ZConfig.DataConversionError(
+                            e, values[attr], (-1, -1, None)))
+
                 else:
                     v = None
             elif name == '+':

diff --git a/ZConfig/schema.py b/ZConfig/schema.py
@@ -22,7 +22,7 @@
 from ZConfig import info
 from ZConfig import url
 
-from ZConfig._compat import reraise
+from ZConfig._compat import raise_with_same_tb
 
 BLANK = u''
 
@@ -469,8 +469,7 @@ def initerror(self, e):
         return e
 
     def error(self, message):
-        e = self.initerror(ZConfig.SchemaError(message))
-        reraise(type(e), e, sys.exc_info()[2])
+        raise_with_same_tb(self.initerror(ZConfig.SchemaError(message)))
 
 
 class SchemaParser(BaseParser):