Fix the merge issues. Now async stuff should at least partially work

2018-02-19 01:35:37 +01:00
parent 8f4b68ae39
commit f1c2aef963
3 changed files with 13 additions and 24 deletions
@@ -453,6 +453,8 @@ class _SPECIAL_OBJECTS(object):
    MODULE_CLASS = types.ModuleType
    GENERATOR_OBJECT = _a_generator(1.0)
    BUILTINS = builtins
+    COROUTINE_TYPE = getattr(types, 'CoroutineType', None)
+    ASYNC_GENERATOR_TYPE = getattr(types, 'AsyncGeneratorType', None)


 def get_special_object(evaluator, identifier):