Log message for revision 121606: Some cleanup and fixes for changed DateTime.SyntaxError import location
Changed: U Zope/trunk/src/App/PersistentExtra.py U Zope/trunk/src/ZPublisher/Converters.py U Zope/trunk/src/ZPublisher/tests/testHTTPRequest.py -=- Modified: Zope/trunk/src/App/PersistentExtra.py =================================================================== --- Zope/trunk/src/App/PersistentExtra.py 2011-05-08 16:11:20 UTC (rev 121605) +++ Zope/trunk/src/App/PersistentExtra.py 2011-05-08 16:13:46 UTC (rev 121606) @@ -18,14 +18,14 @@ 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) Modified: Zope/trunk/src/ZPublisher/Converters.py =================================================================== --- Zope/trunk/src/ZPublisher/Converters.py 2011-05-08 16:11:20 UTC (rev 121605) +++ Zope/trunk/src/ZPublisher/Converters.py 2011-05-08 16:13:46 UTC (rev 121606) @@ -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 @@ 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): Modified: Zope/trunk/src/ZPublisher/tests/testHTTPRequest.py =================================================================== --- Zope/trunk/src/ZPublisher/tests/testHTTPRequest.py 2011-05-08 16:11:20 UTC (rev 121605) +++ Zope/trunk/src/ZPublisher/tests/testHTTPRequest.py 2011-05-08 16:13:46 UTC (rev 121606) @@ -580,15 +580,15 @@ 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) _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins