Some cleanup and fixes for changed DateTime.SyntaxError import location

d8d50950 · Hanno Schlichting · 69a1fb1f · d8d50950 · d8d50950 · d8d50950
Commit d8d50950 authored May 08, 2011 by Hanno Schlichting
Showing with 11 additions and 10 deletions

src/App/PersistentExtra.py src/App/PersistentExtra.py +3 -3

src/ZPublisher/Converters.py src/ZPublisher/Converters.py +5 -4

src/ZPublisher/tests/testHTTPRequest.py src/ZPublisher/tests/testHTTPRequest.py +3 -3

No files found.
--- a/src/App/PersistentExtra.py
+++ b/src/App/PersistentExtra.py
@@ -18,14 +18,14 @@ from DateTime.DateTime import DateTime
 class PersistentUtil:

    def bobobase_modification_time(self):
-        jar=self._p_jar
-        oid=self._p_oid
+        jar = self._p_jar
+        oid = self._p_oid
        if jar is None or oid is None:
            return DateTime()

        try:
            t = self._p_mtime
-        except:
+        except AttributeError:
            t = 0
        return DateTime(t)


--- a/src/ZPublisher/Converters.py
+++ b/src/ZPublisher/Converters.py
@@ -14,6 +14,7 @@
 import re
 from types import ListType, TupleType, UnicodeType
 from DateTime import DateTime
+from DateTime.interfaces import SyntaxError
 from cgi import escape

 # This may get overwritten during configuration
@@ -106,16 +107,16 @@ def field2date(v):
    v = field2string(v)
    try:
        v = DateTime(v)
-    except DateTime.SyntaxError, e:
-        raise DateTime.SyntaxError, "Invalid DateTime "+escape(`v`)
+    except SyntaxError:
+        raise SyntaxError("Invalid DateTime " + escape(repr(v)))
    return v

 def field2date_international(v):
    v = field2string(v)
    try:
        v = DateTime(v, datefmt="international")
-    except DateTime.SyntaxError, e:
-        raise DateTime.SyntaxError, "Invalid DateTime "+escape(`v`)
+    except SyntaxError:
+        raise SyntaxError("Invalid DateTime " + escape(repr(v)))
    return v

 def field2boolean(v):

--- a/src/ZPublisher/tests/testHTTPRequest.py
+++ b/src/ZPublisher/tests/testHTTPRequest.py
@@ -580,15 +580,15 @@ class HTTPRequestTests(unittest.TestCase):
    def test_processInputs_w_tainted_values_cleans_exceptions(self):
        # Feed tainted garbage to the conversion methods, and any exception
        # returned should be HTML safe
-        from DateTime.DateTime import DateTime
+        from DateTime.interfaces import SyntaxError
        from ZPublisher.Converters import type_converters
        for type, convert in type_converters.items():
            try:
                convert('<html garbage>')
-            except Exception, e:
+            except Exception as e:
                self.assertFalse('<' in e.args,
                    '%s converter does not quote unsafe value!' % type)
-            except DateTime.SyntaxError, e:
+            except SyntaxError as e:
                self.assertFalse('<' in e,
                    '%s converter does not quote unsafe value!' % type)