[Python-checkins] cpython (2.7): Restored test_xpickle compatibility with Python 2.5.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/19305fa6420b
changeset:   94405:19305fa6420b
branch:      2.7
parent:      94402:aa6f8e067ec3
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Jan 31 09:25:16 2015 +0200
summary:
  Restored test_xpickle compatibility with Python 2.5.
Python 2.5 has no unittest.skipUnless.

files:
  Lib/test/test_xpickle.py |  6 ++++--
  1 files changed, 4 insertions(+), 2 deletions(-)


diff --git a/Lib/test/test_xpickle.py b/Lib/test/test_xpickle.py
--- 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

-- 
Repository URL: https://hg.python.org/cpython