Merge d62d691 into 41a14ca

CHANGELOG.md

@@ -12,6 +12,9 @@ Ideally, within a virtual environment.
 
 Changelog
 =========
+### 2.5.1 - TBD
+- Optimizations and simplification of async support, taking advantadge of Python3.4 deprecation.
+
 ### 2.5.0 - May 4, 2019
 - Updated to latest Falcon: 2.0.0
 - Added support for Marshmallow 3

hug/api.py

@@ -21,6 +21,7 @@
 """
 from __future__ import absolute_import
 
+import asyncio
 import sys
 from collections import OrderedDict, namedtuple
 from distutils.util import strtobool
@@ -35,7 +36,6 @@
 import hug.defaults
 import hug.output_format
 from hug import introspect
-from hug._async import asyncio, ensure_future
 from hug._version import current
 
 INTRO = """

hug/interface.py

@@ -22,6 +22,7 @@
 from __future__ import absolute_import
 
 import argparse
+import asyncio
 import os
 import sys
 from collections import OrderedDict
@@ -35,12 +36,21 @@
 import hug.output_format
 import hug.types as types
 from hug import introspect
-from hug._async import asyncio_call
 from hug.exceptions import InvalidTypeData
 from hug.format import parse_content_type
 from hug.types import MarshmallowInputSchema, MarshmallowReturnSchema, Multiple, OneOf, SmartBoolean, Text, text
 
 
+def asyncio_call(function, *args, **kwargs):
+    loop = asyncio.get_event_loop()
+    if loop.is_running():
+        return function(*args, **kwargs)
+
+    function = asyncio.ensure_future(function(*args, **kwargs), loop=loop)
+    loop.run_until_complete(function)
+    return function.result()
+
+
 class Interfaces(object):
     """Defines the per-function singleton applied to hugged functions defining common data needed by all interfaces"""
 

hug/test.py

@@ -29,7 +29,7 @@
 from urllib.parse import urlencode
 
 from falcon import HTTP_METHODS
-from falcon.testing import StartResponseMock, create_environ, DEFAULT_HOST
+from falcon.testing import DEFAULT_HOST, StartResponseMock, create_environ
 
 from hug import output_format
 from hug.api import API

requirements/development.txt

@@ -3,7 +3,7 @@ Cython==0.29.6
 -r common.txt
 flake8==3.5.0
 ipython==6.2.1
-isort==4.2.5
+isort==4.3.18
 pytest-cov==2.5.1
 pytest==4.3.1
 python-coveralls==2.9.1

tests/test_decorators.py

@@ -19,6 +19,7 @@
 OTHER DEALINGS IN THE SOFTWARE.
 
 """
+import asyncio
 import json
 import os
 import sys
@@ -33,7 +34,6 @@
 from marshmallow import ValidationError
 
 import hug
-from hug._async import coroutine
 from hug.exceptions import InvalidTypeData
 
 from .constants import BASE_DIRECTORY
@@ -1476,7 +1476,7 @@ def happens_on_startup(api):
         pass
 
     @hug.startup()
-    @coroutine
+    @asyncio.coroutine
     def async_happens_on_startup(api):
         pass
 

tests/test_types.py

@@ -26,7 +26,7 @@
 from uuid import UUID
 
 import pytest
-from marshmallow import Schema, fields, ValidationError
+from marshmallow import Schema, ValidationError, fields
 from marshmallow.decorators import validates_schema
 
 import hug