[Python-modules-commits] [sphinx] 01/12: Import sphinx_1.3.5.orig.tar.gz
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Mon Jan 25 12:45:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch master
in repository sphinx.
commit 65adc14434e705bdb8976d84b268ba564c112613
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon Jan 25 15:43:08 2016 +0300
Import sphinx_1.3.5.orig.tar.gz
---
CHANGES | 21 +++++++++++
LICENSE | 2 +-
PKG-INFO | 2 +-
Sphinx.egg-info/PKG-INFO | 2 +-
Sphinx.egg-info/SOURCES.txt | 2 +
doc/_themes/sphinx13/layout.html | 2 +-
doc/_themes/sphinx13/static/sphinx13.css | 2 +-
doc/conf.py | 2 +-
sphinx-apidoc.py | 2 +-
sphinx-autogen.py | 2 +-
sphinx-build.py | 2 +-
sphinx-quickstart.py | 2 +-
sphinx/__init__.py | 8 ++--
sphinx/__main__.py | 2 +-
sphinx/addnodes.py | 2 +-
sphinx/apidoc.py | 2 +-
sphinx/application.py | 2 +-
sphinx/builders/__init__.py | 2 +-
sphinx/builders/applehelp.py | 2 +-
sphinx/builders/changes.py | 2 +-
sphinx/builders/devhelp.py | 2 +-
sphinx/builders/epub.py | 2 +-
sphinx/builders/gettext.py | 2 +-
sphinx/builders/html.py | 2 +-
sphinx/builders/htmlhelp.py | 2 +-
sphinx/builders/latex.py | 6 +--
sphinx/builders/linkcheck.py | 2 +-
sphinx/builders/manpage.py | 2 +-
sphinx/builders/qthelp.py | 2 +-
sphinx/builders/texinfo.py | 2 +-
sphinx/builders/text.py | 2 +-
sphinx/builders/websupport.py | 2 +-
sphinx/builders/xml.py | 2 +-
sphinx/cmdline.py | 2 +-
sphinx/config.py | 2 +-
sphinx/directives/__init__.py | 2 +-
sphinx/directives/code.py | 2 +-
sphinx/directives/other.py | 2 +-
sphinx/domains/__init__.py | 2 +-
sphinx/domains/c.py | 2 +-
sphinx/domains/cpp.py | 2 +-
sphinx/domains/javascript.py | 2 +-
sphinx/domains/python.py | 2 +-
sphinx/domains/rst.py | 2 +-
sphinx/domains/std.py | 18 +++++++--
sphinx/environment.py | 13 +++++--
sphinx/errors.py | 2 +-
sphinx/ext/__init__.py | 2 +-
sphinx/ext/autodoc.py | 10 +++--
sphinx/ext/autosummary/__init__.py | 2 +-
sphinx/ext/autosummary/generate.py | 2 +-
sphinx/ext/coverage.py | 2 +-
sphinx/ext/doctest.py | 2 +-
sphinx/ext/extlinks.py | 2 +-
sphinx/ext/graphviz.py | 2 +-
sphinx/ext/ifconfig.py | 2 +-
sphinx/ext/inheritance_diagram.py | 2 +-
sphinx/ext/intersphinx.py | 2 +-
sphinx/ext/jsmath.py | 2 +-
sphinx/ext/linkcode.py | 2 +-
sphinx/ext/mathbase.py | 2 +-
sphinx/ext/mathjax.py | 2 +-
sphinx/ext/napoleon/__init__.py | 2 +-
sphinx/ext/napoleon/docstring.py | 2 +-
sphinx/ext/napoleon/iterators.py | 2 +-
sphinx/ext/pngmath.py | 2 +-
sphinx/ext/todo.py | 2 +-
sphinx/ext/viewcode.py | 2 +-
sphinx/highlighting.py | 8 +++-
sphinx/jinja2glue.py | 2 +-
sphinx/locale/__init__.py | 2 +-
sphinx/make_mode.py | 2 +-
sphinx/pycode/__init__.py | 4 +-
sphinx/pycode/nodes.py | 2 +-
sphinx/pygments_styles.py | 2 +-
sphinx/quickstart.py | 4 +-
sphinx/roles.py | 2 +-
sphinx/search/__init__.py | 2 +-
sphinx/search/en.py | 2 +-
sphinx/search/ja.py | 2 +-
sphinx/setup_command.py | 2 +-
sphinx/themes/agogo/layout.html | 2 +-
sphinx/themes/agogo/static/agogo.css_t | 2 +-
sphinx/themes/basic/defindex.html | 2 +-
sphinx/themes/basic/domainindex.html | 2 +-
sphinx/themes/basic/genindex-single.html | 2 +-
sphinx/themes/basic/genindex-split.html | 2 +-
sphinx/themes/basic/genindex.html | 2 +-
sphinx/themes/basic/globaltoc.html | 2 +-
sphinx/themes/basic/layout.html | 2 +-
sphinx/themes/basic/localtoc.html | 2 +-
sphinx/themes/basic/page.html | 2 +-
sphinx/themes/basic/relations.html | 2 +-
sphinx/themes/basic/search.html | 2 +-
sphinx/themes/basic/searchbox.html | 2 +-
sphinx/themes/basic/searchresults.html | 2 +-
sphinx/themes/basic/sourcelink.html | 2 +-
sphinx/themes/basic/static/basic.css_t | 2 +-
sphinx/themes/basic/static/doctools.js | 2 +-
sphinx/themes/basic/static/searchtools.js_t | 2 +-
sphinx/themes/basic/static/websupport.js | 2 +-
sphinx/themes/classic/layout.html | 2 +-
sphinx/themes/classic/static/classic.css_t | 2 +-
sphinx/themes/classic/static/sidebar.js_t | 2 +-
sphinx/themes/epub/epub-cover.html | 2 +-
sphinx/themes/epub/layout.html | 2 +-
sphinx/themes/epub/static/epub.css | 2 +-
sphinx/themes/haiku/layout.html | 2 +-
sphinx/themes/haiku/static/haiku.css_t | 2 +-
sphinx/themes/nature/static/nature.css_t | 2 +-
sphinx/themes/pyramid/static/epub.css | 2 +-
sphinx/themes/pyramid/static/pyramid.css_t | 2 +-
sphinx/themes/scrolls/layout.html | 2 +-
sphinx/themes/scrolls/static/scrolls.css_t | 2 +-
sphinx/themes/sphinxdoc/layout.html | 2 +-
sphinx/themes/sphinxdoc/static/sphinxdoc.css_t | 2 +-
sphinx/themes/traditional/static/traditional.css_t | 2 +-
sphinx/theming.py | 7 ++--
sphinx/transforms.py | 7 ++--
sphinx/util/__init__.py | 34 ++++++++---------
sphinx/util/compat.py | 2 +-
sphinx/util/console.py | 2 +-
sphinx/util/docfields.py | 2 +-
sphinx/util/docstrings.py | 2 +-
sphinx/util/i18n.py | 2 +-
sphinx/util/inspect.py | 2 +-
sphinx/util/jsdump.py | 2 +-
sphinx/util/jsonimpl.py | 2 +-
sphinx/util/matching.py | 2 +-
sphinx/util/nodes.py | 12 ++++--
sphinx/util/osutil.py | 2 +-
sphinx/util/parallel.py | 2 +-
sphinx/util/png.py | 2 +-
sphinx/util/pycompat.py | 2 +-
sphinx/util/tags.py | 2 +-
sphinx/util/texescape.py | 2 +-
sphinx/util/websupport.py | 2 +-
sphinx/versioning.py | 2 +-
sphinx/websupport/__init__.py | 2 +-
sphinx/websupport/errors.py | 2 +-
sphinx/websupport/search/__init__.py | 2 +-
sphinx/websupport/search/nullsearch.py | 2 +-
sphinx/websupport/search/whooshsearch.py | 2 +-
sphinx/websupport/search/xapiansearch.py | 2 +-
sphinx/websupport/storage/__init__.py | 2 +-
sphinx/websupport/storage/differ.py | 2 +-
sphinx/websupport/storage/sqlalchemy_db.py | 2 +-
sphinx/websupport/storage/sqlalchemystorage.py | 2 +-
sphinx/writers/__init__.py | 2 +-
sphinx/writers/html.py | 2 +-
sphinx/writers/latex.py | 31 ++++++++++++----
sphinx/writers/manpage.py | 2 +-
sphinx/writers/texinfo.py | 2 +-
sphinx/writers/text.py | 2 +-
sphinx/writers/websupport.py | 2 +-
sphinx/writers/xml.py | 2 +-
tests/path.py | 2 +-
tests/root/conf.py | 2 +-
tests/root/markup.txt | 6 +++
tests/roots/test-directive-code/python.rst | 13 +++++++
tests/roots/test-directive-code/target.py | 22 +++++++++++
tests/roots/test-intl/definition_terms.po | 5 +++
tests/roots/test-intl/definition_terms.txt | 2 +
tests/run.py | 2 +-
tests/test_api_translator.py | 2 +-
tests/test_apidoc.py | 2 +-
tests/test_application.py | 2 +-
tests/test_autodoc.py | 2 +-
tests/test_build.py | 2 +-
tests/test_build_applehelp.py | 2 +-
tests/test_build_gettext.py | 2 +-
tests/test_build_html.py | 43 +++++++++++++---------
tests/test_build_latex.py | 37 +++++++++++++++----
tests/test_build_manpage.py | 2 +-
tests/test_build_texinfo.py | 12 +++---
tests/test_build_text.py | 2 +-
tests/test_catalogs.py | 2 +-
tests/test_config.py | 2 +-
tests/test_directive_code.py | 26 ++++++++++++-
tests/test_directive_only.py | 2 +-
tests/test_docutilsconf.py | 2 +-
tests/test_domain_cpp.py | 2 +-
tests/test_domain_py.py | 2 +-
tests/test_domain_rst.py | 2 +-
tests/test_domain_std.py | 2 +-
tests/test_environment.py | 2 +-
tests/test_ext_autosummary.py | 2 +-
tests/test_ext_coverage.py | 2 +-
tests/test_ext_doctest.py | 2 +-
tests/test_ext_graphviz.py | 2 +-
tests/test_ext_ifconfig.py | 2 +-
tests/test_ext_intersphinx.py | 2 +-
tests/test_ext_napoleon.py | 2 +-
tests/test_ext_napoleon_docstring.py | 2 +-
tests/test_ext_napoleon_iterators.py | 2 +-
tests/test_ext_viewcode.py | 2 +-
tests/test_highlighting.py | 2 +-
tests/test_i18n.py | 2 +-
tests/test_intl.py | 14 ++++---
tests/test_markup.py | 2 +-
tests/test_metadata.py | 2 +-
tests/test_quickstart.py | 2 +-
tests/test_search.py | 2 +-
tests/test_searchadapters.py | 2 +-
tests/test_setup_command.py | 2 +-
tests/test_templating.py | 2 +-
tests/test_theming.py | 2 +-
tests/test_toctree.py | 2 +-
tests/test_util.py | 2 +-
tests/test_util_i18n.py | 2 +-
tests/test_util_nodes.py | 2 +-
tests/test_versioning.py | 2 +-
tests/test_websupport.py | 2 +-
tests/util.py | 2 +-
utils/check_sources.py | 2 +-
215 files changed, 458 insertions(+), 287 deletions(-)
diff --git a/CHANGES b/CHANGES
index 7ba27dc..8b75442 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,24 @@
+Release 1.3.5 (released Jan 24, 2016)
+=====================================
+
+Bugs fixed
+----------
+
+* Fix line numbers was not shown on warnings in LaTeX and texinfo builders
+* Fix filenames were not shown on warnings of citations
+* Fix line numbers was not shown on warnings in LaTeX and texinfo builders
+* Fix line numbers was not shown on warnings of indecies
+* #2026: Fix LaTeX builder rais error if parsed-literal includes links
+* #2243: Ignore strange docstring types for classes, do not crash
+* #2247: Fix #2205 breaks make html for definition list with classifiers
+ that contains regular-expression like string
+* #1565: Show warning if Pygments throws an ErrorToken
+* #2211: Fix paragraphs in table cell doesn't work in Latex output
+* #2253: ``:pyobject:`` option of ``literalinclude`` directive can't detect indented
+ body block when the block starts with blank or comment lines.
+* Fix TOC is not shown when no ``:maxdepth:`` for toctrees (ref: #771)
+* Fix warning message for ``:numref:`` if target is in orphaned doc (ref: #2244)
+
Release 1.3.4 (released Jan 12, 2016)
=====================================
diff --git a/LICENSE b/LICENSE
index 4944ef5..8f9e7f1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
License for Sphinx
==================
-Copyright (c) 2007-2015 by the Sphinx team (see AUTHORS file).
+Copyright (c) 2007-2016 by the Sphinx team (see AUTHORS file).
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/PKG-INFO b/PKG-INFO
index de19fae..f74dfb1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Sphinx
-Version: 1.3.4
+Version: 1.3.5
Summary: Python documentation generator
Home-page: http://sphinx-doc.org/
Author: Georg Brandl
diff --git a/Sphinx.egg-info/PKG-INFO b/Sphinx.egg-info/PKG-INFO
index de19fae..f74dfb1 100644
--- a/Sphinx.egg-info/PKG-INFO
+++ b/Sphinx.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Sphinx
-Version: 1.3.4
+Version: 1.3.5
Summary: Python documentation generator
Home-page: http://sphinx-doc.org/
Author: Georg Brandl
diff --git a/Sphinx.egg-info/SOURCES.txt b/Sphinx.egg-info/SOURCES.txt
index 00666f3..37f3186 100644
--- a/Sphinx.egg-info/SOURCES.txt
+++ b/Sphinx.egg-info/SOURCES.txt
@@ -647,6 +647,8 @@ tests/roots/test-directive-code/lineno_match.rst
tests/roots/test-directive-code/lineno_start.rst
tests/roots/test-directive-code/linenos.rst
tests/roots/test-directive-code/literal.inc
+tests/roots/test-directive-code/python.rst
+tests/roots/test-directive-code/target.py
tests/roots/test-directive-only/conf.py
tests/roots/test-directive-only/contents.rst
tests/roots/test-directive-only/only.rst
diff --git a/doc/_themes/sphinx13/layout.html b/doc/_themes/sphinx13/layout.html
index 0e6294c..bf28cd0 100644
--- a/doc/_themes/sphinx13/layout.html
+++ b/doc/_themes/sphinx13/layout.html
@@ -4,7 +4,7 @@
Sphinx layout template for the sphinxdoc theme.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
#}
{%- extends "basic/layout.html" %}
diff --git a/doc/_themes/sphinx13/static/sphinx13.css b/doc/_themes/sphinx13/static/sphinx13.css
index 222432d..8b3ebdf 100644
--- a/doc/_themes/sphinx13/static/sphinx13.css
+++ b/doc/_themes/sphinx13/static/sphinx13.css
@@ -4,7 +4,7 @@
*
* Sphinx stylesheet -- sphinx13 theme.
*
- * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
* :license: BSD, see LICENSE for details.
*
*/
diff --git a/doc/conf.py b/doc/conf.py
index 22ab609..753ffab 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -15,7 +15,7 @@ templates_path = ['_templates']
exclude_patterns = ['_build']
project = 'Sphinx'
-copyright = '2007-2015, Georg Brandl and the Sphinx team'
+copyright = '2007-2016, Georg Brandl and the Sphinx team'
version = sphinx.__released__
release = version
show_authors = True
diff --git a/sphinx-apidoc.py b/sphinx-apidoc.py
index 7752fc0..56394ea 100755
--- a/sphinx-apidoc.py
+++ b/sphinx-apidoc.py
@@ -4,7 +4,7 @@
Sphinx - Python documentation toolchain
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx-autogen.py b/sphinx-autogen.py
index ea08557..bcb6308 100755
--- a/sphinx-autogen.py
+++ b/sphinx-autogen.py
@@ -4,7 +4,7 @@
Sphinx - Python documentation toolchain
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx-build.py b/sphinx-build.py
index 7c539d6..ab7919d 100755
--- a/sphinx-build.py
+++ b/sphinx-build.py
@@ -4,7 +4,7 @@
Sphinx - Python documentation toolchain
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx-quickstart.py b/sphinx-quickstart.py
index 89ad8f8..fcc5941 100755
--- a/sphinx-quickstart.py
+++ b/sphinx-quickstart.py
@@ -4,7 +4,7 @@
Sphinx - Python documentation toolchain
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index d159c27..a6e8b43 100644
--- a/sphinx/__init__.py
+++ b/sphinx/__init__.py
@@ -5,7 +5,7 @@
The Sphinx documentation toolchain.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -15,13 +15,13 @@
import sys
from os import path
-__version__ = '1.3.4'
-__released__ = '1.3.4' # used when Sphinx builds its own docs
+__version__ = '1.3.5'
+__released__ = '1.3.5' # used when Sphinx builds its own docs
# version info for better programmatic use
# possible values for 3rd element: 'alpha', 'beta', 'rc', 'final'
# 'final' has 0 as the last element
-version_info = (1, 3, 4, 'final', 0)
+version_info = (1, 3, 5, 'final', 0)
package_dir = path.abspath(path.dirname(__file__))
diff --git a/sphinx/__main__.py b/sphinx/__main__.py
index cd19db3..42022bf 100644
--- a/sphinx/__main__.py
+++ b/sphinx/__main__.py
@@ -5,7 +5,7 @@
The Sphinx documentation toolchain.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
import sys
diff --git a/sphinx/addnodes.py b/sphinx/addnodes.py
index b30bd40..f5ad7ad 100644
--- a/sphinx/addnodes.py
+++ b/sphinx/addnodes.py
@@ -5,7 +5,7 @@
Additional docutils nodes.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/apidoc.py b/sphinx/apidoc.py
index 1238693..b3e184f 100644
--- a/sphinx/apidoc.py
+++ b/sphinx/apidoc.py
@@ -11,7 +11,7 @@
Copyright 2008 Société des arts technologiques (SAT),
http://www.sat.qc.ca/
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
from __future__ import print_function
diff --git a/sphinx/application.py b/sphinx/application.py
index 16b1c81..957a1be 100644
--- a/sphinx/application.py
+++ b/sphinx/application.py
@@ -7,7 +7,7 @@
Gracefully adapted from the TextPress system by Armin.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
from __future__ import print_function
diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py
index 2688f84..30c1f73 100644
--- a/sphinx/builders/__init__.py
+++ b/sphinx/builders/__init__.py
@@ -5,7 +5,7 @@
Builder superclass for all builders.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/applehelp.py b/sphinx/builders/applehelp.py
index c989626..53a0c99 100644
--- a/sphinx/builders/applehelp.py
+++ b/sphinx/builders/applehelp.py
@@ -5,7 +5,7 @@
Build Apple help books.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
from __future__ import print_function
diff --git a/sphinx/builders/changes.py b/sphinx/builders/changes.py
index 4fb98ba..c077b7d 100644
--- a/sphinx/builders/changes.py
+++ b/sphinx/builders/changes.py
@@ -5,7 +5,7 @@
Changelog builder.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/devhelp.py b/sphinx/builders/devhelp.py
index 56e6362..5ebaf2d 100644
--- a/sphinx/builders/devhelp.py
+++ b/sphinx/builders/devhelp.py
@@ -7,7 +7,7 @@
.. _Devhelp: http://live.gnome.org/devhelp
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
from __future__ import absolute_import
diff --git a/sphinx/builders/epub.py b/sphinx/builders/epub.py
index cdcfed2..61990c0 100644
--- a/sphinx/builders/epub.py
+++ b/sphinx/builders/epub.py
@@ -6,7 +6,7 @@
Build epub files.
Originally derived from qthelp.py.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
index ec6a188..ef4992a 100644
--- a/sphinx/builders/gettext.py
+++ b/sphinx/builders/gettext.py
@@ -5,7 +5,7 @@
The MessageCatalogBuilder class.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py
index 7006eff..8dcb905 100644
--- a/sphinx/builders/html.py
+++ b/sphinx/builders/html.py
@@ -5,7 +5,7 @@
Several HTML builders.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/htmlhelp.py b/sphinx/builders/htmlhelp.py
index 9a21fb1..2f06cb0 100644
--- a/sphinx/builders/htmlhelp.py
+++ b/sphinx/builders/htmlhelp.py
@@ -6,7 +6,7 @@
Build HTML help support files.
Parts adapted from Python's Doc/tools/prechm.py.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
from __future__ import print_function
diff --git a/sphinx/builders/latex.py b/sphinx/builders/latex.py
index 18041ea..49922df 100644
--- a/sphinx/builders/latex.py
+++ b/sphinx/builders/latex.py
@@ -5,7 +5,7 @@
LaTeX builder.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -97,8 +97,8 @@ class LaTeXBuilder(Builder):
self.info("processing " + targetname + "... ", nonl=1)
toctrees = self.env.get_doctree(docname).traverse(addnodes.toctree)
if toctrees:
- if toctrees[0].get('maxdepth'):
- tocdepth = int(toctrees[0].get('maxdepth'))
+ if toctrees[0].get('maxdepth') > 0:
+ tocdepth = toctrees[0].get('maxdepth')
else:
tocdepth = None
else:
diff --git a/sphinx/builders/linkcheck.py b/sphinx/builders/linkcheck.py
index 7201011..5904d65 100644
--- a/sphinx/builders/linkcheck.py
+++ b/sphinx/builders/linkcheck.py
@@ -5,7 +5,7 @@
The CheckExternalLinksBuilder class.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/manpage.py b/sphinx/builders/manpage.py
index 2af853d..a2e75f9 100644
--- a/sphinx/builders/manpage.py
+++ b/sphinx/builders/manpage.py
@@ -5,7 +5,7 @@
Manual pages builder.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/qthelp.py b/sphinx/builders/qthelp.py
index 825f565..f6cfa84 100644
--- a/sphinx/builders/qthelp.py
+++ b/sphinx/builders/qthelp.py
@@ -5,7 +5,7 @@
Build input files for the Qt collection generator.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/texinfo.py b/sphinx/builders/texinfo.py
index 7528c07..dec278c 100644
--- a/sphinx/builders/texinfo.py
+++ b/sphinx/builders/texinfo.py
@@ -5,7 +5,7 @@
Texinfo builder.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/text.py b/sphinx/builders/text.py
index 9e624d0..85da4a1 100644
--- a/sphinx/builders/text.py
+++ b/sphinx/builders/text.py
@@ -5,7 +5,7 @@
Plain-text Sphinx builder.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/websupport.py b/sphinx/builders/websupport.py
index 66af0ab..843b089 100644
--- a/sphinx/builders/websupport.py
+++ b/sphinx/builders/websupport.py
@@ -5,7 +5,7 @@
Builder for the web support package.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/builders/xml.py b/sphinx/builders/xml.py
index 18d8cbf..91cb273 100644
--- a/sphinx/builders/xml.py
+++ b/sphinx/builders/xml.py
@@ -5,7 +5,7 @@
Docutils-native XML and pseudo-XML builders.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py
index e9d76bb..21422be 100644
--- a/sphinx/cmdline.py
+++ b/sphinx/cmdline.py
@@ -5,7 +5,7 @@
sphinx-build command-line handling.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
from __future__ import print_function
diff --git a/sphinx/config.py b/sphinx/config.py
index 090875a..4501863 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -5,7 +5,7 @@
Build configuration file handling.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/directives/__init__.py b/sphinx/directives/__init__.py
index 2200cdb..36ca3d3 100644
--- a/sphinx/directives/__init__.py
+++ b/sphinx/directives/__init__.py
@@ -5,7 +5,7 @@
Handlers for additional ReST directives.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/directives/code.py b/sphinx/directives/code.py
index f31ba7a..3d0363a 100644
--- a/sphinx/directives/code.py
+++ b/sphinx/directives/code.py
@@ -3,7 +3,7 @@
sphinx.directives.code
~~~~~~~~~~~~~~~~~~~~~~
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/directives/other.py b/sphinx/directives/other.py
index 794dbda..5129457 100644
--- a/sphinx/directives/other.py
+++ b/sphinx/directives/other.py
@@ -3,7 +3,7 @@
sphinx.directives.other
~~~~~~~~~~~~~~~~~~~~~~~
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/domains/__init__.py b/sphinx/domains/__init__.py
index 5d530ae..e4d397e 100644
--- a/sphinx/domains/__init__.py
+++ b/sphinx/domains/__init__.py
@@ -6,7 +6,7 @@
Support for domains, which are groupings of description directives
and roles describing e.g. constructs of one programming language.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/domains/c.py b/sphinx/domains/c.py
index 6b71f88..23ed04d 100644
--- a/sphinx/domains/c.py
+++ b/sphinx/domains/c.py
@@ -5,7 +5,7 @@
The C language domain.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 69b99d2..a7a1393 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -5,7 +5,7 @@
The C++ language domain.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/domains/javascript.py b/sphinx/domains/javascript.py
index 843629b..f7e2703 100644
--- a/sphinx/domains/javascript.py
+++ b/sphinx/domains/javascript.py
@@ -5,7 +5,7 @@
The JavaScript domain.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/domains/python.py b/sphinx/domains/python.py
index b64e797..ba59980 100644
--- a/sphinx/domains/python.py
+++ b/sphinx/domains/python.py
@@ -5,7 +5,7 @@
The Python domain.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/domains/rst.py b/sphinx/domains/rst.py
index b479614..f0ad66d 100644
--- a/sphinx/domains/rst.py
+++ b/sphinx/domains/rst.py
@@ -5,7 +5,7 @@
The reStructuredText domain.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/domains/std.py b/sphinx/domains/std.py
index 6e132e5..425b62a 100644
--- a/sphinx/domains/std.py
+++ b/sphinx/domains/std.py
@@ -5,7 +5,7 @@
The standard domain.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -628,16 +628,25 @@ class StandardDomain(Domain):
return None
if env.config.numfig is False:
- env.warn(fromdocname, 'numfig is disabled. :numref: is ignored.')
+ env.warn(fromdocname, 'numfig is disabled. :numref: is ignored.',
+ lineno=node.line)
return contnode
try:
target_node = env.get_doctree(docname).ids[labelid]
figtype = get_figtype(target_node)
+ except:
+ return None
+
+ try:
figure_id = target_node['ids'][0]
fignumber = env.toc_fignumbers[docname][figtype][figure_id]
except (KeyError, IndexError):
- return None
+ # target_node is found, but fignumber is not assigned.
+ # Maybe it is defined in orphaned document.
+ env.warn(fromdocname, "no number is assigned for %s: %s" % (figtype, labelid),
+ lineno=node.line)
+ return contnode
title = contnode.astext()
if target == fully_normalize_name(title):
@@ -646,7 +655,8 @@ class StandardDomain(Domain):
try:
newtitle = title % '.'.join(map(str, fignumber))
except TypeError:
- env.warn(fromdocname, 'invalid numfig_format: %s' % title)
+ env.warn(fromdocname, 'invalid numfig_format: %s' % title,
+ lineno=node.line)
return None
return self.build_reference_node(fromdocname, builder,
diff --git a/sphinx/environment.py b/sphinx/environment.py
index 355901c..8d0789c 100644
--- a/sphinx/environment.py
+++ b/sphinx/environment.py
@@ -5,7 +5,7 @@
Global creation environment.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -38,7 +38,7 @@ from docutils.frontend import OptionParser
from sphinx import addnodes
from sphinx.util import url_re, get_matching_docs, docname_join, split_into, \
- FilenameUniqDict, get_figtype, import_object
+ FilenameUniqDict, get_figtype, import_object, split_index_msg
from sphinx.util.nodes import clean_astext, make_refnode, WarningStream, is_translatable
from sphinx.util.osutil import SEP, getcwd, fs_encoding
from sphinx.util.i18n import find_catalog_files
@@ -1123,7 +1123,14 @@ class BuildEnvironment:
def note_indexentries_from(self, docname, document):
entries = self.indexentries[docname] = []
for node in document.traverse(addnodes.index):
- entries.extend(node['entries'])
+ try:
+ for type, value, tid, main in node['entries']:
+ split_index_msg(type, value)
+ except ValueError as exc:
+ self.warn_node(exc, node)
+ node.parent.remove(node)
+ else:
+ entries.extend(node['entries'])
def note_citations_from(self, docname, document):
for node in document.traverse(nodes.citation):
diff --git a/sphinx/errors.py b/sphinx/errors.py
index 6761e87..8d695c1 100644
--- a/sphinx/errors.py
+++ b/sphinx/errors.py
@@ -6,7 +6,7 @@
Contains SphinxError and a few subclasses (in an extra module to avoid
circular import problems).
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/ext/__init__.py b/sphinx/ext/__init__.py
index 62c6416..776250c 100644
--- a/sphinx/ext/__init__.py
+++ b/sphinx/ext/__init__.py
@@ -5,6 +5,6 @@
Contains Sphinx features not activated by default.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py
index ff6a30e..f906d96 100644
--- a/sphinx/ext/autodoc.py
+++ b/sphinx/ext/autodoc.py
@@ -7,7 +7,7 @@
the doctree, thus avoiding duplication between docstrings and documentation
for those who like elaborate docstrings.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -1170,9 +1170,11 @@ class ClassDocumenter(DocstringSignatureMixin, ModuleLevelDocumenter):
docstrings.append(initdocstring)
doc = []
for docstring in docstrings:
- if not isinstance(docstring, text_type):
- docstring = force_decode(docstring, encoding)
- doc.append(prepare_docstring(docstring))
+ if isinstance(docstring, text_type):
+ doc.append(prepare_docstring(docstring, ignore))
+ elif isinstance(docstring, str): # this will not trigger on Py3
+ doc.append(prepare_docstring(force_decode(docstring, encoding),
+ ignore))
return doc
def add_content(self, more_content, no_docstring=False):
diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py
index a53b125..134e323 100644
--- a/sphinx/ext/autosummary/__init__.py
+++ b/sphinx/ext/autosummary/__init__.py
@@ -49,7 +49,7 @@
resolved to a Python object, and otherwise it becomes simple emphasis.
This can be used as the default role to make links 'smart'.
- :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/ext/autosummary/generate.py b/sphinx/ext/autosummary/generate.py
index 2cacadf..8495da7 100644
--- a/sphinx/ext/autosummary/generate.py
+++ b/sphinx/ext/autosummary/generate.py
@@ -14,7 +14,7 @@
generate:
sphinx-autogen -o source/generated source/*.rst
... 2642 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx.git
More information about the Python-modules-commits
mailing list