Fixed compatibility with pytest 4+

Fixes #401.

2 files changed, 14 insertions, 18 deletions

diff --git a/setup.py b/setup.py
index 6988f74..f195542 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@ setup(
         'twisted': ['twisted'],
         'zookeeper': ['kazoo'],
         'testing': [
-            'pytest < 3.7',
+            'pytest',
             'pytest-cov',
             'pytest-tornado5'
         ],
diff --git a/tests/test_util.py b/tests/test_util.py
index f1f07e6..57a322a 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -220,27 +220,23 @@ class TestObjToRef(object):
         assert str(exc.value) == 'Cannot create a reference to a nested function'
 
     @pytest.mark.parametrize('input,expected', [
-        pytest.mark.skipif(sys.version_info[:2] == (3, 2),
-                           reason="Unbound methods can't be resolved on Python 3.2")(
-            (DummyClass.meth, 'tests.test_util:DummyClass.meth')
-        ),
+        (DummyClass.meth, 'tests.test_util:DummyClass.meth'),
         (DummyClass.classmeth, 'tests.test_util:DummyClass.classmeth'),
-        pytest.mark.skipif(sys.version_info < (3, 3),
-                           reason="Requires __qualname__ (Python 3.3+)")(
-            (DummyClass.InnerDummyClass.innerclassmeth,
-             'tests.test_util:DummyClass.InnerDummyClass.innerclassmeth')
-        ),
-        pytest.mark.skipif(sys.version_info < (3, 3),
-                           reason="Requires __qualname__ (Python 3.3+)")(
-            (DummyClass.staticmeth, 'tests.test_util:DummyClass.staticmeth')
+        pytest.param(
+            DummyClass.InnerDummyClass.innerclassmeth,
+            'tests.test_util:DummyClass.InnerDummyClass.innerclassmeth',
+            marks=[pytest.mark.skipif(sys.version_info < (3, 3),
+                                      reason="Requires __qualname__ (Python 3.3+)")]
         ),
-        pytest.mark.skipif(sys.version_info >= (3, 2),
-                           reason="Unbound methods (Python 3.2) and __qualname__ (Python 3.3+)")(
-            (InheritedDummyClass.pause, 'tests.test_util:InheritedDummyClass.pause')
+        pytest.param(
+            DummyClass.staticmeth,
+            'tests.test_util:DummyClass.staticmeth',
+            marks=[pytest.mark.skipif(sys.version_info < (3, 3),
+                                      reason="Requires __qualname__ (Python 3.3+)")]
         ),
         (timedelta, 'datetime:timedelta'),
-    ], ids=['unbound method', 'class method', 'inner class method', 'static method',
-            'inherited class method', 'timedelta'])
+    ], ids=['class method', 'inner class method', 'static method', 'inherited class method',
+            'timedelta'])
     def test_valid_refs(self, input, expected):
         assert obj_to_ref(input) == expected