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 '1.8'

Browse Source
This commit is contained in:
Takeshi KOMIYA 2018-12-02 22:26:12 +09:00
commit 28add225f2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -113,6 +113,7 @@ Bugs fixed
* #5520: LaTeX, caption package incompatibility since Sphinx 1.6 * #5520: LaTeX, caption package incompatibility since Sphinx 1.6
* #5614: autodoc: incremental build is broken when builtin modules are imported * #5614: autodoc: incremental build is broken when builtin modules are imported
* #5627: qthelp: index.html missing in QtHelp * #5627: qthelp: index.html missing in QtHelp
* #5659: linkcheck: crashes for a hyperlink containing multibyte character
Testing Testing
-------- --------

9
sphinx/util/__init__.py
View File

@ -601,12 +601,11 @@ def import_object(objname, source=None):
def encode_uri(uri): def encode_uri(uri):
# type: (unicode) -> unicode # type: (unicode) -> unicode
split = list(urlsplit(uri)) # type: Any split = list(urlsplit(uri)) # type: List[unicode]
split[1] = split[1].encode('idna').decode('ascii') split[1] = split[1].encode('idna').decode('ascii')
split[2] = quote_plus(split[2].encode('utf-8'), '/').decode('ascii') split[2] = quote_plus(split[2].encode('utf-8'), '/')
query = list((q, quote_plus(v.encode('utf-8'))) query = list((q, v.encode('utf-8')) for (q, v) in parse_qsl(split[3]))
for (q, v) in parse_qsl(split[3])) split[3] = urlencode(query)
split[3] = urlencode(query).decode('ascii')
return urlunsplit(split) return urlunsplit(split)

4
tests/test_util.py
View File

@ -33,13 +33,13 @@ def test_encode_uri():
u'%D0%B1%D0%B0%D0%B7%D0%B0%D0%BC%D0%B8_%D0%B4%D0%B0%D0%BD%D0%BD%D1%8B%D1%85') u'%D0%B1%D0%B0%D0%B7%D0%B0%D0%BC%D0%B8_%D0%B4%D0%B0%D0%BD%D0%BD%D1%8B%D1%85')
uri = (u'https://ru.wikipedia.org/wiki' uri = (u'https://ru.wikipedia.org/wiki'
u'/Система_управления_базами_данных') u'/Система_управления_базами_данных')
assert expected, encode_uri(uri) assert expected == encode_uri(uri)
expected = (u'https://github.com/search?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+is%3A' expected = (u'https://github.com/search?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+is%3A'
u'sprint-friendly+user%3Ajupyter&type=Issues&ref=searchresults') u'sprint-friendly+user%3Ajupyter&type=Issues&ref=searchresults')
uri = (u'https://github.com/search?utf8=✓&q=is%3Aissue+is%3Aopen+is%3A' uri = (u'https://github.com/search?utf8=✓&q=is%3Aissue+is%3Aopen+is%3A'
u'sprint-friendly+user%3Ajupyter&type=Issues&ref=searchresults') u'sprint-friendly+user%3Ajupyter&type=Issues&ref=searchresults')
assert expected, encode_uri(uri) assert expected == encode_uri(uri)
def test_ensuredir(): def test_ensuredir():