Some additional Counter tests now work on Py2.6

Author: edschofield

src/future/tests/base.py

@@ -9,7 +9,7 @@
 import functools
 from textwrap import dedent
 
-from future.utils import bind_method, PY26, PY3, PY2
+from future.utils import bind_method, PY26, PY3, PY2, PY27
 from future.moves.subprocess import check_output, STDOUT, CalledProcessError
 
 if PY26:
@@ -382,6 +382,12 @@ def expectedFailurePY26(func):
     return unittest.expectedFailure(func)
 
 
+def expectedFailurePY27(func):
+    if not PY27:
+        return func
+    return unittest.expectedFailure(func)
+
+
 def expectedFailurePY2(func):
     if not PY2:
         return func

src/future/utils/__init__.py

@@ -80,6 +80,7 @@
 PY3 = sys.version_info[0] == 3
 PY2 = sys.version_info[0] == 2
 PY26 = sys.version_info[0:2] == (2, 6)
+PY27 = sys.version_info[0:2] == (2, 7)
 PYPY = hasattr(sys, 'pypy_translation_info')
 
 

tests/test_future/test_backports.py

@@ -19,7 +19,7 @@
                                    ChainMap,
                                    _count_elements)
 from future.utils import PY26
-from future.tests.base import unittest, skip26, expectedFailurePY2
+from future.tests.base import unittest, skip26, expectedFailurePY27
 
 
 class CountTest(unittest.TestCase):
@@ -333,7 +333,7 @@ def test_multiset_operations(self):
                 set_result = setop(set(p.elements()), set(q.elements()))
                 self.assertEqual(counter_result, dict.fromkeys(set_result, 1))
 
-    @expectedFailurePY2
+    @expectedFailurePY27
     def test_inplace_operations(self):
         elements = 'abcd'
         for i in range(1000):
@@ -366,7 +366,7 @@ def test_subtract(self):
         c.subtract('aaaabbcce')
         self.assertEqual(c, Counter(a=-1, b=0, c=-1, d=1, e=-1))
 
-    @expectedFailurePY2
+    @expectedFailurePY27
     def test_unary(self):
         c = Counter(a=-5, b=0, c=5, d=10, e=15,g=40)
         self.assertEqual(dict(+c), dict(c=5, d=10, e=15, g=40))
@@ -630,7 +630,7 @@ def test_reinsert(self):
         od['a'] = 1
         self.assertEqual(list(od.items()), [('b', 2), ('a', 1)])
 
-    @expectedFailurePY2
+    @expectedFailurePY27
     def test_move_to_end(self):
         od = OrderedDict.fromkeys('abcde')
         self.assertEqual(list(od), list('abcde'))