summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-04-12 21:41:50 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-04-12 21:41:50 (GMT)
commit4d65224f68c73373587c2ea69ac91ad6dd4fd95c (patch)
treeded8d3a223d200515c770775cf429082eb41baab
parentea4b46f9a9056de25a3e368aa458c7dd94c853bf (diff)
downloadcpython-4d65224f68c73373587c2ea69ac91ad6dd4fd95c.zip
cpython-4d65224f68c73373587c2ea69ac91ad6dd4fd95c.tar.gz
cpython-4d65224f68c73373587c2ea69ac91ad6dd4fd95c.tar.bz2
Issue #11186: pydoc ignores a module if its name contains a surrogate character
in the index of modules.
-rwxr-xr-xLib/pydoc.py3
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 0 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 739b440..8e14ee7 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -952,6 +952,9 @@ class HTMLDoc(Doc):
modpkgs = []
if shadowed is None: shadowed = {}
for importer, name, ispkg in pkgutil.iter_modules([dir]):
+ if any((0xD800 <= ord(ch) <= 0xDFFF) for ch in name):
+ # ignore a module if its name contains a surrogate character
+ continue
modpkgs.append((name, '', ispkg, name in shadowed))
shadowed[name] = 1
diff --git a/Misc/NEWS b/Misc/NEWS
index 25dfd91..9a12912 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -103,6 +103,9 @@ Core and Builtins
Library
-------
+- Issue #11186: pydoc ignores a module if its name contains a surrogate
+ character in the index of modules.
+
- Issue #11815: Use a light-weight SimpleQueue for the result queue in
concurrent.futures.ProcessPoolExecutor.