linecache.py was still struggling with unicode vs. non-unicode.

diff --git a/Lib/linecache.py b/Lib/linecache.py
index 9a16acd2599596af87e4d654c26c41823c91a166..77e3ab7197061d877b43c79c4eda7d1be7f1f0a3 100644 (file)
--- a/Lib/linecache.py
+++ b/Lib/linecache.py
@@ -139,8 +139,9 @@ def updatecache(filename, module_globals=None):
             coding = m.group(1)
             break
     try:
-        lines = [unicode(line, coding) for line in lines]
-    except UnicodeError:
+        lines = [line if isinstance(line, str) else str(line, coding)
+                 for line in lines]
+    except:
         pass  # Hope for the best
     size, mtime = stat.st_size, stat.st_mtime
     cache[filename] = size, mtime, lines, fullname