diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-01-22 10:06:10 -0500 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-01-22 10:06:10 -0500 |
| commit | 8a388d3812535bfbdbe6e4629d33e1cb69179dcc (patch) | |
| tree | d67fb174c8dfc3ae2e562d46bf555155e523e76a | |
| parent | b01d8d7141916c3e7e131d3e9d9947d0ae064fef (diff) | |
| download | six-8a388d3812535bfbdbe6e4629d33e1cb69179dcc.tar.gz | |
fix tests on Python 3.1 (fixes #113)
Patch by Arfrever Frehtes Taifersar Arahesis.
| -rw-r--r-- | six.py | 8 | ||||
| -rw-r--r-- | test_six.py | 2 |
2 files changed, 7 insertions, 3 deletions
@@ -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): |