summaryrefslogtreecommitdiff
path: root/sphinx
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-01-12 22:34:27 +0100
committerGeorg Brandl <georg@python.org>2014-01-12 22:34:27 +0100
commitea1eac882bb2c5dfc02ccaef3e713be27a788999 (patch)
tree8222d9f8a21112d0ddba18534210b1fb2c384da4 /sphinx
parenta0d8b4b4c3c0e51ad502481721fe19efece088c1 (diff)
downloadsphinx-ea1eac882bb2c5dfc02ccaef3e713be27a788999.tar.gz
Closes #1261: Python 3 cannot sort None and str types, make everything a str.
Diffstat (limited to 'sphinx')
-rw-r--r--sphinx/ext/autosummary/generate.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
index 00d59f81..f45aa085 100644
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
@@ -116,7 +116,7 @@ def generate_autosummary_docs(sources, output_dir=None, suffix='.rst',
new_files = []
# write
- for name, path, template_name in sorted(items):
+ for name, path, template_name in sorted(items, key=str):
if path is None:
# The corresponding autosummary:: directive did not have
# a :toctree: option