deprecation

Author: smurfix

tests/interop/__init__.py

@@ -5,6 +5,7 @@
 from tests import aiotest
 from functools import partial
 import sys
+from .. import utils
 
 
 class Seen:
@@ -306,7 +307,8 @@ async def dly_asyncio():
             await asyncio.sleep(0.01, loop=loop)
             yield 2
 
-        res = await async_gen_to_list(loop.wrap_generator(dly_asyncio))
+        with utils.deprecate(self):
+            res = await async_gen_to_list(loop.wrap_generator(dly_asyncio))
         assert res == [1, 2]
 
     @pytest.mark.trio
@@ -316,8 +318,9 @@ async def dly_asyncio():
             raise RuntimeError("I has an owie")
             yield 2
 
-        with pytest.raises(RuntimeError) as err:
-            await async_gen_to_list(loop.wrap_generator(dly_asyncio))
+        with utils.deprecate(self):
+            with pytest.raises(RuntimeError) as err:
+                await async_gen_to_list(loop.wrap_generator(dly_asyncio))
         assert err.value.args[0] == "I has an owie"
 
     @pytest.mark.trio
@@ -334,9 +337,10 @@ async def cancel_soon(nursery):
         hold = asyncio.Event(loop=loop)
         seen = Seen()
 
-        async with trio.open_nursery() as nursery:
-            nursery.start_soon(async_gen_to_list, loop.wrap_generator(dly_asyncio, hold, seen))
-            nursery.start_soon(cancel_soon, nursery)
+        with utils.deprecate(self):
+            async with trio.open_nursery() as nursery:
+                nursery.start_soon(async_gen_to_list, loop.wrap_generator(dly_asyncio, hold, seen))
+                nursery.start_soon(cancel_soon, nursery)
         assert nursery.cancel_scope.cancel_called
         assert seen.flag == 1
 

tests/interop/test_calls.py

@@ -16,24 +16,6 @@
 )
 RGX_REPR = re.compile(STR_RGX_REPR)
 
-if sys.version_info >= (3, 7):
-
-    def deprecate(self):
-        return self.assertWarns(DeprecationWarning)
-
-else:
-
-    class deprecate:
-        def __init__(self, tc):
-            pass
-
-        def __enter__(self):
-            return self
-
-        def __exit__(self, *tb):
-            pass
-
-
 class LockTests(test_utils.TestCase):
     def setUp(self):
         super().setUp()
@@ -59,7 +41,7 @@ def test_repr(self):
 
         @asyncio.coroutine
         def acquire_lock():
-            with deprecate(self):
+            with test_utils.deprecate(self, (3, 7)):
                 yield from lock
 
         self.loop.run_until_complete(acquire_lock())
@@ -71,7 +53,7 @@ def test_lock(self):
 
         @asyncio.coroutine
         def acquire_lock():
-            with deprecate(self):
+            with test_utils.deprecate(self, (3, 7)):
                 return (yield from lock)
 
         res = self.loop.run_until_complete(acquire_lock())
@@ -230,7 +212,7 @@ def test_context_manager(self):
 
         @asyncio.coroutine
         def acquire_lock():
-            with deprecate(self):
+            with test_utils.deprecate(self, (3, 7)):
                 return (yield from lock)
 
         with self.loop.run_until_complete(acquire_lock()):
@@ -243,7 +225,7 @@ def test_context_manager_cant_reuse(self):
 
         @asyncio.coroutine
         def acquire_lock():
-            with deprecate(self):
+            with test_utils.deprecate(self, (3, 7)):
                 return (yield from lock)
 
         # This spells "yield from lock" outside a generator.
@@ -675,7 +657,7 @@ def test_context_manager(self):
 
         @asyncio.coroutine
         def acquire_cond():
-            with deprecate(self):
+            with test_utils.deprecate(self, (3, 7)):
                 return (yield from cond)
 
         with self.loop.run_until_complete(acquire_cond()):
@@ -759,7 +741,7 @@ def test_semaphore(self):
 
         @asyncio.coroutine
         def acquire_lock():
-            with deprecate(self):
+            with test_utils.deprecate(self, (3, 7)):
                 return (yield from sem)
 
         res = self.loop.run_until_complete(acquire_lock())
@@ -899,7 +881,7 @@ def test_context_manager(self):
 
         @asyncio.coroutine
         def acquire_lock():
-            with deprecate(self):
+            with test_utils.deprecate(self, (3, 7)):
                 return (yield from sem)
 
         with self.loop.run_until_complete(acquire_lock()):

tests/python/test_locks.py

@@ -15,6 +15,7 @@
 import time
 import unittest
 import weakref
+import pytest
 
 from unittest import mock
 
@@ -580,3 +581,23 @@ def get_function_source(func):
     if source is None:
         raise ValueError("unable to get the source of %r" % (func,))
     return source
+
+
+
+def deprecate(tc, vers=None):
+    if vers is None or sys.version_info >= vers:
+        return pytest.deprecated_call()
+
+    class _deprecate:
+        def __init__(self, tc):
+            pass
+
+        def __enter__(self):
+            return self
+
+        def __exit__(self, *tb):
+            pass
+
+    return _deprecate(tc)
+
+