IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2017-01-20 12:17:38 +09:00
commit 9ac221b140
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@ -110,6 +110,7 @@ Bugs fixed
* LaTeX rendering of inserted footnotes in parsed-literal is wrong (ref #3340) * 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) * 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) * #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) 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, package ifthen is not any longer a dependency of sphinx.sty
* latex, style file does not modify fancyvrb's Verbatim (also available as * latex, style file does not modify fancyvrb's Verbatim (also available as
OriginalVerbatim) but uses sphinxVerbatim for name of custom wrapper. OriginalVerbatim) but uses sphinxVerbatim for name of custom wrapper.
* latex, package newfloat is no longer a dependency of sphinx.sty (ref #2660; * latex, package newfloat is not used (and not included) anymore (ref #2660;
it was shipped with Sphinx since 1.3.4). it was used since 1.3.4 and shipped with Sphinx since 1.4).
* latex, literal blocks in tables do not use OriginalVerbatim but * latex, literal blocks in tables do not use OriginalVerbatim but
sphinxVerbatimintable which handles captions and wraps lines(ref #2704). sphinxVerbatimintable which handles captions and wraps lines(ref #2704).
* latex, replace ``pt`` by TeX equivalent ``bp`` if found in ``width`` or * latex, replace ``pt`` by TeX equivalent ``bp`` if found in ``width`` or

7
sphinx/builders/linkcheck.py
View File

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