From 63fe9fa1f74beb7af5c0badb061d0688416cbc12 Mon Sep 17 00:00:00 2001 From: Sylvain Marie Date: Fri, 26 Oct 2018 14:38:40 +0200 Subject: Fixed issue with coroutines in python 3.5: indeed unfortunately they appear as generator functions in python 3.5. --- src/decorator.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/decorator.py b/src/decorator.py index ccb2204..4433abf 100644 --- a/src/decorator.py +++ b/src/decorator.py @@ -236,7 +236,18 @@ def decorate(func, caller, extras=()): ex = '_e%d_' % i evaldict[ex] = extra es += ex + ', ' - if isgeneratorfunction(caller): + + if not ('3.5' <= sys.version < '3.6'): + create_generator = isgeneratorfunction(caller) + else: + # With Python 3.5: apparently isgeneratorfunction returns + # True for all coroutines + + # However we know that it is NOT possible to have a generator + # coroutine in python 3.5: PEP525 was not there yet. + create_generator = isgeneratorfunction(caller) and not iscoroutinefunction(caller) + + if create_generator: fun = FunctionMaker.create( func, "for res in _call_(_func_, %s%%(shortsignature)s):\n" " yield res" % es, evaldict, __wrapped__=func) -- cgit v1.2.1