Correctly match import a,b

Author: felix-hilden

.gitignore

@@ -6,6 +6,7 @@ __pycache__/
 __pypackages__/
 
 # Distribution / packaging
+.pypirc
 .Python
 /build/
 /develop-eggs/

docs/src/release_notes.rst

@@ -8,6 +8,10 @@ These release notes are based on
 sphinx-codeautolink adheres to
 `Semantic Versioning <https://semver.org>`_.
 
+Unreleased
+----------
+- Fix matching of ``import a, b`` (:issue:`142`)
+
 0.15.1 (2024-04-17)
 -------------------
 - Fix linking blocks with line numbers (:issue:`137`)

src/sphinx_codeautolink/extension/block.py

@@ -376,12 +376,12 @@ def link_html(
 call_dot_prere = r'(\)</span>\s*<span class="o">\.</span>\s*)'
 import_prere = (
     r'((<span class="kn">import</span>\s+(<span class="p">\(</span>\s*)?)'
-    r'|(<span class="p">,</span>\s*))'
+    r'|(<span class="[op]">,</span>\s*))'
 )
 from_prere = r'(<span class="kn">from</span>\s+)'
 
 no_dot_postre = r'(?!(<span class="o">\.)|(</a>))'
-import_postre = r'(?=($)|(\s+)|(<span class="p">,</span>)|(<span class="p">\)))(?!</a>)'
+import_postre = r'(?=($)|(\s+)|(<span class="[op]">,</span>)|(<span class="p">\)))(?!</a>)'
 from_postre = r'(?=\s*<span class="kn">import</span>)'
 
 

tests/extension/ref/ref_import_multiple_libs.txt

@@ -0,0 +1,17 @@
+json
+math
+# split
+extensions = [
+    "sphinx.ext.intersphinx",
+    "sphinx_codeautolink",
+]
+intersphinx_mapping = {"python": ('https://docs.python.org/3/', None)}
+# split
+Test project
+============
+
+.. code:: python
+
+   import json, math
+
+.. automodule:: test_project

tox.ini

@@ -103,7 +103,7 @@ commands_pre =
 commands =
     python -m build
     twine check --strict dist/*
-    twine upload dist/*
+    twine upload dist/* --config-file .pypirc
 commands_post =
     lin,mac: rm -r dist
     win: cmd /c rmdir /s /q dist