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 #4935 from tk0miya/4932_ignored_subpackages

Browse Source 
Fix #4932: apidoc: some subpackages is ignored if sibling subpackage contains underscored module
This commit is contained in:
Takeshi KOMIYA 2018-05-07 01:11:44 +09:00 committed by GitHub
commit 2d42753acd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -17,6 +17,8 @@ Bugs fixed
---------- ----------
* #4924: html search: Upper characters problem in any other languages * #4924: html search: Upper characters problem in any other languages
* #4932: apidoc: some subpackage is ignored if sibling subpackage contains a
module starting with underscore
Testing Testing
-------- --------

4
sphinx/ext/apidoc.py
View File

@ -199,8 +199,8 @@ def shall_skip(module, opts, excludes=[]):
# Yes, check if we have any non-excluded modules at all here # Yes, check if we have any non-excluded modules at all here
all_skipped = True all_skipped = True
basemodule = path.dirname(module) basemodule = path.dirname(module)
for module in glob.glob(path.join(basemodule, '*.py')): for submodule in glob.glob(path.join(basemodule, '*.py')):
if not is_excluded(path.join(basemodule, module), excludes): if not is_excluded(path.join(basemodule, submodule), excludes):
# There's a non-excluded module here, we won't skip # There's a non-excluded module here, we won't skip
all_skipped = False all_skipped = False
if all_skipped: if all_skipped: