From 33f3124fb1799b2be9fb6907d33c2d1c2a6b3129 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 9 May 2007 23:24:46 +0000 Subject: [PATCH] Support PEP-263-style coding declarations. Default to UTF-8 per PEP-3120. --- Lib/linecache.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Lib/linecache.py b/Lib/linecache.py index 0501a107880..9a16acd2599 100644 --- a/Lib/linecache.py +++ b/Lib/linecache.py @@ -7,6 +7,7 @@ that name. import sys import os +import re __all__ = ["getline", "clearcache", "checkcache"] @@ -131,6 +132,16 @@ def updatecache(filename, module_globals=None): except IOError as msg: ## print '*** Cannot open', fullname, ':', msg return [] + coding = "utf-8" + for line in lines[:2]: + m = re.search(r"coding[:=]\s*([-\w.]+)", line) + if m: + coding = m.group(1) + break + try: + lines = [unicode(line, coding) for line in lines] + except UnicodeError: + pass # Hope for the best size, mtime = stat.st_size, stat.st_mtime cache[filename] = size, mtime, lines, fullname return lines