Fix lazy imports

Author: evhub

__coconut__/__init__.pyi

@@ -89,9 +89,6 @@ try:
 except ImportError:
     def _deprecated(message: _t.Text) -> _t.Callable[[_T], _T]: ...  # type: ignore
 
-import importlib as _importlib
-_coconut_lazy_module = _importlib.import_module
-
 import _coconut as __coconut  # we mock _coconut as a package since mypy doesn't handle namespace classes very well
 _coconut = __coconut
 
@@ -205,6 +202,7 @@ _coconut_filter = filter
 _coconut_range = range
 _coconut_reversed = reversed
 _coconut_zip = zip
+_coconut_type = type
 
 
 zip_longest = _coconut.zip_longest
@@ -232,6 +230,12 @@ TYPE_CHECKING = _t.TYPE_CHECKING
 _coconut_sentinel: _t.Any = ...
 
 
+@_t.overload
+def _coconut_lazy_module(name: str) -> _coconut.types.ModuleType: ...
+@_t.overload
+def _coconut_lazy_module(name: str, *, attr: str) -> _t.Any: ...
+
+
 def scan(
     func: _t.Callable[[_T, _U], _T],
     iterable: _t.Iterable[_U],

_coconut/__init__.pyi

@@ -181,7 +181,6 @@ str = _builtins.str
 sum = _builtins.sum
 super = _builtins.super
 tuple = _builtins.tuple
-type = _builtins.type
 zip = _builtins.zip
 vars = _builtins.vars
 repr = _builtins.repr

coconut/__coconut__.pyi

@@ -1,2 +1,2 @@
 from __coconut__ import *
-from __coconut__ import _coconut_tail_call, _coconut_tco, _coconut_call_set_names, _coconut_handle_cls_kwargs, _coconut_handle_cls_stargs, _namedtuple_of, _coconut, _coconut_Expected, _coconut_MatchError, _coconut_SupportsAdd, _coconut_SupportsMinus, _coconut_SupportsMul, _coconut_SupportsPow, _coconut_SupportsTruediv, _coconut_SupportsFloordiv, _coconut_SupportsMod, _coconut_SupportsAnd, _coconut_SupportsXor, _coconut_SupportsOr, _coconut_SupportsLshift, _coconut_SupportsRshift, _coconut_SupportsMatmul, _coconut_SupportsInv, _coconut_Expected, _coconut_MatchError, _coconut_iter_getitem, _coconut_base_compose, _coconut_forward_compose, _coconut_back_compose, _coconut_forward_star_compose, _coconut_back_star_compose, _coconut_forward_dubstar_compose, _coconut_back_dubstar_compose, _coconut_pipe, _coconut_star_pipe, _coconut_dubstar_pipe, _coconut_back_pipe, _coconut_back_star_pipe, _coconut_back_dubstar_pipe, _coconut_none_pipe, _coconut_none_star_pipe, _coconut_none_dubstar_pipe, _coconut_bool_and, _coconut_bool_or, _coconut_none_coalesce, _coconut_minus, _coconut_map, _coconut_partial, _coconut_complex_partial, _coconut_get_function_match_error, _coconut_base_pattern_func, _coconut_addpattern, _coconut_sentinel, _coconut_assert, _coconut_raise, _coconut_mark_as_match, _coconut_reiterable, _coconut_self_match_types, _coconut_dict_merge, _coconut_exec, _coconut_comma_op, _coconut_arr_concat_op, _coconut_mk_anon_namedtuple, _coconut_matmul, _coconut_py_str, _coconut_flatten, _coconut_multiset, _coconut_back_none_pipe, _coconut_back_none_star_pipe, _coconut_back_none_dubstar_pipe, _coconut_forward_none_compose, _coconut_back_none_compose, _coconut_forward_none_star_compose, _coconut_back_none_star_compose, _coconut_forward_none_dubstar_compose, _coconut_back_none_dubstar_compose, _coconut_call_or_coefficient, _coconut_in, _coconut_not_in, _coconut_attritemgetter, _coconut_if_op, _coconut_CoconutWarning, _coconut_lazy_module
+from __coconut__ import _coconut_tail_call, _coconut_tco, _coconut_call_set_names, _coconut_handle_cls_kwargs, _coconut_handle_cls_stargs, _namedtuple_of, _coconut, _coconut_Expected, _coconut_MatchError, _coconut_SupportsAdd, _coconut_SupportsMinus, _coconut_SupportsMul, _coconut_SupportsPow, _coconut_SupportsTruediv, _coconut_SupportsFloordiv, _coconut_SupportsMod, _coconut_SupportsAnd, _coconut_SupportsXor, _coconut_SupportsOr, _coconut_SupportsLshift, _coconut_SupportsRshift, _coconut_SupportsMatmul, _coconut_SupportsInv, _coconut_Expected, _coconut_MatchError, _coconut_iter_getitem, _coconut_base_compose, _coconut_forward_compose, _coconut_back_compose, _coconut_forward_star_compose, _coconut_back_star_compose, _coconut_forward_dubstar_compose, _coconut_back_dubstar_compose, _coconut_pipe, _coconut_star_pipe, _coconut_dubstar_pipe, _coconut_back_pipe, _coconut_back_star_pipe, _coconut_back_dubstar_pipe, _coconut_none_pipe, _coconut_none_star_pipe, _coconut_none_dubstar_pipe, _coconut_bool_and, _coconut_bool_or, _coconut_none_coalesce, _coconut_minus, _coconut_map, _coconut_partial, _coconut_complex_partial, _coconut_get_function_match_error, _coconut_base_pattern_func, _coconut_addpattern, _coconut_sentinel, _coconut_assert, _coconut_raise, _coconut_mark_as_match, _coconut_reiterable, _coconut_self_match_types, _coconut_dict_merge, _coconut_exec, _coconut_comma_op, _coconut_arr_concat_op, _coconut_mk_anon_namedtuple, _coconut_matmul, _coconut_py_str, _coconut_flatten, _coconut_multiset, _coconut_back_none_pipe, _coconut_back_none_star_pipe, _coconut_back_none_dubstar_pipe, _coconut_forward_none_compose, _coconut_back_none_compose, _coconut_forward_none_star_compose, _coconut_back_none_star_compose, _coconut_forward_none_dubstar_compose, _coconut_back_none_dubstar_compose, _coconut_call_or_coefficient, _coconut_in, _coconut_not_in, _coconut_attritemgetter, _coconut_if_op, _coconut_CoconutWarning, _coconut_lazy_module, _coconut_type

coconut/compiler/compiler.py

@@ -4086,11 +4086,11 @@ def _make_import_stmt(self, imp_from, imp, imp_as, raw=False, lazy=False):
                 mod_name = ".".join(fake_mods[:i])
                 out_lines.append(self.ensure_module_or_create_fake(mod_name))
             bind_to = imp_as if imp_as is not None else imp
-            out_lines.append('{bind_to} = _coconut_lazy_module("{module}"){attr} {type_ignore}'.format(
+            out_lines.append('{bind_to} = _coconut_lazy_module("{module}"{attr_param}) {type_ignore}'.format(
                 bind_to=bind_to,
                 module=imp_from if imp_from is not None else imp,
-                attr="." + imp if imp_from is not None else "",
-                type_ignore=self.type_ignore_comment() if "." in bind_to else "",
+                attr_param=', attr="' + imp + '"' if imp_from is not None else "",
+                type_ignore=self.type_ignore_comment(),
             ))
             return "\n".join(out_lines)
         else:
@@ -4257,7 +4257,7 @@ def complex_raise_stmt_handle(self, loc, tokens):
                 from_expr=from_expr,
             )
 
-    def normal_dict_comp_handle(self, original, loc, tokens):
+    def normal_dict_comp_handle(self, tokens):
         """Process standard dictionary comprehension."""
         key, val, comp = tokens
         # on < 3.9 have to use _coconut.dict since it's different than py_dict

coconut/compiler/header.py

@@ -525,7 +525,7 @@ def _coconut_matmul(a, b, **kwargs):
     if "numpy" in (_coconut_get_base_module(a), _coconut_get_base_module(b)):
         from numpy import matmul
         return matmul(a, b)
-    raise _coconut.TypeError("unsupported operand type(s) for @: " + _coconut.repr(_coconut.type(a)) + " and " + _coconut.repr(_coconut.type(b)))
+    raise _coconut.TypeError("unsupported operand type(s) for @: " + _coconut.repr(_coconut_type(a)) + " and " + _coconut.repr(_coconut_type(b)))
             ''',
         ),
         def_total_and_comparisons=pycondition(
@@ -621,7 +621,7 @@ def __call__(self, *args, **kwargs):
         arg = f(arg)
         if await_f:
             arg = yield _coconut.asyncio.From(arg)
-    raise _coconut.asyncio.Return(arg)
+    raise _coconut.asyncio_Return(arg)
                     ''',
             ),
             indent=1
@@ -666,7 +666,7 @@ def __anext__(self):
     #  (extra_format_dict is to keep indentation levels matching)
     extra_format_dict = dict(
         # when anything is added to this list it must also be added to *both* __coconut__ stub files
-        underscore_imports="{tco_comma}{call_set_names_comma}{handle_cls_args_comma}_namedtuple_of, _coconut, _coconut_Expected, _coconut_MatchError, _coconut_SupportsAdd, _coconut_SupportsMinus, _coconut_SupportsMul, _coconut_SupportsPow, _coconut_SupportsTruediv, _coconut_SupportsFloordiv, _coconut_SupportsMod, _coconut_SupportsAnd, _coconut_SupportsXor, _coconut_SupportsOr, _coconut_SupportsLshift, _coconut_SupportsRshift, _coconut_SupportsMatmul, _coconut_SupportsInv, _coconut_iter_getitem, _coconut_base_compose, _coconut_forward_compose, _coconut_back_compose, _coconut_forward_star_compose, _coconut_back_star_compose, _coconut_forward_dubstar_compose, _coconut_back_dubstar_compose, _coconut_pipe, _coconut_star_pipe, _coconut_dubstar_pipe, _coconut_back_pipe, _coconut_back_star_pipe, _coconut_back_dubstar_pipe, _coconut_none_pipe, _coconut_none_star_pipe, _coconut_none_dubstar_pipe, _coconut_bool_and, _coconut_bool_or, _coconut_none_coalesce, _coconut_minus, _coconut_map, _coconut_partial, _coconut_complex_partial, _coconut_get_function_match_error, _coconut_base_pattern_func, _coconut_addpattern, _coconut_sentinel, _coconut_assert, _coconut_raise, _coconut_mark_as_match, _coconut_reiterable, _coconut_self_match_types, _coconut_dict_merge, _coconut_exec, _coconut_comma_op, _coconut_arr_concat_op, _coconut_mk_anon_namedtuple, _coconut_matmul, _coconut_py_str, _coconut_flatten, _coconut_multiset, _coconut_back_none_pipe, _coconut_back_none_star_pipe, _coconut_back_none_dubstar_pipe, _coconut_forward_none_compose, _coconut_back_none_compose, _coconut_forward_none_star_compose, _coconut_back_none_star_compose, _coconut_forward_none_dubstar_compose, _coconut_back_none_dubstar_compose, _coconut_call_or_coefficient, _coconut_in, _coconut_not_in, _coconut_attritemgetter, _coconut_if_op, _coconut_CoconutWarning, _coconut_lazy_module".format(**format_dict),
+        underscore_imports="{tco_comma}{call_set_names_comma}{handle_cls_args_comma}_namedtuple_of, _coconut, _coconut_Expected, _coconut_MatchError, _coconut_SupportsAdd, _coconut_SupportsMinus, _coconut_SupportsMul, _coconut_SupportsPow, _coconut_SupportsTruediv, _coconut_SupportsFloordiv, _coconut_SupportsMod, _coconut_SupportsAnd, _coconut_SupportsXor, _coconut_SupportsOr, _coconut_SupportsLshift, _coconut_SupportsRshift, _coconut_SupportsMatmul, _coconut_SupportsInv, _coconut_iter_getitem, _coconut_base_compose, _coconut_forward_compose, _coconut_back_compose, _coconut_forward_star_compose, _coconut_back_star_compose, _coconut_forward_dubstar_compose, _coconut_back_dubstar_compose, _coconut_pipe, _coconut_star_pipe, _coconut_dubstar_pipe, _coconut_back_pipe, _coconut_back_star_pipe, _coconut_back_dubstar_pipe, _coconut_none_pipe, _coconut_none_star_pipe, _coconut_none_dubstar_pipe, _coconut_bool_and, _coconut_bool_or, _coconut_none_coalesce, _coconut_minus, _coconut_map, _coconut_partial, _coconut_complex_partial, _coconut_get_function_match_error, _coconut_base_pattern_func, _coconut_addpattern, _coconut_sentinel, _coconut_assert, _coconut_raise, _coconut_mark_as_match, _coconut_reiterable, _coconut_self_match_types, _coconut_dict_merge, _coconut_exec, _coconut_comma_op, _coconut_arr_concat_op, _coconut_mk_anon_namedtuple, _coconut_matmul, _coconut_py_str, _coconut_flatten, _coconut_multiset, _coconut_back_none_pipe, _coconut_back_none_star_pipe, _coconut_back_none_dubstar_pipe, _coconut_forward_none_compose, _coconut_back_none_compose, _coconut_forward_none_star_compose, _coconut_back_none_star_compose, _coconut_forward_none_dubstar_compose, _coconut_back_none_dubstar_compose, _coconut_call_or_coefficient, _coconut_in, _coconut_not_in, _coconut_attritemgetter, _coconut_if_op, _coconut_CoconutWarning, _coconut_lazy_module, _coconut_type".format(**format_dict),
         import_typing=pycondition(
             (3, 5),
             if_ge='''
@@ -764,6 +764,15 @@ class you_need_to_install_typing_extensions{object}:
             (3, 4),
             if_lt='''
 asyncio = _coconut_lazy_module("trollius")
+def _coconut_trollius_coroutine(func):
+    try:
+        import trollius
+        return trollius.coroutine(func)
+    except ImportError as err:
+        def raise_import_error(*args, **kwargs):
+            raise err
+        return raise_import_error
+asyncio.coroutine = _coconut_trollius_coroutine
 asyncio_Return = _coconut_lazy_module("trollius", attr="Return")
             ''',
             if_ge='''

coconut/compiler/matching.py

@@ -1133,7 +1133,7 @@ def match_class(self, tokens, item):
         self_match_matcher, other_cls_matcher = self.branches(2)
 
         # handle instances of _coconut_self_match_types
-        self_match_matcher.add_check("_coconut.type(" + item + ") in _coconut_self_match_types")
+        self_match_matcher.add_check("_coconut_type(" + item + ") in _coconut_self_match_types")
         if pos_matches:
             if len(pos_matches) > 1:
                 self_match_matcher.add_def(
@@ -1150,7 +1150,7 @@ def match_class(self, tokens, item):
                 self_match_matcher.match(pos_matches[0], item)
 
         # handle all other classes
-        other_cls_matcher.add_check("not _coconut.type(" + item + ") in _coconut_self_match_types")
+        other_cls_matcher.add_check("not _coconut_type(" + item + ") in _coconut_self_match_types")
         match_args_var = other_cls_matcher.get_temp_var()
         other_cls_matcher.add_def(
             handle_indentation(

coconut/compiler/templates/header.py_template

@@ -16,22 +16,30 @@ def _coconut_lazy_module(name, on_import=None, attr=None):
             return _coconut.getattr(state[0], attr)
         return state[0]
     if attr is None:
-        from types import ModuleType
-        class lazy_mod(ModuleType):
-            def __getattr__(self, name):
-                return _coconut.getattr(load(), name)
-            def __dir__(self):
-                return _coconut.dir(load())
-        return lazy_mod(_coconut_py_str(name))
+        from types import ModuleType as base
     else:
-        class meta(type):
-            def __getattr__(cls, name):
-                return _coconut.getattr(load(), name)
-            def __setattr__(cls, name, value):
-                _coconut.setattr(load(), name, value)
-            def __dir__(cls):
-                return _coconut.dir(load())
-        return meta(_coconut_py_str(name), (), {{}})
+        base = _coconut_type
+    class lazy_obj(base):
+        def __getattr__(cls, name):
+            return _coconut.getattr(load(), name)
+        def __setattr__(cls, name, value):
+            _coconut.setattr(load(), name, value)
+        def __dir__(cls):
+            return _coconut.dir(load())
+        def __instancecheck__(cls, inst):
+            return _coconut.isinstance(inst, load())
+        def __subclasscheck__(cls, sub):
+            return _coconut.issubclass(sub, load())
+    def _coconut_make_lazy_dunder(_coconut_n):
+        def _coconut_lazy_dunder(cls, *args, **kwargs):
+            return _coconut.getattr(load(), _coconut_n)(*args, **kwargs)
+        return _coconut_lazy_dunder
+    for _coconut_dunder in ("__call__", "__hash__", "__repr__", "__str__", "__format__", "__bytes__", "__bool__", "__nonzero__", "__int__", "__float__", "__complex__", "__index__", "__round__", "__eq__", "__ne__", "__lt__", "__le__", "__gt__", "__ge__", "__len__", "__contains__", "__iter__", "__next__", "__reversed__", "__getitem__", "__setitem__", "__delitem__", "__missing__", "__add__", "__radd__", "__iadd__", "__sub__", "__rsub__", "__isub__", "__mul__", "__rmul__", "__imul__", "__floordiv__", "__rfloordiv__", "__ifloordiv__", "__truediv__", "__rtruediv__", "__itruediv__", "__mod__", "__rmod__", "__imod__", "__pow__", "__rpow__", "__ipow__", "__matmul__", "__rmatmul__", "__imatmul__", "__divmod__", "__rdivmod__", "__neg__", "__pos__", "__abs__", "__invert__", "__and__", "__rand__", "__iand__", "__or__", "__ror__", "__ior__", "__xor__", "__rxor__", "__ixor__", "__lshift__", "__rlshift__", "__ilshift__", "__rshift__", "__rrshift__", "__irshift__", "__enter__", "__exit__", "__aiter__", "__anext__", "__await__", "__aenter__", "__aexit__", "__reduce__", "__reduce_ex__", "__copy__", "__deepcopy__"):
+        _coconut_type.__setattr__(lazy_obj, _coconut_dunder, _coconut_make_lazy_dunder(_coconut_dunder))
+    if attr is None:
+        return lazy_obj(_coconut_py_str(name))
+    else:
+        return lazy_obj(_coconut_py_str(name), (), {{}})
 @_coconut_wraps(_coconut_py_super)
 def _coconut_super(type=None, object_or_type=None):
     if type is None:
@@ -82,7 +90,7 @@ class _coconut{object}:{COMMENT.EVERYTHING_HERE_MUST_BE_COPIED_TO_STUB_FILE}
     reiterables = abc.Sequence, abc.Mapping, abc.Set
     fmappables = list, tuple, dict, set, frozenset, bytes, bytearray
     abc.Sequence.register(collections.deque)
-    Ellipsis, NotImplemented, NotImplementedError, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, RuntimeError, all, any, bool, bytes, callable, chr, classmethod, complex, dict, dir, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, locals, globals, map, min, max, next, object, ord, property, range, reversed, set, setattr, slice, str, sum, super, tuple, type, vars, zip, repr, print{comma_bytearray} = Ellipsis, NotImplemented, NotImplementedError, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, RuntimeError, all, any, bool, bytes, callable, chr, classmethod, complex, dict, dir, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, locals, globals, map, {lstatic}min{rstatic}, {lstatic}max{rstatic}, next, object, ord, property, range, reversed, set, setattr, slice, str, sum, {lstatic}super{rstatic}, tuple, type, vars, zip, {lstatic}repr{rstatic}, {lstatic}print{rstatic}{comma_bytearray}
+    Ellipsis, NotImplemented, NotImplementedError, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, RuntimeError, all, any, bool, bytes, callable, chr, classmethod, complex, dict, dir, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, locals, globals, map, min, max, next, object, ord, property, range, reversed, set, setattr, slice, str, sum, super, tuple, vars, zip, repr, print{comma_bytearray} = Ellipsis, NotImplemented, NotImplementedError, Exception, AttributeError, ImportError, IndexError, KeyError, NameError, TypeError, ValueError, StopIteration, RuntimeError, all, any, bool, bytes, callable, chr, classmethod, complex, dict, dir, enumerate, filter, float, frozenset, getattr, hasattr, hash, id, int, isinstance, issubclass, iter, len, list, locals, globals, map, {lstatic}min{rstatic}, {lstatic}max{rstatic}, next, object, ord, property, range, reversed, set, setattr, slice, str, sum, {lstatic}super{rstatic}, tuple, vars, zip, {lstatic}repr{rstatic}, {lstatic}print{rstatic}{comma_bytearray}
 def _coconut_handle_cls_kwargs(**kwargs):
     """Some code taken from six under the terms of its MIT license."""
     metaclass = kwargs.pop("metaclass", None)
@@ -1405,7 +1413,7 @@ def _coconut_get_function_match_error():
 class _coconut_base_pattern_func(_coconut_base_callable):{COMMENT.no_slots_to_allow_func_attrs}
     _coconut_is_match = True
     def __init__(self, *funcs):
-        self.FunctionMatchError = _coconut.type({py_str_MatchError}, ({_coconut_}MatchError,), {empty_py_dict})
+        self.FunctionMatchError = _coconut_type({py_str_MatchError}, ({_coconut_}MatchError,), {empty_py_dict})
         self.patterns = []
         self.__doc__ = None
         self.__name__ = None
@@ -1677,7 +1685,7 @@ def _coconut_memoize_helper(maxsize=None, typed=False):
             @_coconut_wraps(func)
             def memoized_func(*args, **kwargs):
                 if typed:
-                    key = (_coconut.tuple((x, _coconut.type(x)) for x in args), _coconut.tuple((k, _coconut.type(k), v, _coconut.type(v)) for k, v in kwargs.items()))
+                    key = (_coconut.tuple((x, _coconut_type(x)) for x in args), _coconut.tuple((k, _coconut_type(k), v, _coconut_type(v)) for k, v in kwargs.items()))
                 else:
                     key = (args, _coconut.tuple(kwargs.items()))
                 got = cache.get(key, _coconut_sentinel)