From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 31 Jan 2015 07:25:16 +0000 (+0200)
Subject: Restored test_xpickle compatibility with Python 2.5.
X-Git-Tag: v2.7.10rc1~205
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d484605c10fe6d23dd0a3f5f631a0011fd1f2016;p=thirdparty%2FPython%2Fcpython.git

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 b6973f62f7fa..95ad4eba77fa 100644
--- a/Lib/test/test_xpickle.py
+++ b/Lib/test/test_xpickle.py
@@ -158,8 +158,10 @@ class AbstractCompatTests(AbstractPickleTests):
 
     # 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 @@ class CPicklePython27Compat(AbstractCompatTests):
     python = "python2.7"
     error = cPickle.BadPickleGet
 
-class PicklePython27Compat(CPicklePython26Compat):
+class PicklePython27Compat(CPicklePython27Compat):
 
     module = pickle
     error = KeyError