[Checkins] SVN: persistent/trunk/ Py3k compat: unicode literals.
Tres Seaver
cvs-admin at zope.org
Fri Jun 29 04:02:18 UTC 2012
Log message for revision 127173:
Py3k compat: unicode literals.
Changed:
_U persistent/trunk/
U persistent/trunk/persistent/_compat.py
U persistent/trunk/persistent/tests/testPersistent.py
-=-
Modified: persistent/trunk/persistent/_compat.py
===================================================================
--- persistent/trunk/persistent/_compat.py 2012-06-29 04:02:09 UTC (rev 127172)
+++ persistent/trunk/persistent/_compat.py 2012-06-29 04:02:14 UTC (rev 127173)
@@ -17,6 +17,12 @@
if sys.version_info[0] > 2: #pragma NO COVER
import copyreg as copy_reg
+ def _u(s):
+ return s
+
else: #pragma NO COVER
import copy_reg
+ def _u(s):
+ return unicode(s, 'unicode_escape')
+
Modified: persistent/trunk/persistent/tests/testPersistent.py
===================================================================
--- persistent/trunk/persistent/tests/testPersistent.py 2012-06-29 04:02:09 UTC (rev 127172)
+++ persistent/trunk/persistent/tests/testPersistent.py 2012-06-29 04:02:14 UTC (rev 127173)
@@ -191,6 +191,7 @@
def test_setting_serial_w_invalid_types_raises(self):
# Serial must be an 8-digit string
+ from persistent._compat import _u
obj = self._makeOne()
def set(val):
@@ -199,7 +200,7 @@
self.assertRaises(ValueError, set, 1)
self.assertRaises(ValueError, set, "0123")
self.assertRaises(ValueError, set, "012345678")
- self.assertRaises(ValueError, set, u"01234567")
+ self.assertRaises(ValueError, set, _u("01234567"))
def test_del_serial_returns_to_initial(self):
NOSERIAL = "\000" * 8
More information about the checkins
mailing list