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

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

View File

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

View File

@@ -19,6 +19,8 @@ import sys
import optparse
from os import path
from sphinx.util.osutil import walk
# automodule options
if 'SPHINX_APIDOC_OPTIONS' in os.environ:
OPTIONS = os.environ['SPHINX_APIDOC_OPTIONS'].split(',')
@@ -183,7 +185,7 @@ def recurse_tree(rootpath, excludes, opts):
toplevels = []
followlinks = getattr(opts, 'followlinks', 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)
py_files = sorted(f for f in files
if path.splitext(f)[1] in PY_SUFFIXES and