[Python-checkins] Fix linecache.py add lazycache to __all__ and use dict.clear to clear the cache (GH-4641)

[Cheryl Sabella]

https://github.com/python/cpython/commit/4515a590a4a4c09231a66e81782f33b4bfcd5054
commit: 4515a590a4a4c09231a66e81782f33b4bfcd5054
branch: master
author: 加和 <ganziqim at live.com>
committer: Cheryl Sabella <cheryl.sabella at gmail.com>
date: 2020-01-25T21:07:40-05:00
summary:

Fix linecache.py add lazycache to __all__ and use dict.clear to clear the cache (GH-4641)

files:
A Misc/NEWS.d/next/Library/2017-12-04-10-14-23.bpo-32173.e0C5dF.rst
M Lib/linecache.py

diff --git a/Lib/linecache.py b/Lib/linecache.py
index 3afcce1f0a145..ddd0abf2cf01d 100644
--- a/Lib/linecache.py
+++ b/Lib/linecache.py
@@ -10,17 +10,8 @@
 import os
 import tokenize
 
-__all__ = ["getline", "clearcache", "checkcache"]
+__all__ = ["getline", "clearcache", "checkcache", "lazycache"]
 
-def getline(filename, lineno, module_globals=None):
-    lines = getlines(filename, module_globals)
-    if 1 <= lineno <= len(lines):
-        return lines[lineno-1]
-    else:
-        return ''
-
-
-# The cache
 
 # The cache. Maps filenames to either a thunk which will provide source code,
 # or a tuple (size, mtime, lines, fullname) once loaded.
@@ -29,9 +20,17 @@ def getline(filename, lineno, module_globals=None):
 
 def clearcache():
     """Clear the cache entirely."""
+    cache.clear()
 
-    global cache
-    cache = {}
+
+def getline(filename, lineno, module_globals=None):
+    """Get a line for a Python source file from the cache.
+    Update the cache if it doesn't contain an entry for this file already."""
+
+    lines = getlines(filename, module_globals)
+    if 1 <= lineno <= len(lines):
+        return lines[lineno - 1]
+    return ''
 
 
 def getlines(filename, module_globals=None):
@@ -56,11 +55,10 @@ def checkcache(filename=None):
 
     if filename is None:
         filenames = list(cache.keys())
+    elif filename in cache:
+        filenames = [filename]
     else:
-        if filename in cache:
-            filenames = [filename]
-        else:
-            return
+        return
 
     for filename in filenames:
         entry = cache[filename]
@@ -109,8 +107,10 @@ def updatecache(filename, module_globals=None):
                     # for this module.
                     return []
                 cache[filename] = (
-                    len(data), None,
-                    [line+'\n' for line in data.splitlines()], fullname
+                    len(data),
+                    None,
+                    [line + '\n' for line in data.splitlines()],
+                    fullname
                 )
                 return cache[filename][2]
 
diff --git a/Misc/NEWS.d/next/Library/2017-12-04-10-14-23.bpo-32173.e0C5dF.rst b/Misc/NEWS.d/next/Library/2017-12-04-10-14-23.bpo-32173.e0C5dF.rst
new file mode 100644
index 0000000000000..fc8f36fb02194
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-12-04-10-14-23.bpo-32173.e0C5dF.rst
@@ -0,0 +1,3 @@
+* Add `lazycache` function to `__all__`.
+* Use `dict.clear` to clear the cache.
+* Refactoring `getline` function and `checkcache` function.