Python 2 and 3 support. Convert Exception to BaseException. TAL and

PageTemplate code.

Author: rouilj

roundup/cgi/PageTemplates/Expressions.py

@@ -51,7 +51,7 @@ def installHandlers(engine):
 try:
     from zExceptions import Unauthorized
 except ImportError:
-    class Unauthorized(Exception):
+    class Unauthorized(BaseException):
         pass
 
 def acquisition_security_filter(orig, inst, name, v, real_validate):

roundup/cgi/PageTemplates/TALES.py

@@ -34,16 +34,16 @@
 _parse_expr = re.compile(r"(%s):" % NAME_RE).match
 _valid_name = re.compile('%s$' % NAME_RE).match
 
-class TALESError(Exception):
+class TALESError(BaseException):
     """Error during TALES expression evaluation"""
 
 class Undefined(TALESError):
     '''Exception raised on traversal of an undefined path'''
 
-class RegistrationError(Exception):
+class RegistrationError(BaseException):
     '''TALES Type Registration Error'''
 
-class CompilerError(Exception):
+class CompilerError(BaseException):
     '''TALES Compiler Error'''
 
 class Default:
@@ -85,7 +85,7 @@ class ErrorInfo:
     __allow_access_to_unprotected_subobjects__ = 1
 
     def __init__(self, err, position=(None, None)):
-        if isinstance(err, Exception):
+        if isinstance(err, BaseException):
             self.type = err.__class__
             self.value = err
         else:

roundup/cgi/TAL/DummyEngine.py

@@ -44,7 +44,7 @@ class _Default:
 
 name_match = re.compile(r"(?s)(%s):(.*)\Z" % NAME_RE).match
 
-class CompilerError(Exception):
+class CompilerError(BaseException):
     pass
 
 class DummyEngine:

roundup/cgi/TAL/HTMLParser.py

@@ -47,7 +47,7 @@
 endtagfind = re.compile('</\s*([a-zA-Z][-.a-zA-Z0-9:_]*)\s*>')
 
 
-class HTMLParseError(Exception):
+class HTMLParseError(BaseException):
     """Exception raised for all parse errors."""
 
     def __init__(self, msg, position=(None, None)):

roundup/cgi/TAL/TALDefs.py

@@ -64,7 +64,7 @@
     "name",
     ]
 
-class TALError(Exception):
+class TALError(BaseException):
 
     def __init__(self, msg, position=(None, None)):
         assert msg != ""