Restored test_xpickle compatibility with Python 2.5.
Python 2.5 has no unittest.skipUnless.
diff --git a/Lib/test/test_xpickle.py b/Lib/test/test_xpickle.py
index b6973f6..95ad4eb 100644
--- a/Lib/test/test_xpickle.py
+++ b/Lib/test/test_xpickle.py
@@ -158,8 +158,10 @@
# This is a cut-down version of pickletester's test_unicode. Backwards
# compatibility was explicitly broken in r67934 to fix a bug.
- @unittest.skipUnless(test_support.have_unicode, 'no unicode support')
def test_unicode(self):
+ if not test_support.have_unicode:
+ # Python 2.5 has no unittest.skipUnless
+ self.skipTest('no unicode support')
endcases = [u'', u'<\\u>', u'<\\%c>' % 0x1234, u'<\n>', u'<\\>']
for proto in pickletester.protocols:
for u in endcases:
@@ -218,7 +220,7 @@
python = "python2.7"
error = cPickle.BadPickleGet
-class PicklePython27Compat(CPicklePython26Compat):
+class PicklePython27Compat(CPicklePython27Compat):
module = pickle
error = KeyError