Bump pypa/cibuildwheel from 2.16.1 to 2.16.2 (#3934)

[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 693f1a68bd4701a361aefcc4c81f38481a7e48df..55ef2267df829f3b38de9ff5ce02f0d0a73edef3 100644 (file)
--- a/src/black/handle_ipynb_magics.py
+++ b/src/black/handle_ipynb_magics.py
@@ -6,6 +6,7 @@ import dataclasses
 import secrets
 import sys
 from functools import lru_cache
 import secrets
 import sys
 from functools import lru_cache

+from importlib.util import find_spec

 from typing import Dict, List, Optional, Tuple
 
 if sys.version_info >= (3, 10):
 from typing import Dict, List, Optional, Tuple
 
 if sys.version_info >= (3, 10):


@@ -55,21 +56,18 @@ class Replacement:
     src: str
 
 
     src: str
 
 

-@lru_cache()
-def jupyter_dependencies_are_installed(*, verbose: bool, quiet: bool) -> bool:
-    try:
-        import IPython  # noqa:F401
-        import tokenize_rt  # noqa:F401
-    except ModuleNotFoundError:
-        if verbose or not quiet:
-            msg = (
-                "Skipping .ipynb files as Jupyter dependencies are not installed.\n"
-                "You can fix this by running ``pip install black[jupyter]``"
-            )
-            out(msg)
-        return False
-    else:
-        return True
+@lru_cache
+def jupyter_dependencies_are_installed(*, warn: bool) -> bool:
+    installed = (
+        find_spec("tokenize_rt") is not None and find_spec("IPython") is not None
+    )
+    if not installed and warn:
+        msg = (
+            "Skipping .ipynb files as Jupyter dependencies are not installed.\n"
+            'You can fix this by running ``pip install "black[jupyter]"``'
+        )
+        out(msg)
+    return installed

 
 
 def remove_trailing_semicolon(src: str) -> Tuple[str, bool]:
 
 
 def remove_trailing_semicolon(src: str) -> Tuple[str, bool]:


@@ -330,7 +328,8 @@ class CellMagicFinder(ast.NodeVisitor):
 
     For example,
 
 
     For example,
 

-        %%time\nfoo()
+        %%time\n
+        foo()

 
     would have been transformed to
 
 
     would have been transformed to