Merge branch 'stable'

82 files changed, 118 insertions, 82 deletions

diff --git a/tests/path.py b/tests/path.py
index 6af9ae105..26c2b1b21 100755
--- a/tests/path.py
+++ b/tests/path.py
@@ -4,7 +4,7 @@
     path
     ~~~~
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import os
diff --git a/tests/py35/test_autodoc_py35.py b/tests/py35/test_autodoc_py35.py
index 0a4fc872a..984ec603a 100644
--- a/tests/py35/test_autodoc_py35.py
+++ b/tests/py35/test_autodoc_py35.py
@@ -6,7 +6,7 @@
     Test the autodoc extension.  This tests mainly the Documenters; the auto
     directives are tested in a test source file translated by test_build.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/root/_templates/contentssb.html b/tests/root/_templates/contentssb.html
index 9951d3c35..d0c276ab0 100644
--- a/tests/root/_templates/contentssb.html
+++ b/tests/root/_templates/contentssb.html
@@ -1,2 +1,2 @@
 {# sidebar only for contents document #}
-<h4>Contents sidebar</h4>
\ No newline at end of file
+<h4>Contents sidebar</h4>
diff --git a/tests/root/_templates/layout.html b/tests/root/_templates/layout.html
index 82125df8e..db685b020 100644
--- a/tests/root/_templates/layout.html
+++ b/tests/root/_templates/layout.html
@@ -12,4 +12,4 @@
 {# display global TOC in addition to local TOC #}
 {{ super() }}
 {{ toctree(collapse=False, maxdepth=-1) }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/tests/root/pep_0420/a/b/c/__init__.py b/tests/root/pep_0420/a/b/c/__init__.py
deleted file mode 100644
index 619273942..000000000
--- a/tests/root/pep_0420/a/b/c/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"Package C"
\ No newline at end of file
diff --git a/tests/root/pep_0420/a/b/c/d.py b/tests/root/pep_0420/a/b/c/d.py
deleted file mode 100644
index 6b0b45d90..000000000
--- a/tests/root/pep_0420/a/b/c/d.py
+++ /dev/null
@@ -1 +0,0 @@
-"Module d"
\ No newline at end of file
diff --git a/tests/root/pep_0420/a/b/x/y.py b/tests/root/pep_0420/a/b/x/y.py
deleted file mode 100644
index 8b49b2079..000000000
--- a/tests/root/pep_0420/a/b/x/y.py
+++ /dev/null
@@ -1 +0,0 @@
-"Module y"
\ No newline at end of file
diff --git a/tests/root/test.inc b/tests/root/test.inc
index b8fdb932e..477339013 100644
--- a/tests/root/test.inc
+++ b/tests/root/test.inc
@@ -1,3 +1,3 @@
 .. This file is included from subdir/includes.txt.
 
-This is an include file.
\ No newline at end of file
+This is an include file.
diff --git a/tests/roots/test-api-set-translator/index.rst b/tests/roots/test-api-set-translator/index.rst
index e5a29cf27..4a7d6929b 100644
--- a/tests/roots/test-api-set-translator/index.rst
+++ b/tests/roots/test-api-set-translator/index.rst
@@ -1,3 +1,3 @@
 =======================
 Test API set_translator
-=======================
\ No newline at end of file
+=======================
diff --git a/tests/roots/test-apidoc-pep420/a/b/c/__init__.py b/tests/roots/test-apidoc-pep420/a/b/c/__init__.py
new file mode 100644
index 000000000..5b727c113
--- /dev/null
+++ b/tests/roots/test-apidoc-pep420/a/b/c/__init__.py
@@ -0,0 +1 @@
+"Package C"
diff --git a/tests/roots/test-apidoc-pep420/a/b/c/d.py b/tests/roots/test-apidoc-pep420/a/b/c/d.py
new file mode 100644
index 000000000..63b0e3436
--- /dev/null
+++ b/tests/roots/test-apidoc-pep420/a/b/c/d.py
@@ -0,0 +1 @@
+"Module d"
diff --git a/tests/roots/test-apidoc-pep420/a/b/x/y.py b/tests/roots/test-apidoc-pep420/a/b/x/y.py
new file mode 100644
index 000000000..46bc24505
--- /dev/null
+++ b/tests/roots/test-apidoc-pep420/a/b/x/y.py
@@ -0,0 +1 @@
+"Module y"
diff --git a/tests/roots/test-apidoc-trailing-underscore/package_/__init__.py b/tests/roots/test-apidoc-trailing-underscore/package_/__init__.py
new file mode 100644
index 000000000..b09612b83
--- /dev/null
+++ b/tests/roots/test-apidoc-trailing-underscore/package_/__init__.py
@@ -0,0 +1 @@
+""" A package with trailing underscores """
diff --git a/tests/roots/test-apidoc-trailing-underscore/package_/module_.py b/tests/roots/test-apidoc-trailing-underscore/package_/module_.py
new file mode 100644
index 000000000..9902551ee
--- /dev/null
+++ b/tests/roots/test-apidoc-trailing-underscore/package_/module_.py
@@ -0,0 +1,7 @@
+""" A module with a trailing underscore """
+
+class SomeClass_:
+    """ A class with a trailing underscore """
+
+def some_function_(some_arg_):
+    """ A function with a trailing underscore in name and argument """
diff --git a/tests/roots/test-search/tocitem.rst b/tests/roots/test-search/tocitem.rst
index 61c42a242..f082abf65 100644
--- a/tests/roots/test-search/tocitem.rst
+++ b/tests/roots/test-search/tocitem.rst
@@ -7,4 +7,4 @@ lorem ipsum
 textinheading
 =============
 
-lorem ipsum
\ No newline at end of file
+lorem ipsum
diff --git a/tests/run.py b/tests/run.py
index 71ddcc363..71a41c7c1 100755
--- a/tests/run.py
+++ b/tests/run.py
@@ -6,7 +6,7 @@
 
     This script runs the Sphinx unit test suite.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from __future__ import print_function
diff --git a/tests/test_api_translator.py b/tests/test_api_translator.py
index f1c70a671..d987a1b57 100644
--- a/tests/test_api_translator.py
+++ b/tests/test_api_translator.py
@@ -5,7 +5,7 @@
 
     Test the Sphinx API for translator.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_apidoc.py b/tests/test_apidoc.py
index 7e6c4fd0a..358df4283 100644
--- a/tests/test_apidoc.py
+++ b/tests/test_apidoc.py
@@ -5,7 +5,7 @@
 
     Test the sphinx.apidoc module.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
@@ -60,7 +60,7 @@ def test_simple(make_app, apidoc):
 
 
 @pytest.mark.apidoc(
-    coderoot=(rootdir / 'root' / 'pep_0420'),
+    coderoot=(rootdir / 'roots' / 'test-apidoc-pep420'),
     options=["--implicit-namespaces"],
 )
 def test_pep_0420_enabled(make_app, apidoc):
@@ -71,13 +71,11 @@ def test_pep_0420_enabled(make_app, apidoc):
 
     with open(outdir / 'a.b.c.rst') as f:
         rst = f.read()
-        assert "a.b.c package\n" in rst
         assert "automodule:: a.b.c.d\n" in rst
         assert "automodule:: a.b.c\n" in rst
 
     with open(outdir / 'a.b.x.rst') as f:
         rst = f.read()
-        assert "a.b.x namespace\n" in rst
         assert "automodule:: a.b.x.y\n" in rst
         assert "automodule:: a.b.x\n" not in rst
 
@@ -86,8 +84,20 @@ def test_pep_0420_enabled(make_app, apidoc):
     print(app._status.getvalue())
     print(app._warning.getvalue())
 
+    builddir = outdir / '_build' / 'text'
+    assert (builddir / 'a.b.c.txt').isfile()
+    assert (builddir / 'a.b.x.txt').isfile()
 
-@pytest.mark.apidoc(coderoot=(rootdir / 'root' / 'pep_0420'))
+    with open(builddir / 'a.b.c.txt') as f:
+        txt = f.read()
+        assert "a.b.c package\n" in txt
+
+    with open(builddir / 'a.b.x.txt') as f:
+        txt = f.read()
+        assert "a.b.x namespace\n" in txt
+
+
+@pytest.mark.apidoc(coderoot=(rootdir / 'roots' / 'test-apidoc-pep420'))
 def test_pep_0420_disabled(make_app, apidoc):
     outdir = apidoc.outdir
     assert (outdir / 'conf.py').isfile()
@@ -100,7 +110,8 @@ def test_pep_0420_disabled(make_app, apidoc):
     print(app._warning.getvalue())
 
 
-@pytest.mark.apidoc(coderoot=(rootdir / 'root' / 'pep_0420' / 'a' / 'b'))
+@pytest.mark.apidoc(
+    coderoot=(rootdir / 'roots' / 'test-apidoc-pep420' / 'a' / 'b'))
 def test_pep_0420_disabled_top_level_verify(make_app, apidoc):
     outdir = apidoc.outdir
     assert (outdir / 'conf.py').isfile()
@@ -118,6 +129,23 @@ def test_pep_0420_disabled_top_level_verify(make_app, apidoc):
     print(app._status.getvalue())
     print(app._warning.getvalue())
 
+@pytest.mark.apidoc(
+    coderoot=(rootdir / 'roots' / 'test-apidoc-trailing-underscore'))
+def test_trailing_underscore(make_app, apidoc):
+    outdir = apidoc.outdir
+    assert (outdir / 'conf.py').isfile()
+    assert (outdir / 'package_.rst').isfile()
+
+    app = make_app('text', srcdir=outdir)
+    app.build()
+    print(app._status.getvalue())
+    print(app._warning.getvalue())
+
+    builddir = outdir / '_build' / 'text'
+    with open(builddir / 'package_.txt') as f:
+        rst = f.read()
+        assert "package_ package\n" in rst
+        assert "package_.module_ module\n" in rst
 
 @pytest.mark.apidoc(
     coderoot=(rootdir / 'root'),
diff --git a/tests/test_application.py b/tests/test_application.py
index e83e2b4de..d285aa03d 100644
--- a/tests/test_application.py
+++ b/tests/test_application.py
@@ -5,7 +5,7 @@
 
     Test the Sphinx class.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import codecs
diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py
index d8c2e0079..b7dfbed31 100644
--- a/tests/test_autodoc.py
+++ b/tests/test_autodoc.py
@@ -6,7 +6,7 @@
     Test the autodoc extension.  This tests mainly the Documenters; the auto
     directives are tested in a test source file translated by test_build.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_build.py b/tests/test_build.py
index 6dd001b61..33e9196dd 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -5,7 +5,7 @@
 
     Test all builders.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_build_applehelp.py b/tests/test_build_applehelp.py
index 48324e259..14b856091 100644
--- a/tests/test_build_applehelp.py
+++ b/tests/test_build_applehelp.py
@@ -7,7 +7,7 @@
     test the HTML itself; that's already handled by
     :file:`test_build_html.py`.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_build_gettext.py b/tests/test_build_gettext.py
index 6354360d7..f256140fe 100644
--- a/tests/test_build_gettext.py
+++ b/tests/test_build_gettext.py
@@ -5,7 +5,7 @@
 
     Test the build process with gettext builder with the test root.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from __future__ import print_function
diff --git a/tests/test_build_html.py b/tests/test_build_html.py
index 67939a10b..def6722c3 100644
--- a/tests/test_build_html.py
+++ b/tests/test_build_html.py
@@ -5,7 +5,7 @@
 
     Test the HTML builder and check output against XPath.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py
index bc0846c01..b2cfd6cbb 100644
--- a/tests/test_build_latex.py
+++ b/tests/test_build_latex.py
@@ -5,7 +5,7 @@
 
     Test the build process with LaTeX builder with the test root.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from __future__ import print_function
diff --git a/tests/test_build_linkcheck.py b/tests/test_build_linkcheck.py
index f776f772a..cc3d6e24f 100644
--- a/tests/test_build_linkcheck.py
+++ b/tests/test_build_linkcheck.py
@@ -5,7 +5,7 @@
 
     Test the build process with manpage builder with the test root.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from __future__ import print_function
diff --git a/tests/test_build_manpage.py b/tests/test_build_manpage.py
index b91a4fd29..953332c73 100644
--- a/tests/test_build_manpage.py
+++ b/tests/test_build_manpage.py
@@ -5,7 +5,7 @@
 
     Test the build process with manpage builder with the test root.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from __future__ import print_function
diff --git a/tests/test_build_texinfo.py b/tests/test_build_texinfo.py
index bd7bd6270..0177bc392 100644
--- a/tests/test_build_texinfo.py
+++ b/tests/test_build_texinfo.py
@@ -5,7 +5,7 @@
 
     Test the build process with Texinfo builder with the test root.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from __future__ import print_function
diff --git a/tests/test_build_text.py b/tests/test_build_text.py
index f95e4d2ab..6ce3b5276 100644
--- a/tests/test_build_text.py
+++ b/tests/test_build_text.py
@@ -5,7 +5,7 @@
 
     Test the build process with Text builder with the test root.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_catalogs.py b/tests/test_catalogs.py
index 7e395274c..64f2acb9a 100644
--- a/tests/test_catalogs.py
+++ b/tests/test_catalogs.py
@@ -5,7 +5,7 @@
 
     Test the base build process.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import shutil
diff --git a/tests/test_config.py b/tests/test_config.py
index 0d923cc0a..a026f3d2e 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -6,7 +6,7 @@
     Test the sphinx.config.Config class and its handling in the
     Application class.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from six import PY3, iteritems
diff --git a/tests/test_correct_year.py b/tests/test_correct_year.py
index 574adb6f0..a8058f08c 100644
--- a/tests/test_correct_year.py
+++ b/tests/test_correct_year.py
@@ -5,7 +5,7 @@
 
     Test copyright year adjustment
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import pytest
diff --git a/tests/test_directive_code.py b/tests/test_directive_code.py
index 3ace7fb5f..5a91b4aab 100644
--- a/tests/test_directive_code.py
+++ b/tests/test_directive_code.py
@@ -5,7 +5,7 @@
 
     Test the code-block directive.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_directive_only.py b/tests/test_directive_only.py
index 08ba7e669..35d15b391 100644
--- a/tests/test_directive_only.py
+++ b/tests/test_directive_only.py
@@ -5,7 +5,7 @@
 
     Test the only directive with the test root.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_docutilsconf.py b/tests/test_docutilsconf.py
index 89ec63107..3c43b6e7c 100644
--- a/tests/test_docutilsconf.py
+++ b/tests/test_docutilsconf.py
@@ -5,7 +5,7 @@
 
     Test docutils.conf support for several writers.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_domain_cpp.py b/tests/test_domain_cpp.py
index bf833887b..49d8e3206 100644
--- a/tests/test_domain_cpp.py
+++ b/tests/test_domain_cpp.py
@@ -5,7 +5,7 @@
 
     Tests the C++ Domain
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_domain_js.py b/tests/test_domain_js.py
index d913edd46..d103484d3 100644
--- a/tests/test_domain_js.py
+++ b/tests/test_domain_js.py
@@ -5,7 +5,7 @@
 
     Tests the JavaScript Domain
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_domain_py.py b/tests/test_domain_py.py
index 1f497d69d..73766e718 100644
--- a/tests/test_domain_py.py
+++ b/tests/test_domain_py.py
@@ -5,7 +5,7 @@
 
     Tests the Python Domain
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_domain_rst.py b/tests/test_domain_rst.py
index 0d6dab5d8..1e55e92a1 100644
--- a/tests/test_domain_rst.py
+++ b/tests/test_domain_rst.py
@@ -5,7 +5,7 @@
 
     Tests the reStructuredText domain.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_domain_std.py b/tests/test_domain_std.py
index 4f892cb01..9c476a040 100644
--- a/tests/test_domain_std.py
+++ b/tests/test_domain_std.py
@@ -5,7 +5,7 @@
 
     Tests the std domain
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_environment.py b/tests/test_environment.py
index 8cfd26e1a..4133a28fd 100644
--- a/tests/test_environment.py
+++ b/tests/test_environment.py
@@ -5,7 +5,7 @@
 
     Test the BuildEnvironment class.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_environment_indexentries.py b/tests/test_environment_indexentries.py
index d29f27eff..b9de151cc 100644
--- a/tests/test_environment_indexentries.py
+++ b/tests/test_environment_indexentries.py
@@ -5,7 +5,7 @@
 
     Test the sphinx.environment.managers.indexentries.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_environment_toctree.py b/tests/test_environment_toctree.py
index 595f922ae..0f1dffa43 100644
--- a/tests/test_environment_toctree.py
+++ b/tests/test_environment_toctree.py
@@ -5,7 +5,7 @@
 
     Test the sphinx.environment.managers.toctree.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_autodoc.py b/tests/test_ext_autodoc.py
index 873fc23c9..1c1ebf7a0 100644
--- a/tests/test_ext_autodoc.py
+++ b/tests/test_ext_autodoc.py
@@ -5,7 +5,7 @@
 
     Test the autodoc extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_autosectionlabel.py b/tests/test_ext_autosectionlabel.py
index 71d19e800..6942f593d 100644
--- a/tests/test_ext_autosectionlabel.py
+++ b/tests/test_ext_autosectionlabel.py
@@ -5,7 +5,7 @@
 
     Test sphinx.ext.autosectionlabel extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_autosummary.py b/tests/test_ext_autosummary.py
index f53b7c2c5..434664928 100644
--- a/tests/test_ext_autosummary.py
+++ b/tests/test_ext_autosummary.py
@@ -5,7 +5,7 @@
 
     Test the autosummary extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_coverage.py b/tests/test_ext_coverage.py
index 4ae18b66e..ff3fb4c02 100644
--- a/tests/test_ext_coverage.py
+++ b/tests/test_ext_coverage.py
@@ -5,7 +5,7 @@
 
     Test the coverage builder.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_doctest.py b/tests/test_ext_doctest.py
index 10f51a133..705f6262a 100644
--- a/tests/test_ext_doctest.py
+++ b/tests/test_ext_doctest.py
@@ -5,7 +5,7 @@
 
     Test the doctest extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import pytest
diff --git a/tests/test_ext_githubpages.py b/tests/test_ext_githubpages.py
index 2eff6be78..56ce7b775 100644
--- a/tests/test_ext_githubpages.py
+++ b/tests/test_ext_githubpages.py
@@ -5,7 +5,7 @@
 
     Test sphinx.ext.githubpages extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_graphviz.py b/tests/test_ext_graphviz.py
index 1c31e8eaf..6affda7ab 100644
--- a/tests/test_ext_graphviz.py
+++ b/tests/test_ext_graphviz.py
@@ -5,7 +5,7 @@
 
     Test sphinx.ext.graphviz extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_ifconfig.py b/tests/test_ext_ifconfig.py
index 1ed7c78d2..5c59caaaf 100644
--- a/tests/test_ext_ifconfig.py
+++ b/tests/test_ext_ifconfig.py
@@ -5,7 +5,7 @@
 
     Test sphinx.ext.ifconfig extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_inheritance_diagram.py b/tests/test_ext_inheritance_diagram.py
index 731dc54ca..5c4e5b673 100644
--- a/tests/test_ext_inheritance_diagram.py
+++ b/tests/test_ext_inheritance_diagram.py
@@ -5,7 +5,7 @@
 
     Test sphinx.ext.inheritance_diagram extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_intersphinx.py b/tests/test_ext_intersphinx.py
index 79e41bb13..86e56fd47 100644
--- a/tests/test_ext_intersphinx.py
+++ b/tests/test_ext_intersphinx.py
@@ -5,7 +5,7 @@
 
     Test the intersphinx extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_math.py b/tests/test_ext_math.py
index 3cbb534e9..296bba94f 100644
--- a/tests/test_ext_math.py
+++ b/tests/test_ext_math.py
@@ -5,7 +5,7 @@
 
     Test math extensions.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_napoleon.py b/tests/test_ext_napoleon.py
index 5f68ba7c0..b2ca7fe7a 100644
--- a/tests/test_ext_napoleon.py
+++ b/tests/test_ext_napoleon.py
@@ -6,7 +6,7 @@
     Tests for :mod:`sphinx.ext.napoleon.__init__` module.
 
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_napoleon_docstring.py b/tests/test_ext_napoleon_docstring.py
index 2cdf9856c..e71d517fe 100644
--- a/tests/test_ext_napoleon_docstring.py
+++ b/tests/test_ext_napoleon_docstring.py
@@ -6,7 +6,7 @@
     Tests for :mod:`sphinx.ext.napoleon.docstring` module.
 
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_napoleon_iterators.py b/tests/test_ext_napoleon_iterators.py
index 2faa11d40..5258d9b79 100644
--- a/tests/test_ext_napoleon_iterators.py
+++ b/tests/test_ext_napoleon_iterators.py
@@ -6,7 +6,7 @@
     Tests for :mod:`sphinx.ext.napoleon.iterators` module.
 
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_todo.py b/tests/test_ext_todo.py
index 05baadfef..77d657adc 100644
--- a/tests/test_ext_todo.py
+++ b/tests/test_ext_todo.py
@@ -5,7 +5,7 @@
 
     Test sphinx.ext.todo extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_ext_viewcode.py b/tests/test_ext_viewcode.py
index 3f810ef86..4a3fb550f 100644
--- a/tests/test_ext_viewcode.py
+++ b/tests/test_ext_viewcode.py
@@ -5,7 +5,7 @@
 
     Test sphinx.ext.viewcode extension.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_highlighting.py b/tests/test_highlighting.py
index e2c5221ff..938181fe1 100644
--- a/tests/test_highlighting.py
+++ b/tests/test_highlighting.py
@@ -5,7 +5,7 @@
 
     Test the Pygments highlighting bridge.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_intl.py b/tests/test_intl.py
index 59dfd6e89..f03c771c9 100644
--- a/tests/test_intl.py
+++ b/tests/test_intl.py
@@ -6,7 +6,7 @@
     Test message patching for internationalization purposes.  Runs the text
     builder in the test root.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from __future__ import print_function
diff --git a/tests/test_markup.py b/tests/test_markup.py
index 11776cf44..ecc4b6a11 100644
--- a/tests/test_markup.py
+++ b/tests/test_markup.py
@@ -5,7 +5,7 @@
 
     Test various Sphinx-specific markup extensions.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 868b05139..77efff5ed 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -5,7 +5,7 @@
 
     Test our handling of metadata in files with bibliographic metadata.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py
index eb1d32409..6195e6216 100644
--- a/tests/test_quickstart.py
+++ b/tests/test_quickstart.py
@@ -5,7 +5,7 @@
 
     Test the sphinx.quickstart module.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_search.py b/tests/test_search.py
index 19b322dd8..21c0badb7 100644
--- a/tests/test_search.py
+++ b/tests/test_search.py
@@ -5,7 +5,7 @@
 
     Test the search index builder.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_searchadapters.py b/tests/test_searchadapters.py
index ee350182f..79109dbac 100644
--- a/tests/test_searchadapters.py
+++ b/tests/test_searchadapters.py
@@ -5,7 +5,7 @@
 
     Test the Web Support Package search adapters.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_setup_command.py b/tests/test_setup_command.py
index 97943075f..70c6b796f 100644
--- a/tests/test_setup_command.py
+++ b/tests/test_setup_command.py
@@ -5,7 +5,7 @@
 
     Test setup_command for distutils.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_templating.py b/tests/test_templating.py
index aaca9d6bf..b0070f06a 100644
--- a/tests/test_templating.py
+++ b/tests/test_templating.py
@@ -5,7 +5,7 @@
 
     Test templating.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_theming.py b/tests/test_theming.py
index 2602930f6..4f305d8bf 100644
--- a/tests/test_theming.py
+++ b/tests/test_theming.py
@@ -5,7 +5,7 @@
 
     Test the Theme class.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_toctree.py b/tests/test_toctree.py
index 72f47be2c..276ef7977 100644
--- a/tests/test_toctree.py
+++ b/tests/test_toctree.py
@@ -5,7 +5,7 @@
 
     Test the HTML builder and check output against XPath.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 import pytest
diff --git a/tests/test_util.py b/tests/test_util.py
index 9ff671168..0a481db2a 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -5,7 +5,7 @@
 
     Tests util functions.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_util_fileutil.py b/tests/test_util_fileutil.py
index 121b0d69f..849ccce22 100644
--- a/tests/test_util_fileutil.py
+++ b/tests/test_util_fileutil.py
@@ -5,7 +5,7 @@
 
     Tests sphinx.util.fileutil functions.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from sphinx.util.fileutil import copy_asset, copy_asset_file
diff --git a/tests/test_util_i18n.py b/tests/test_util_i18n.py
index d5a0f8f64..a155afe35 100644
--- a/tests/test_util_i18n.py
+++ b/tests/test_util_i18n.py
@@ -5,7 +5,7 @@
 
     Test i18n util.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from __future__ import print_function
diff --git a/tests/test_util_inspect.py b/tests/test_util_inspect.py
index 2dcbc37d5..affa70993 100644
--- a/tests/test_util_inspect.py
+++ b/tests/test_util_inspect.py
@@ -5,7 +5,7 @@
 
     Tests util.inspect functions.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from unittest import TestCase
diff --git a/tests/test_util_logging.py b/tests/test_util_logging.py
index 4083ec5bd..ca46b8328 100644
--- a/tests/test_util_logging.py
+++ b/tests/test_util_logging.py
@@ -5,7 +5,7 @@
 
     Test logging util.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from __future__ import print_function
diff --git a/tests/test_util_matching.py b/tests/test_util_matching.py
index 9e99a5322..3b84f4735 100644
--- a/tests/test_util_matching.py
+++ b/tests/test_util_matching.py
@@ -5,7 +5,7 @@
 
     Tests sphinx.util.matching functions.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from sphinx.util.matching import compile_matchers, Matcher
diff --git a/tests/test_util_nodes.py b/tests/test_util_nodes.py
index 7aded8a4b..c392c2bc7 100644
--- a/tests/test_util_nodes.py
+++ b/tests/test_util_nodes.py
@@ -5,7 +5,7 @@
 
     Tests uti.nodes functions.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from textwrap import dedent
diff --git a/tests/test_util_rst.py b/tests/test_util_rst.py
index b4ce955f4..5fce6e3eb 100644
--- a/tests/test_util_rst.py
+++ b/tests/test_util_rst.py
@@ -5,7 +5,7 @@
 
     Tests sphinx.util.rst functions.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from sphinx.util.rst import escape
diff --git a/tests/test_versioning.py b/tests/test_versioning.py
index 4b9ebefcb..0727d7c4a 100644
--- a/tests/test_versioning.py
+++ b/tests/test_versioning.py
@@ -5,7 +5,7 @@
 
     Test the versioning implementation.
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_websupport.py b/tests/test_websupport.py
index 5fe3cb0ca..91f67bf72 100644
--- a/tests/test_websupport.py
+++ b/tests/test_websupport.py
@@ -5,7 +5,7 @@
 
     Test the Web Support Package
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 
diff --git a/tests/test_writer_latex.py b/tests/test_writer_latex.py
index 33803299b..228161886 100644
--- a/tests/test_writer_latex.py
+++ b/tests/test_writer_latex.py
@@ -5,7 +5,7 @@
 
     Test the LaTeX writer
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """
 from __future__ import print_function
diff --git a/tests/util.py b/tests/util.py
index f8be8baa9..82c4b8d1b 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -3,7 +3,7 @@
     Sphinx test suite utilities
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :copyright: Copyright 2007-2017 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
 """