Python 3 preparation: "raise" syntax.

Changing "raise Exception, value" to "raise Exception(value)".
Tool-assisted patch.  Particular cases to check carefully are the one
place in frontends/ZRoundup/ZRoundup.py where a string exception
needed to be fixed, and the one in roundup/cgi/client.py involving
raising an exception with a traceback (requires three-argument form of
raise in Python 2, which as I understand it requires exec() to avoid a
Python 3 syntax error).

Author: jsm28

detectors/creator_resolution.py

@@ -24,7 +24,7 @@ def creator_resolution(db, cl, nodeid, newvalues):
     if assignedto == creator:
         if db.getuid() != creator:
             name = db.user.get(creator, 'username')
-            raise Reject, 'Only the creator (%s) may close this issue'%name
+            raise Reject('Only the creator (%s) may close this issue'%name)
         return
 
     # set the assignedto and status

frontends/ZRoundup/ZRoundup.py

@@ -208,7 +208,7 @@ def index_html(self, REQUEST=None):
             client.main()
             return ''
         except client.NotFound:
-            raise 'NotFound', REQUEST.URL
+            raise Exception('NotFound ' + REQUEST.URL)
             pass
         except:
             import traceback

frontends/ZRoundup/__init__.py

@@ -32,7 +32,7 @@
     if not os.path.exists(path):
         path = os.path.join(here, 'lib', 'python', 'Products', 'ZRoundup')
         if not os.path.exists(path):
-            raise ValueError, "Can't determine where ZRoundup is installed"
+            raise ValueError("Can't determine where ZRoundup is installed")
 
 # product initialisation
 from ZRoundup import ZRoundup, manage_addZRoundupForm, manage_addZRoundup

roundup/backends/back_anydbm.py

@@ -241,12 +241,12 @@ def __getattr__(self, classname):
         """A convenient way of calling self.getclass(classname)."""
         if classname in self.classes:
             return self.classes[classname]
-        raise AttributeError, classname
+        raise AttributeError(classname)
 
     def addclass(self, cl):
         cn = cl.classname
         if cn in self.classes:
-            raise ValueError, cn
+            raise ValueError(cn)
         self.classes[cn] = cl
 
         # add default Edit and View permissions
@@ -1186,10 +1186,10 @@ def set_inner(self, nodeid, **propvalues):
             return propvalues
 
         if 'creation' in propvalues or 'activity' in propvalues:
-            raise KeyError, '"creation" and "activity" are reserved'
+            raise KeyError('"creation" and "activity" are reserved')
 
         if 'id' in propvalues:
-            raise KeyError, '"id" is reserved'
+            raise KeyError('"id" is reserved')
 
         if self.db.journaltag is None:
             raise hyperdb.DatabaseError(_('Database open read-only'))

roundup/backends/back_mysql.py

@@ -184,7 +184,7 @@ def open_connection(self):
                 raise
         except MySQLdb.ProgrammingError as message:
             if message[0] != ER.NO_SUCH_TABLE:
-                raise hyperdb.DatabaseError, message
+                raise hyperdb.DatabaseError(message)
             self.init_dbschema()
             self.sql("CREATE TABLE `schema` (`schema` TEXT) ENGINE=%s"%
                 self.mysql_backend)
@@ -660,7 +660,7 @@ def _handle_integrity_error(self, e, propvalues):
         # then the snapshot has already been established.
         if e[0] == ER.DUP_ENTRY:
             key = propvalues[self.key]
-            raise ValueError, 'node with key "%s" exists' % key
+            raise ValueError('node with key "%s" exists' % key)
         # We don't know what this exception is; reraise it.
         raise
 

roundup/cgi/PageTemplates/Expressions.py

@@ -57,7 +57,7 @@ class Unauthorized(BaseException):
 def acquisition_security_filter(orig, inst, name, v, real_validate):
     if real_validate(orig, inst, name, v):
         return 1
-    raise Unauthorized, name
+    raise Unauthorized(name)
 
 def call_with_ns(f, ns, arg=1):
     if arg==2:
@@ -102,7 +102,7 @@ def __init__(self, path):
         self._path = path = path.strip().split('/')
         self._base = base = path.pop(0)
         if base and not _valid_name(base):
-            raise CompilerError, 'Invalid variable name "%s"' % base
+            raise CompilerError('Invalid variable name "%s"' % base)
         # Parse path
         self._dp = dp = []
         for i in range(len(path)):
@@ -220,7 +220,7 @@ def __init__(self, name, expr, engine):
                     exp = exp[m.end():]
                     m = _interp.search(exp)
                 if '$' in exp:
-                    raise CompilerError, (
+                    raise CompilerError(
                         '$ must be doubled or followed by a simple path')
                 parts.append(exp)
             expr = ''.join(parts)
@@ -308,7 +308,7 @@ def restrictedTraverse(object, path, securityManager,
             o = object[name]
             # Check access to the item.
             if not validate(object, object, name, o):
-                raise Unauthorized, name
+                raise Unauthorized(name)
             object = o
             continue
 

roundup/cgi/PageTemplates/MultiMapping.py

@@ -7,14 +7,14 @@ def __getitem__(self, key):
         for store in self.stores:
             if store.has_key(key):
                 return store[key]
-        raise KeyError, key
+        raise KeyError(key)
     _marker = []
     def get(self, key, default=_marker):
         for store in self.stores:
             if store.has_key(key):
                 return store[key]
         if default is self._marker:
-            raise KeyError, key
+            raise KeyError(key)
         return default
     def __len__(self):
         return reduce(operator.add, [len(x) for x in self.stores], 0)

roundup/cgi/PageTemplates/PageTemplate.py

@@ -81,7 +81,7 @@ def pt_render(self, source=0, extra_context={}):
         __traceback_supplement__ = (PageTemplateTracebackSupplement, self)
 
         if self._v_errors:
-            raise PTRuntimeError, 'Page Template %s has errors.' % self.id
+            raise PTRuntimeError('Page Template %s has errors.' % self.id)
         output = self.StringIO()
         c = self.pt_getContext()
         c.update(extra_context)
@@ -119,13 +119,13 @@ def pt_macros(self):
             self._cook()
         __traceback_supplement__ = (PageTemplateTracebackSupplement, self)
         if self._v_errors:
-            raise PTRuntimeError, 'Page Template %s has errors.' % self.id
+            raise PTRuntimeError('Page Template %s has errors.' % self.id)
         return self._v_macros
 
     def __getattr__(self, name):
         if name == 'macros':
             return self.pt_macros()
-        raise AttributeError, name
+        raise AttributeError(name)
 
     def pt_source_file(self):
         return None  # Unknown.

roundup/cgi/PageTemplates/PythonExpr.py

@@ -34,8 +34,8 @@ def __init__(self, name, expr, engine):
             exec 'def f():\n return %s\n' % expr.strip() in d
             self._f = d['f']
         except:
-            raise CompilerError, ('Python expression error:\n'
-                                  '%s: %s') % exc_info()[:2]
+            raise CompilerError(('Python expression error:\n'
+                                 '%s: %s') % exc_info()[:2])
         self._get_used_names()
 
     def _get_used_names(self):

roundup/cgi/PageTemplates/TALES.py

@@ -112,10 +112,10 @@ def __init__(self, Iterator=None):
 
     def registerType(self, name, handler):
         if not _valid_name(name):
-            raise RegistrationError, 'Invalid Expression type "%s".' % name
+            raise RegistrationError('Invalid Expression type "%s".' % name)
         types = self.types
         if types.has_key(name):
-            raise RegistrationError, (
+            raise RegistrationError(
                 'Multiple registrations for Expression type "%s".' %
                 name)
         types[name] = handler
@@ -134,7 +134,7 @@ def compile(self, expression):
         try:
             handler = self.types[type]
         except KeyError:
-            raise CompilerError, (
+            raise CompilerError(
                 'Unrecognized expression type "%s".' % type)
         return handler(type, expr, self)