summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2011-07-27 17:42:05 (GMT)
committerCharles-François Natali <neologix@free.fr>2011-07-27 17:42:05 (GMT)
commit7a2f0c7802af898599d324f008a439c04ccb933a (patch)
treeb1c0999d1e0f3609eaabdf0c7b94df406ba1cee5
parentc353f68b1d811a7a6d73100882583dd71bbcadb7 (diff)
parent27c4e88552662c9b14496d4793e162e6d6481c96 (diff)
downloadcpython-7a2f0c7802af898599d324f008a439c04ccb933a.zip
cpython-7a2f0c7802af898599d324f008a439c04ccb933a.tar.gz
cpython-7a2f0c7802af898599d324f008a439c04ccb933a.tar.bz2
Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime.
-rwxr-xr-xLib/pydoc.py4
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index ffb4f89..ebd8a61 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -218,8 +218,8 @@ def source_synopsis(file):
def synopsis(filename, cache={}):
"""Get the one-line summary out of a module file."""
mtime = os.stat(filename).st_mtime
- lastupdate, result = cache.get(filename, (0, None))
- if lastupdate < mtime:
+ lastupdate, result = cache.get(filename, (None, None))
+ if lastupdate is None or lastupdate < mtime:
info = inspect.getmoduleinfo(filename)
try:
file = tokenize.open(filename)
diff --git a/Misc/NEWS b/Misc/NEWS
index 857acce..1bcfb55 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -237,6 +237,8 @@ Core and Builtins
Library
-------
+- Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime.
+
- Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is
given as a low fd, it gets overwritten.