IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9212 from tk0miya/9210_viewcode_crashed_on_merging

Browse Source 
Fix #9210: viewcode: crashed if non importable modules found on parallel build
This commit is contained in:
Takeshi KOMIYA 2021-05-12 00:56:36 +09:00 committed by GitHub
commit 415e255dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -16,6 +16,8 @@ Features added
Bugs fixed Bugs fixed
---------- ----------
* #9210: viewcode: crashed if non importable modules found on parallel build
Testing Testing
-------- --------

9
sphinx/ext/viewcode.py
View File

@ -150,10 +150,11 @@ def env_merge_info(app: Sphinx, env: BuildEnvironment, docnames: Iterable[str],
if modname not in env._viewcode_modules: # type: ignore if modname not in env._viewcode_modules: # type: ignore
env._viewcode_modules[modname] = entry # type: ignore env._viewcode_modules[modname] = entry # type: ignore
else: else:
used = env._viewcode_modules[modname][2] # type: ignore if env._viewcode_modules[modname]: # type: ignore
for fullname, docname in entry[2].items(): used = env._viewcode_modules[modname][2] # type: ignore
if fullname not in used: for fullname, docname in entry[2].items():
used[fullname] = docname if fullname not in used:
used[fullname] = docname
def env_purge_doc(app: Sphinx, env: BuildEnvironment, docname: str) -> None: def env_purge_doc(app: Sphinx, env: BuildEnvironment, docname: str) -> None: