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 #3780 from goosemania/autodoc-mockimporter-fix

Browse Source 
Fix #3779: 'ImportError' in sphinx.ext.autodoc
This commit is contained in:
Takayuki SHIMIZUKAWA 2017-05-24 20:05:24 +09:00 committed by GitHub
commit 23d1edb203
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -27,6 +27,7 @@ Bugs fixed
* #3774: Incremental HTML building broken when using citations * #3774: Incremental HTML building broken when using citations
* #3772: 'str object' has no attribute 'filename' * #3772: 'str object' has no attribute 'filename'
* #3763: got epubcheck validations error if epub_cover is set * #3763: got epubcheck validations error if epub_cover is set
* #3779: 'ImportError' in sphinx.ext.autodoc due to broken 'sys.meta_path'
Testing Testing
-------- --------

5
sphinx/ext/autodoc.py
View File

@ -171,13 +171,12 @@ class _MockImporter(object):
# set(['a', 'd']) # set(['a', 'd'])
self.base_packages.add(n.split('.')[0]) self.base_packages.add(n.split('.')[0])
self.mocked_modules = [] # type: List[str] self.mocked_modules = [] # type: List[str]
self.orig_meta_path = sys.meta_path
# enable hook by adding itself to meta_path # enable hook by adding itself to meta_path
sys.meta_path = sys.meta_path + [self] sys.meta_path = sys.meta_path + [self]
def disable(self): def disable(self):
# restore original meta_path to disable import hook # remove `self` from `sys.meta_path` to disable import hook
sys.meta_path = self.orig_meta_path sys.meta_path = [i for i in sys.meta_path if i is not self]
# remove mocked modules from sys.modules to avoid side effects after # remove mocked modules from sys.modules to avoid side effects after
# running auto-documenter # running auto-documenter
for m in self.mocked_modules: for m in self.mocked_modules: