diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | sphinx/apidoc.py | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -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 ------------- diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py index d60b3f2b..6c423185 100644 --- a/sphinx/apidoc.py +++ b/sphinx/apidoc.py @@ -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 |