Bump typed-ast minimum to 1.4.3 for 3.10 compat (#2519)

[etc/vim.git] / src / black / handle_ipynb_magics.py

diff --git a/src/black/handle_ipynb_magics.py b/src/black/handle_ipynb_magics.py
index ad93c444efc98a7dfd2c12b54dc4cd834bb08b2f..63c8aafe35b70e4d16b7d59f349feeb6f392601a 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
 


@@ -49,6 +53,7 @@ NON_PYTHON_CELL_MAGICS = frozenset(
         "%%writefile",
     )
 )
         "%%writefile",
     )
 )

+TOKEN_HEX = secrets.token_hex

 
 
 @dataclasses.dataclass(frozen=True)
 
 
 @dataclasses.dataclass(frozen=True)


@@ -184,10 +189,10 @@ def get_token(src: str, magic: str) -> str:
     """
     assert magic
     nbytes = max(len(magic) // 2 - 1, 1)
     """
     assert magic
     nbytes = max(len(magic) // 2 - 1, 1)

-    token = secrets.token_hex(nbytes)
+    token = TOKEN_HEX(nbytes)

     counter = 0
     counter = 0

-    while token in src:  # pragma: nocover
-        token = secrets.token_hex(nbytes)
+    while token in src:
+        token = TOKEN_HEX(nbytes)

         counter += 1
         if counter > 100:
             raise AssertionError(
         counter += 1
         if counter > 100:
             raise AssertionError(