Exclude broken typing-extensions version + fix import (#2460)

re. import, the ipynb code was assuming that typing-extensions would
always be available, but that's not the case! There's an environment
marker on the requirement meaning it won't get installed on 3.10 or
higher. The test suite didn't catch this issue since aiohttp pulls in
typing-extensions unconditionally.

diff --git a/CHANGES.md b/CHANGES.md
index 6e2721ba19c9fb8727575c8bbf01766778813bd5..576e3c84882d77881093ceb219fee280834d3887 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,8 @@
 - Parsing support has been added for unparenthesized walruses in set literals, set
   comprehensions, and indices (#2447).
 - Pin `setuptools-scm` build-time dependency version (#2457)
 - Parsing support has been added for unparenthesized walruses in set literals, set
   comprehensions, and indices (#2447).
 - Pin `setuptools-scm` build-time dependency version (#2457)

+- Exclude typing-extensions version 3.10.0.1 due to it being broken on Python 3.10
+  (#2460)

 
 ### _Blackd_
 
 
 ### _Blackd_
 

diff --git a/setup.py b/setup.py
index 215fa6cff61267488383582ce5673acb28d6edb6..929096a2098f97a6de86b2cb09b5e817a0a4ca60 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,10 @@ setup(
         "regex>=2020.1.8",
         "pathspec>=0.9.0, <1",
         "dataclasses>=0.6; python_version < '3.7'",
         "regex>=2020.1.8",
         "pathspec>=0.9.0, <1",
         "dataclasses>=0.6; python_version < '3.7'",

-        "typing_extensions>=3.10.0.0; python_version < '3.10'",
+        "typing_extensions>=3.10.0.0",
+        # 3.10.0.1 is broken on at least Python 3.10,
+        # https://github.com/python/typing/issues/865
+        "typing_extensions!=3.10.0.1; python_version >= '3.10'",

         "mypy_extensions>=0.4.3",
     ],
     extras_require={
         "mypy_extensions>=0.4.3",
     ],
     extras_require={

diff --git a/src/black/handle_ipynb_magics.py b/src/black/handle_ipynb_magics.py
index ad93c444efc98a7dfd2c12b54dc4cd834bb08b2f..b18f8629136e2af1713a7f2fa72c4be50ea53935 100644 (file)
--- a/src/black/handle_ipynb_magics.py
+++ b/src/black/handle_ipynb_magics.py
@@ -1,15 +1,19 @@
 """Functions to process IPython magics with."""
 """Functions to process IPython magics with."""

+

 from functools import lru_cache
 import dataclasses
 import ast
 from functools import lru_cache
 import dataclasses
 import ast

-from typing import Dict
+from typing import Dict, List, Tuple, Optional

 
 import secrets
 
 import secrets

-from typing import List, Tuple
+import sys

 import collections
 
 import collections
 

-from typing import Optional
-from typing_extensions import TypeGuard
+if sys.version_info >= (3, 10):
+    from typing import TypeGuard
+else:
+    from typing_extensions import TypeGuard
+

 from black.report import NothingChanged
 from black.output import out
 
 from black.report import NothingChanged
 from black.output import out