attempt to fix mypy by always using typing-extensions

RobertCraigie · Nov 13, 2021 · 5430e00 · 5430e00
1 parent 1b75ec0
commit 5430e00
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 123 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -3,5 +3,5 @@ jinja2>=2.11.2
 pydantic>=1.8.0
 click>=7.1.2
 python-dotenv>=0.12.0
+typing-extensions>=3.7
 contextvars; python_version < '3.7'
-typing-extensions>=3.7; python_version < '3.9.2'
diff --git a/src/prisma/_types.py b/src/prisma/_types.py
@@ -1,25 +1,14 @@
-import sys
 from typing import Callable, Coroutine, TypeVar, Any
+from typing_extensions import (
+    TypedDict as TypedDict,
+    Protocol as Protocol,
+    Literal as Literal,
+    runtime_checkable as runtime_checkable,
+)
 
 from pydantic import BaseModel
 
 
-if sys.version_info >= (3, 9, 2):
-    from typing import (  # pylint: disable=no-name-in-module, unused-import
-        TypedDict as TypedDict,
-        Protocol as Protocol,
-        Literal as Literal,
-        runtime_checkable as runtime_checkable,
-    )
-else:
-    from typing_extensions import (
-        TypedDict as TypedDict,
-        Protocol as Protocol,
-        Literal as Literal,
-        runtime_checkable as runtime_checkable,
-    )
-
-
 Method = Literal['GET', 'POST']
 
 BaseModelT = TypeVar('BaseModelT', bound=BaseModel)

diff --git a/src/prisma/generator/templates/_header.py.jinja b/src/prisma/generator/templates/_header.py.jinja
@@ -25,10 +25,6 @@ from typing import (
     overload,
     cast,
 )
-
-if sys.version_info >= (3, 9, 2):
-    from typing import TypedDict, Literal
-else:
-    from typing_extensions import TypedDict, Literal
+from typing_extensions import TypedDict, Literal
 
 
diff --git a/tests/test_generation/exhaustive/__snapshots__/test_exhaustive.ambr b/tests/test_generation/exhaustive/__snapshots__/test_exhaustive.ambr
@@ -27,11 +27,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template actions.py.jinja --
   from . import types, errors
@@ -3133,11 +3129,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template builder.py.jinja --
 
@@ -3987,11 +3979,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template client.py.jinja --
   from types import TracebackType
@@ -5787,11 +5775,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template engine/query.py.jinja --
 
@@ -6025,11 +6009,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template enums.py.jinja --
   from enum import Enum
@@ -6072,11 +6052,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template fields.py.jinja --
   import base64
@@ -6220,11 +6196,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template http.py.jinja --
   from ._async_http import (
@@ -6264,11 +6236,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template models.py.jinja --
   import os
@@ -8175,11 +8143,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template partials.py.jinja --
   from pydantic import BaseModel, Field, validator
@@ -8225,11 +8189,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template types.py.jinja --
   from .utils import _NoneType
@@ -18648,11 +18608,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template actions.py.jinja --
   from . import types, errors
@@ -21754,11 +21710,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template builder.py.jinja --
 
@@ -22608,11 +22560,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template client.py.jinja --
   from types import TracebackType
@@ -24408,11 +24356,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template engine/query.py.jinja --
 
@@ -24639,11 +24583,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template enums.py.jinja --
   from enum import Enum
@@ -24686,11 +24626,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template fields.py.jinja --
   import base64
@@ -24834,11 +24770,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template http.py.jinja --
   from ._sync_http import (
@@ -24878,11 +24810,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template models.py.jinja --
   import os
@@ -26789,11 +26717,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template partials.py.jinja --
   from pydantic import BaseModel, Field, validator
@@ -26839,11 +26763,7 @@
       overload,
       cast,
   )
-
-  if sys.version_info >= (3, 9, 2):
-      from typing import TypedDict, Literal
-  else:
-      from typing_extensions import TypedDict, Literal
+  from typing_extensions import TypedDict, Literal
 
   # -- template types.py.jinja --
   from .utils import _NoneType