[Checkins] SVN: BTrees/branches/py3k/ Get unicode-driven tests sane under Py3k.
Tres Seaver
cvs-admin at zope.org
Wed Dec 12 14:41:01 UTC 2012
Log message for revision 128617:
Get unicode-driven tests sane under Py3k.
Changed:
_U BTrees/branches/py3k/
U BTrees/branches/py3k/BTrees/tests/testBTreesUnicode.py
-=-
Modified: BTrees/branches/py3k/BTrees/tests/testBTreesUnicode.py
===================================================================
--- BTrees/branches/py3k/BTrees/tests/testBTreesUnicode.py 2012-12-12 14:41:00 UTC (rev 128616)
+++ BTrees/branches/py3k/BTrees/tests/testBTreesUnicode.py 2012-12-12 14:41:01 UTC (rev 128617)
@@ -28,30 +28,34 @@
def setUp(self):
#setup an OOBTree with some unicode strings
from BTrees.OOBTree import OOBTree
+ from BTrees._compat import _bytes
+ from BTrees._compat import _u
- self.s = unicode('dreit\xe4gigen', 'latin1')
+ self.s = _u(b'dreit\xe4gigen', 'latin1')
- self.data = [('alien', 1),
- ('k\xf6nnten', 2),
- ('fox', 3),
- ('future', 4),
- ('quick', 5),
- ('zerst\xf6rt', 6),
- (unicode('dreit\xe4gigen','latin1'), 7),
+ self.data = [(b'alien', 1),
+ (b'k\xf6nnten', 2),
+ (b'fox', 3),
+ (b'future', 4),
+ (b'quick', 5),
+ (b'zerst\xf6rt', 6),
+ (_u(b'dreit\xe4gigen','latin1'), 7),
]
self.tree = OOBTree()
for k, v in self.data:
- if isinstance(k, str):
- k = unicode(k, 'latin1')
+ if isinstance(k, _bytes):
+ k = _u(k, 'latin1')
self.tree[k] = v
@_skip_under_Py3k
def testAllKeys(self):
# check every item of the tree
+ from BTrees._compat import _u
+ from BTrees._compat import _bytes
for k, v in self.data:
- if isinstance(k, str):
- k = unicode(k, encoding)
+ if isinstance(k, _bytes):
+ k = _u(k, encoding)
self.assertTrue(k in self.tree)
self.assertEqual(self.tree[k], v)
@@ -67,7 +71,7 @@
def testAsciiKeys(self):
# try to access some "plain ASCII" keys in the tree
for k, v in self.data[0], self.data[2]:
- self.assert_(isinstance(k, str))
+ self.assertTrue(isinstance(k, str))
self.assertEqual(self.tree[k], v)
def test_suite():
More information about the checkins
mailing list