Merge branch 'stable' into 1.5-release

CHANGES

@@ -266,6 +266,7 @@ Bugs fixed
   results in warning / error
 * #3068: Allow the '=' character in the -D option of sphinx-build.py
 * #3074: ``add_source_parser()`` crashes in debug mode
+* #3135: ``sphinx.ext.autodoc`` crashes with plain Callable
 
 Release 1.4.8 (released Oct 1, 2016)
 ====================================

EXAMPLES

@@ -94,6 +94,7 @@ Documentation using a customized version of the classic theme
 * NumPy: http://docs.scipy.org/doc/numpy/reference/
 * OpenCV: http://docs.opencv.org/
 * Peach^3: http://peach3.nl/doc/latest/userdoc/
+* Pygame: http://www.pygame.org/docs/
 * Sage: http://www.sagemath.org/doc/
 * SciPy: http://docs.scipy.org/doc/scipy/reference/
 * simuPOP: http://simupop.sourceforge.net/manual_release/build/userGuide.html

doc/_themes/sphinx13/static/sphinx13.css

@@ -384,6 +384,10 @@ div.warning ul, div.warning ol {
     padding: 0;
 }
 
+div.admonition div.highlight {
+    background: none;
+}
+
 .viewcode-back {
     font-family: 'Open Sans', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',
                  'Verdana', sans-serif;

sphinx/ext/autodoc.py

@@ -317,7 +317,9 @@ def format_annotation(annotation):
                 hasattr(annotation, '__result__'):
             # Skipped in the case of plain typing.Callable
             args = annotation.__args__
-            if args is Ellipsis:
+            if args is None:
+                return qualified_name
+            elif args is Ellipsis:
                 args_str = '...'
             else:
                 formatted_args = (format_annotation(a) for a in args)

sphinx/locale/it/LC_MESSAGES/sphinx.po

@@ -819,7 +819,7 @@ msgstr "Ricerca completata, trovata/e %s pagina/e corrispondenti."
 
 #: sphinx/themes/basic/static/searchtools.js_t:338
 msgid ", in "
-msgstr ", in"
+msgstr ", in "
 
 #: sphinx/themes/classic/static/sidebar.js_t:83
 msgid "Expand sidebar"

tox.ini

@@ -10,6 +10,7 @@ deps=
     whoosh
     html5lib
     mock
+    typing
 setenv =
     SPHINX_TEST_TEMPDIR = {envdir}/testbuild
 commands=