From 8a388d3812535bfbdbe6e4629d33e1cb69179dcc Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 22 Jan 2015 10:06:10 -0500
Subject: fix tests on Python 3.1 (fixes #113)

Patch by Arfrever Frehtes Taifersar Arahesis.
---
 six.py      | 8 ++++++--
 test_six.py | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/six.py b/six.py
index 16a26c8..b7650b0 100644
--- a/six.py
+++ b/six.py
@@ -612,8 +612,12 @@ if PY3:
     StringIO = io.StringIO
     BytesIO = io.BytesIO
     _assertCountEqual = "assertCountEqual"
-    _assertRaisesRegex = "assertRaisesRegex"
-    _assertRegex = "assertRegex"
+    if sys.version_info[1] <= 1:
+        _assertRaisesRegex = "assertRaisesRegexp"
+        _assertRegex = "assertRegexpMatches"
+    else:
+        _assertRaisesRegex = "assertRaisesRegex"
+        _assertRegex = "assertRegex"
 else:
     def b(s):
         return s
diff --git a/test_six.py b/test_six.py
index 76a8ccb..f33f882 100644
--- a/test_six.py
+++ b/test_six.py
@@ -799,7 +799,7 @@ def test_add_metaclass():
     assert type(MySlotsWeakref) is Meta
 
 
-@py.test.mark.skipif("sys.version_info[:2] < (2, 7)")
+@py.test.mark.skipif("sys.version_info[:2] < (2, 7) or sys.version_info[:2] in ((3, 0), (3, 1))")
 def test_assertCountEqual():
     class TestAssertCountEqual(unittest.TestCase):
         def test(self):
-- 
cgit v1.2.1