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 with 1.0

Browse Source
This commit is contained in:
Georg Brandl 2011-09-21 19:28:43 +02:00
commit cfc1ab4f99
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sphinx/environment.py
View File

@ -494,7 +494,7 @@ class BuildEnvironment:
config.exclude_trees + config.exclude_trees +
[d + config.source_suffix for d in config.unused_docs] + [d + config.source_suffix for d in config.unused_docs] +
['**/' + d for d in config.exclude_dirnames] + ['**/' + d for d in config.exclude_dirnames] +
['**/_sources'] ['**/_sources', '.#*']
) )
self.found_docs = set(get_matching_docs( self.found_docs = set(get_matching_docs(
self.srcdir, config.source_suffix, exclude_matchers=matchers)) self.srcdir, config.source_suffix, exclude_matchers=matchers))

2
sphinx/util/__init__.py
View File

@ -209,6 +209,8 @@ def get_module_source(modname):
lfilename = filename.lower() lfilename = filename.lower()
if lfilename.endswith('.pyo') or lfilename.endswith('.pyc'): if lfilename.endswith('.pyo') or lfilename.endswith('.pyc'):
filename = filename[:-1] filename = filename[:-1]
if not path.isfile(filename) and path.isfile(filename + 'w'):
filename += 'w'
elif not (lfilename.endswith('.py') or lfilename.endswith('.pyw')): elif not (lfilename.endswith('.py') or lfilename.endswith('.pyw')):
raise PycodeError('source is not a .py file: %r' % filename) raise PycodeError('source is not a .py file: %r' % filename)
if not path.isfile(filename): if not path.isfile(filename):