Fix py2

Author: evhub

coconut/compiler/header.py

@@ -238,12 +238,12 @@ def base_async_def(
     return prepare(out, **kwargs)
 
 
-def make_py_str(str_contents, target, after_py_str_defined=False):
-    """Get code that effectively wraps the given code in py_str."""
+def make_py_str(str_contents, target, after_py_str_defined):
+    """Get code that effectively wraps the given str in py_str."""
     return (
         repr(str_contents) if target.startswith("3")
         else "b" + repr(str_contents) if target.startswith("2")
-        else "py_str(" + repr(str_contents) + ")" if after_py_str_defined
+        else "_coconut_py_str(" + repr(str_contents) + ")" if after_py_str_defined
         else "str(" + repr(str_contents) + ")"
     )
 
@@ -285,9 +285,12 @@ def process_header_args(which, use_hash, target, no_tco, strict, no_wrap):
         _coconut_="_coconut_" if which != "__coconut__" else "",  # only for aliases defined at the end of the header
         VERSION_STR=VERSION_STR,
         module_docstring='"""Built-in Coconut utilities."""\n\n' if which == "__coconut__" else "",
-        __coconut__=make_py_str("__coconut__", target),
-        _coconut_cached__coconut__=make_py_str("_coconut_cached__coconut__", target),
-        coconut_cache_dir=make_py_str(coconut_cache_dir, target),
+        __coconut__=make_py_str("__coconut__", target, after_py_str_defined=False),
+        _coconut_cached__coconut__=make_py_str("_coconut_cached__coconut__", target, after_py_str_defined=False),
+        coconut_cache_dir=make_py_str(coconut_cache_dir, target, after_py_str_defined=False),
+        py_str_module=make_py_str("module", target, after_py_str_defined=True),
+        py_str_typing=make_py_str("typing", target, after_py_str_defined=True),
+        py_str_MatchError=make_py_str("MatchError", target, after_py_str_defined=True),
         object="" if target.startswith("3") else "(object)",
         comma_object="" if target.startswith("3") else ", object",
         comma_slash=", /" if target_info >= (3, 8) else "",

coconut/compiler/templates/header.py_template

@@ -25,7 +25,7 @@ def _coconut_lazy_module(name, on_import=None, attr=None):
                 return _coconut.dir(load())
             except _coconut.ImportError:
                 return []
-    return meta("_coconut_lazy_module", (), {{}})
+    return meta({py_str_module}, (), {{}})
 @_coconut_wraps(_coconut_py_super)
 def _coconut_super(type=None, object_or_type=None):
     if type is None:
@@ -50,7 +50,7 @@ class _coconut{object}:{COMMENT.EVERYTHING_HERE_MUST_BE_COPIED_TO_STUB_FILE}
 {import_pickle}
 {import_OrderedDict}
 {import_collections_abc}
-    typing = types.ModuleType(_coconut_py_str("typing"))
+    typing = types.ModuleType({py_str_typing})
     try:
         import typing_extensions
     except ImportError:
@@ -1399,7 +1399,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(_coconut_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