Merge remote-tracking branch 'upstream/master' into DocFieldTransformer

CHANGES

@@ -110,6 +110,7 @@ Bugs fixed
 * LaTeX rendering of inserted footnotes in parsed-literal is wrong (ref #3340)
 * Inline math in parsed-literal is not rendered well by LaTeX (ref #3340)
 * #3308: Parsed-literals don't wrap very long lines with pdf builder (ref #3340)
+* #3295: Could not import extension sphinx.builders.linkcheck
 
 
 Release 1.5.1 (released Dec 13, 2016)
@@ -152,8 +153,8 @@ Incompatible changes
 * latex, package ifthen is not any longer a dependency of sphinx.sty
 * latex, style file does not modify fancyvrb's Verbatim (also available as
   OriginalVerbatim) but uses sphinxVerbatim for name of custom wrapper.
-* latex, package newfloat is no longer a dependency of sphinx.sty (ref #2660;
-  it was shipped with Sphinx since 1.3.4).
+* latex, package newfloat is not used (and not included) anymore (ref #2660;
+  it was used since 1.3.4 and shipped with Sphinx since 1.4).
 * latex, literal blocks in tables do not use OriginalVerbatim but
   sphinxVerbatimintable which handles captions and wraps lines(ref #2704).
 * latex, replace ``pt`` by TeX equivalent ``bp`` if found in ``width`` or

sphinx/builders/linkcheck.py

@@ -16,9 +16,8 @@ import threading
 from os import path
 
 from requests.exceptions import HTTPError
-from six.moves import queue  # type: ignore
+from six.moves import queue, html_parser  # type: ignore
 from six.moves.urllib.parse import unquote
-from six.moves.html_parser import HTMLParser
 from docutils import nodes
 
 # 2015-06-25 barry@python.org.  This exception was deprecated in Python 3.3 and
@@ -48,12 +47,12 @@ if False:
 logger = logging.getLogger(__name__)
 
 
-class AnchorCheckParser(HTMLParser):
+class AnchorCheckParser(html_parser.HTMLParser):
     """Specialized HTML parser that looks for a specific anchor."""
 
     def __init__(self, search_anchor):
         # type: (unicode) -> None
-        HTMLParser.__init__(self)
+        html_parser.HTMLParser.__init__(self)
 
         self.search_anchor = search_anchor
         self.found = False

sphinx/config.py

@@ -44,6 +44,9 @@ CONFIG_PERMITTED_TYPE_WARNING = "The config value `{name}' has type `{current.__
 CONFIG_TYPE_WARNING = "The config value `{name}' has type `{current.__name__}', " \
                       "defaults to `{default.__name__}'."
 
+if PY3:
+    unicode = str  # special alias for static typing...
+
 ConfigValue = NamedTuple('ConfigValue', [('name', str),
                                          ('value', Any),
                                          ('rebuild', Union[bool, unicode])])