[mypyc] Fix to work on 3.5.1

msullivan · msullivan · commit 034e437e874b · 2019-08-21T13:59:29.000-07:00
diff --git a/mypyc/analysis.py b/mypyc/analysis.py
@@ -127,7 +127,7 @@ def cleanup_cfg(blocks: List[BasicBlock]) -> None:
 
 
 class AnalysisResult(Generic[T]):
-    def __init__(self, before: AnalysisDict[T], after: AnalysisDict[T]) -> None:
+    def __init__(self, before: 'AnalysisDict[T]', after: 'AnalysisDict[T]') -> None:
         self.before = before
         self.after = after
 
diff --git a/mypyc/genops.py b/mypyc/genops.py
@@ -14,11 +14,9 @@ def f(x: int) -> int:
    return r3
 """
 from typing import (
-    TypeVar, Callable, Dict, List, Tuple, Optional, Union, Sequence, Set, Any, cast, overload,
+    TypeVar, Callable, Dict, List, Tuple, Optional, Union, Sequence, Set, Any, cast
 )
-MYPY = False
-if MYPY:
-    from typing import ClassVar, NoReturn
+from typing_extensions import overload, ClassVar, NoReturn
 from abc import abstractmethod
 import sys
 import importlib.util
diff --git a/mypyc/lib-rt/CPy.h b/mypyc/lib-rt/CPy.h
@@ -1047,7 +1047,8 @@ static PyObject *CPy_FormatTypeName(PyObject *value) {
         return NULL;
     }
     /* This is quadratic but if that ever matters something is really weird. */
-    for (int i = 0; i < PyTuple_GET_SIZE(value); i++) {
+    int i;
+    for (i = 0; i < PyTuple_GET_SIZE(value); i++) {
         PyObject *s = CPy_FormatTypeName(PyTuple_GET_ITEM(value, i));
         if (!s) {
             Py_DECREF(output);
diff --git a/mypyc/refcount.py b/mypyc/refcount.py
@@ -80,7 +80,7 @@ def is_maybe_undefined(post_must_defined: Set[Value], src: Value) -> bool:
 
 
 def maybe_append_dec_ref(ops: List[Op], dest: Value,
-                         defined: AnalysisDict[Value], key: Tuple[BasicBlock, int]) -> None:
+                         defined: 'AnalysisDict[Value]', key: Tuple[BasicBlock, int]) -> None:
     if dest.type.is_refcounted:
         ops.append(DecRef(dest, is_xdec=is_maybe_undefined(defined[key], dest)))
 
@@ -91,10 +91,10 @@ def maybe_append_inc_ref(ops: List[Op], dest: Value) -> None:
 
 
 def transform_block(block: BasicBlock,
-                    pre_live: AnalysisDict[Value],
-                    post_live: AnalysisDict[Value],
-                    pre_borrow: AnalysisDict[Value],
-                    post_must_defined: AnalysisDict[Value],
+                    pre_live: 'AnalysisDict[Value]',
+                    post_live: 'AnalysisDict[Value]',
+                    pre_borrow: 'AnalysisDict[Value]',
+                    post_must_defined: 'AnalysisDict[Value]',
                     env: Environment) -> None:
     old_ops = block.ops
     ops = []  # type: List[Op]
@@ -139,10 +139,10 @@ def insert_branch_inc_and_decrefs(
         block: BasicBlock,
         cache: BlockCache,
         blocks: List[BasicBlock],
-        pre_live: AnalysisDict[Value],
-        pre_borrow: AnalysisDict[Value],
-        post_borrow: AnalysisDict[Value],
-        post_must_defined: AnalysisDict[Value],
+        pre_live: 'AnalysisDict[Value]',
+        pre_borrow: 'AnalysisDict[Value]',
+        post_borrow: 'AnalysisDict[Value]',
+        post_must_defined: 'AnalysisDict[Value]',
         env: Environment) -> None:
     """Insert inc_refs and/or dec_refs after a branch/goto.
 
@@ -196,7 +196,7 @@ def f(a: int) -> None
 
 
 def after_branch_decrefs(label: BasicBlock,
-                         pre_live: AnalysisDict[Value],
+                         pre_live: 'AnalysisDict[Value]',
                          source_defined: Set[Value],
                          source_borrowed: Set[Value],
                          source_live_regs: Set[Value],
@@ -212,8 +212,8 @@ def after_branch_decrefs(label: BasicBlock,
 
 
 def after_branch_increfs(label: BasicBlock,
-                         pre_live: AnalysisDict[Value],
-                         pre_borrow: AnalysisDict[Value],
+                         pre_live: 'AnalysisDict[Value]',
+                         pre_borrow: 'AnalysisDict[Value]',
                          source_borrowed: Set[Value],
                          env: Environment) -> Tuple[Value, ...]:
     target_pre_live = pre_live[label, 0]
diff --git a/mypyc/test-data/run-multimodule.test b/mypyc/test-data/run-multimodule.test
@@ -401,7 +401,7 @@ class Bar:
         bar(self)
 
 [file other.py]
-from typing import TYPE_CHECKING
+from typing_extensions import TYPE_CHECKING
 MYPY = False
 if MYPY:
     from native import Foo
@@ -431,7 +431,7 @@ def f(c: 'C') -> int:
     return c.x
 
 [file other.py]
-from typing import TYPE_CHECKING
+from typing_extensions import TYPE_CHECKING
 if TYPE_CHECKING:
     from native import D
 
diff --git a/mypyc/test-data/run.test b/mypyc/test-data/run.test
@@ -3355,11 +3355,9 @@ internal_index_into()
 2 * 3 + 1
 
 [case testDummyTypes]
-from typing import Tuple, List, Dict, NewType, NamedTuple
-from mypy_extensions import TypedDict
-MYPY = False
-if MYPY:
-    from typing_extensions import Literal
+from typing import Tuple, List, Dict, NamedTuple
+from typing_extensions import Literal, TypedDict, NewType
+
 class A:
     pass
 
diff --git a/mypyc/uninit.py b/mypyc/uninit.py
@@ -28,7 +28,7 @@ def insert_uninit_checks(ir: FuncIR) -> None:
 
 def split_blocks_at_uninits(env: Environment,
                             blocks: List[BasicBlock],
-                            pre_must_defined: AnalysisDict[Value]) -> List[BasicBlock]:
+                            pre_must_defined: 'AnalysisDict[Value]') -> List[BasicBlock]:
     new_blocks = []  # type: List[BasicBlock]
 
     # First split blocks on ops that may raise.
diff --git a/test-data/unit/lib-stub/typing_extensions.pyi b/test-data/unit/lib-stub/typing_extensions.pyi
@@ -1,4 +1,7 @@
 from typing import TypeVar, Any, Mapping, Iterator, NoReturn, Dict, Type
+from typing import TYPE_CHECKING as TYPE_CHECKING
+from typing import NewType as NewType
+
 import sys
 
 _T = TypeVar('_T')
