Merge pull request #316 from eric-weaver/issue-303-conditionally-use-…

…async-def

Use async def for python > 3.5

freezegun/_async.py

@@ -5,13 +5,12 @@
 
 def wrap_coroutine(api, coroutine):
     @functools.wraps(coroutine)
-    @asyncio.coroutine
-    def wrapper(*args, **kwargs):
+    async def wrapper(*args, **kwargs):
         with api as time_factory:
             if api.as_arg:
-                result = yield from coroutine(time_factory, *args, **kwargs)
+                result = await coroutine(time_factory, *args, **kwargs)
             else:
-                result = yield from coroutine(*args, **kwargs)
+                result = await coroutine(*args, **kwargs)
         return result
 
     return wrapper

freezegun/_async_coroutine.py

@@ -0,0 +1,17 @@
+import functools
+
+import asyncio
+
+
+def wrap_coroutine(api, coroutine):
+    @functools.wraps(coroutine)
+    @asyncio.coroutine
+    def wrapper(*args, **kwargs):
+        with api as time_factory:
+            if api.as_arg:
+                result = yield from coroutine(time_factory, *args, **kwargs)
+            else:
+                result = yield from coroutine(*args, **kwargs)
+        return result
+
+    return wrapper

freezegun/api.py

@@ -79,7 +79,10 @@
 
 try:
     iscoroutinefunction = inspect.iscoroutinefunction
-    from freezegun._async import wrap_coroutine
+    if sys.version_info < (3, 5):
+        from freezegun._async_coroutine import wrap_coroutine
+    else:
+        from freezegun._async import wrap_coroutine
 except AttributeError:
     iscoroutinefunction = lambda x: False