Merge pull request #8 from kammala/py37

OPT python3.7 support

Author: ricardosantosalves

fqn_decorators/async.py

@@ -1,27 +1,9 @@
-"""This module implements an async-aware decorator.
+import warnings
 
-For backwards compatibility with Python 2.x, it needs to remain separate from
-the rest of the codebase, since it uses Python 3.5 syntax (``async def``, ``await``).
-"""
-import sys
+warnings.warn(
+    'This module was renamed to `asynchronous` due to adding `async`'
+    ' keyword in python 3.7',
+    PendingDeprecationWarning
+)
 
-from .decorators import Decorator
-
-
-class AsyncDecorator(Decorator):
-    async def __call__(self, *args, **kwargs):
-        self.fqn = self.get_fqn()
-        self.args = args
-        self.kwargs = kwargs
-
-        self.before()
-        try:
-            self.result = await self.func(*self.args, **self.kwargs)
-        except:
-            self.exc_info = sys.exc_info()
-            self.exception()
-            raise
-        finally:
-            self.after()
-
-        return self.result
+from .asynchronous import *  # isort:skip

fqn_decorators/asynchronous.py

@@ -0,0 +1,27 @@
+"""This module implements an async-aware decorator.
+
+For backwards compatibility with Python 2.x, it needs to remain separate from
+the rest of the codebase, since it uses Python 3.5 syntax (``async def``, ``await``).
+"""
+import sys
+
+from .decorators import Decorator
+
+
+class AsyncDecorator(Decorator):
+    async def __call__(self, *args, **kwargs):
+        self.fqn = self.get_fqn()
+        self.args = args
+        self.kwargs = kwargs
+
+        self.before()
+        try:
+            self.result = await self.func(*self.args, **self.kwargs)
+        except:
+            self.exc_info = sys.exc_info()
+            self.exception()
+            raise
+        finally:
+            self.after()
+
+        return self.result

requirements/requirements-testing.txt

@@ -6,6 +6,7 @@ pkgversion
 # PyTest for running the tests.
 pytest
 pytest-cov
+pytest-asyncio; python_version >= '3.5'
 
 # docs
 sphinx

setup.py

@@ -12,6 +12,7 @@
                  'Programming Language :: Python :: 3',
                  'Programming Language :: Python :: 3.5',
                  'Programming Language :: Python :: 3.6',
+                 'Programming Language :: Python :: 3.7',
                  'Topic :: Internet :: WWW/HTTP'],
  'description': 'Easily create multi-purpose decorators that have access to '
                 'the FQN of the original function.',

setup_gen.py

@@ -27,6 +27,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Internet :: WWW/HTTP',
     ]
 )

tests/test_fqn_decorators_async.py renamed to tests/test_fqn_decorators_asynchronous.py

@@ -1,36 +1,33 @@
 import mock
 import pytest
 from fqn_decorators import get_fqn
-from fqn_decorators.async import AsyncDecorator
-
-# All test functions in this module will be treated as coroutines.
-# This avoids having to decorate every function with ``@pytest.mark.asyncio``.
-pytestmark = pytest.mark.asyncio
+from fqn_decorators.asynchronous import AsyncDecorator
 
 
 class TestFqnAsync:
-    async def test_class_async(self):
+    def test_class_async(self):
         assert get_fqn(AsyncDecorator) == \
-            'fqn_decorators.async.AsyncDecorator'
+            'fqn_decorators.asynchronous.AsyncDecorator'
 
-    async def test_method_async(self):
+    def test_method_async(self):
         assert get_fqn(AsyncDecorator().before) == \
-            'fqn_decorators.async.AsyncDecorator.before'
+            'fqn_decorators.asynchronous.AsyncDecorator.before'
 
-    async def test_decorated_method_async(self):
+    def test_decorated_method_async(self):
         assert get_fqn(AsyncDecorator().before) == \
-            'fqn_decorators.async.AsyncDecorator.before'
+            'fqn_decorators.asynchronous.AsyncDecorator.before'
 
-    async def test_decorated_method(self):
+    def test_decorated_method(self):
         class User:
             @AsyncDecorator
             async def method(self, a):
                 return a
 
         assert get_fqn(User().method) == \
-            'tests.test_fqn_decorators_async.User.method'
+            'tests.test_fqn_decorators_asynchronous.User.method'
 
 
+@pytest.mark.asyncio
 class TestAsyncDecorator:
     async def test_getattr_async(self):
         class Decorator(AsyncDecorator):
@@ -105,7 +102,7 @@ class User:
             def check_permission(self):
                 raise RuntimeError('Permission denied')
 
-        with mock.patch('fqn_decorators.async.AsyncDecorator.exception') as mocked_method:
+        with mock.patch('fqn_decorators.asynchronous.AsyncDecorator.exception') as mocked_method:
             with pytest.raises(RuntimeError):
                 await User().check_permission()
             assert mocked_method.called is True

tox.ini

@@ -15,15 +15,10 @@ deps =
 
 [testenv:py27]
 setenv =
-    PYTEST_ADDOPTS = --ignore tests/test_fqn_decorators_async.py
+    PYTEST_ADDOPTS = --ignore tests/test_fqn_decorators_asynchronous.py
 deps =
     {[testenv]deps}
 
-[testenv:py35]
-deps =
-    {[testenv]deps}
-    pytest-asyncio==0.6.0
-
 [testenv:lint]
 basepython = python3.5
 commands = flake8 decorators tests --exclude=fqn_decorators/__init__.py