Issue #21942: Fixed source file viewing in pydoc's server mode on Windows.
This commit is contained in:
parent
7cca28ffa2
commit
eb43214427
|
@ -64,6 +64,7 @@ import re
|
|||
import sys
|
||||
import time
|
||||
import tokenize
|
||||
import urllib.parse
|
||||
import warnings
|
||||
from collections import deque
|
||||
from reprlib import Repr
|
||||
|
@ -648,10 +649,7 @@ class HTMLDoc(Doc):
|
|||
head = '<big><big><strong>%s</strong></big></big>' % linkedname
|
||||
try:
|
||||
path = inspect.getabsfile(object)
|
||||
url = path
|
||||
if sys.platform == 'win32':
|
||||
import nturl2path
|
||||
url = nturl2path.pathname2url(path)
|
||||
url = urllib.parse.quote(path)
|
||||
filelink = self.filelink(url, path)
|
||||
except TypeError:
|
||||
filelink = '(built-in)'
|
||||
|
@ -2353,7 +2351,7 @@ def _url_handler(url, content_type="text/html"):
|
|||
|
||||
def html_getfile(path):
|
||||
"""Get and display a source file listing safely."""
|
||||
path = path.replace('%20', ' ')
|
||||
path = urllib.parse.unquote(path)
|
||||
with tokenize.open(path) as fp:
|
||||
lines = html.escape(fp.read())
|
||||
body = '<pre>%s</pre>' % lines
|
||||
|
|
|
@ -14,6 +14,7 @@ import test.support
|
|||
import time
|
||||
import types
|
||||
import unittest
|
||||
import urllib.parse
|
||||
import xml.etree
|
||||
import textwrap
|
||||
from io import StringIO
|
||||
|
@ -406,11 +407,7 @@ class PydocDocTest(unittest.TestCase):
|
|||
def test_html_doc(self):
|
||||
result, doc_loc = get_pydoc_html(pydoc_mod)
|
||||
mod_file = inspect.getabsfile(pydoc_mod)
|
||||
if sys.platform == 'win32':
|
||||
import nturl2path
|
||||
mod_url = nturl2path.pathname2url(mod_file)
|
||||
else:
|
||||
mod_url = mod_file
|
||||
mod_url = urllib.parse.quote(mod_file)
|
||||
expected_html = expected_html_pattern % (
|
||||
(mod_url, mod_file, doc_loc) +
|
||||
expected_html_data_docstrings)
|
||||
|
|
Loading…
Reference in New Issue