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

Closes #1383: Fix Python 2.5 compatibility of sphinx-apidoc.

Browse Source
This commit is contained in:
Georg Brandl
2014-03-01 09:13:32 +01:00
parent 048b7d77d3
commit e736be637a
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -14,6 +14,7 @@ Bugs fixed
the "wildcard" style reference. the "wildcard" style reference.
* #1374: Fix for autosummary generating overly-long summaries if first line * #1374: Fix for autosummary generating overly-long summaries if first line
doesn't end with a period. doesn't end with a period.
* #1383: Fix Python 2.5 compatibility of sphinx-apidoc.
Documentation Documentation
------------- -------------

4
sphinx/apidoc.py
View File

@@ -19,6 +19,8 @@ import sys
import optparse import optparse
from os import path from os import path
from sphinx.util.osutil import walk
# automodule options # automodule options
if 'SPHINX_APIDOC_OPTIONS' in os.environ: if 'SPHINX_APIDOC_OPTIONS' in os.environ:
OPTIONS = os.environ['SPHINX_APIDOC_OPTIONS'].split(',') OPTIONS = os.environ['SPHINX_APIDOC_OPTIONS'].split(',')
@@ -183,7 +185,7 @@ def recurse_tree(rootpath, excludes, opts):
toplevels = [] toplevels = []
followlinks = getattr(opts, 'followlinks', False) followlinks = getattr(opts, 'followlinks', False)
includeprivate = getattr(opts, 'includeprivate', False) includeprivate = getattr(opts, 'includeprivate', False)
for root, subs, files in os.walk(rootpath, followlinks=followlinks): for root, subs, files in walk(rootpath, followlinks=followlinks):
# document only Python module files (that aren't excluded) # document only Python module files (that aren't excluded)
py_files = sorted(f for f in files py_files = sorted(f for f in files
if path.splitext(f)[1] in PY_SUFFIXES and if path.splitext(f)[1] in PY_SUFFIXES and