Rename function

sv1990 · Jul 10, 2024 · a4b6137 · a4b6137
1 parent aa99fc4
commit a4b6137
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/nbisort/__init__.py b/nbisort/__init__.py
@@ -8,7 +8,7 @@
 import more_itertools
 import nbformat
 
-IMPORT_RGX = re.compile(
+TOPLEVEL_IMPORT_RGX = re.compile(
     r"^(from\s+\w+(?:\.\w+)*\s+import\s+(?:\w+|\((?:[^\)]|\n)*\)).*|import\s+.*)",
     flags=re.MULTILINE,
 )
@@ -20,8 +20,8 @@ def run_isort(code: str) -> str:
     )
 
 
-def is_import(s: str | None) -> bool:
-    return bool(IMPORT_RGX.match(s)) if s else False
+def is_toplevel_import(s: str | None) -> bool:
+    return bool(TOPLEVEL_IMPORT_RGX.match(s)) if s else False
 
 
 def nbisort(nb: nbformat.NotebookNode) -> nbformat.NotebookNode:
@@ -32,7 +32,9 @@ def nbisort(nb: nbformat.NotebookNode) -> nbformat.NotebookNode:
         if cell["cell_type"] != "code":
             continue
         source = cell["source"]
-        code, imports = more_itertools.partition(is_import, IMPORT_RGX.split(source))
+        code, imports = more_itertools.partition(
+            is_toplevel_import, TOPLEVEL_IMPORT_RGX.split(source)
+        )
         all_imports |= set(imports)
         new_source = "".join(filter(bool, code))
 

diff --git a/tests/test_nbisort.py b/tests/test_nbisort.py
@@ -4,7 +4,7 @@
 import pytest
 from more_itertools import zip_equal
 
-from nbisort import is_import, nbisort
+from nbisort import is_toplevel_import, nbisort
 
 
 @pytest.mark.parametrize(
@@ -23,8 +23,8 @@
         ("from module import (\n    func1,\n    func2,\n    func3,\n)", True),
     ],
 )
-def test_is_import(code, expected):
-    assert is_import(code) == expected
+def test_is_toplevel_import(code, expected):
+    assert is_toplevel_import(code) == expected
 
 
 def cell(text: str) -> nbformat.NotebookNode: