From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Wed, 29 Sep 2010 01:31:23 +0000 (+0000)
Subject: Merged revisions 85090 via svnmerge from
X-Git-Tag: v3.1.3rc1~186
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6e4dc80201afa259e44f410f8d7247a49468b4e8;p=python

Merged revisions 85090 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85090 | victor.stinner | 2010-09-29 03:30:45 +0200 (mer., 29 sept. 2010) | 4 lines

  linecache.updatecache(): don't the lines into the cache on IOError

  Use the same behaviour than Python 2.7.
........
---

diff --git a/Lib/linecache.py b/Lib/linecache.py
index f0bb83d1d8..974b1d965a 100644
--- a/Lib/linecache.py
+++ b/Lib/linecache.py
@@ -128,7 +128,7 @@ def updatecache(filename, module_globals=None):
         with open(fullname, 'r', encoding=coding) as fp:
             lines = fp.readlines()
     except IOError:
-        lines = []
+        return []
     if lines and not lines[-1].endswith('\n'):
         lines[-1] += '\n'
     size, mtime = stat.st_size, stat.st_mtime