[3.8] bpo-25872: Fix KeyError using linecache from multiple threads (pythonGH-18007)

mgraczyk · akuchling · commit 45240f64e140 · 2020-05-14T13:26:44.000-04:00
The crash that this fixes occurs when using traceback and other modules from multiple threads; del cache[filename] can raise a KeyError. (cherry picked from commit d72ea60) Co-authored-by: Michael Graczyk <mgraczyk@users.noreply.github.com>
diff --git a/Lib/linecache.py b/Lib/linecache.py
@@ -73,10 +73,10 @@ def checkcache(filename=None):
         try:
             stat = os.stat(fullname)
         except OSError:
-            del cache[filename]
+            cache.pop(filename, None)
             continue
         if size != stat.st_size or mtime != stat.st_mtime:
-            del cache[filename]
+            cache.pop(filename, None)
 
 
 def updatecache(filename, module_globals=None):
@@ -86,7 +86,7 @@ def updatecache(filename, module_globals=None):
 
     if filename in cache:
         if len(cache[filename]) != 1:
-            del cache[filename]
+            cache.pop(filename, None)
     if not filename or (filename.startswith('<') and filename.endswith('>')):
         return []
 
