[Python-checkins] r67713 - python/branches/py3k/Lib/linecache.py

Fri Dec 12 02:33:38 CET 2008

Author: benjamin.peterson
Date: Fri Dec 12 02:33:38 2008
New Revision: 67713
Log:
reuse tokenize.detect_encoding for linecache #4016
Modified:
 python/branches/py3k/Lib/linecache.py
Modified: python/branches/py3k/Lib/linecache.py
==============================================================================

--- python/branches/py3k/Lib/linecache.py	(original)
+++ python/branches/py3k/Lib/linecache.py	Fri Dec 12 02:33:38 2008
@@ -7,7 +7,7 @@
 
 import sys
 import os
-import re
+import tokenize
 
 __all__ = ["getline", "clearcache", "checkcache"]
 
@@ -121,27 +121,11 @@
 pass
 else:
 # No luck
-## print '*** Cannot stat', filename, ':', msg
 return []
-## print("Refreshing cache for %s..." % fullname)
- try:
- fp = open(fullname, 'rU')
+ with open(fullname, 'rb') as fp:
+ coding, line = tokenize.detect_encoding(fp.readline)
+ with open(fullname, 'r', encoding=coding) as fp:
 lines = fp.readlines()
- fp.close()
- except Exception 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 = [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
 return lines
