mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 05:35:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix findnocoding.p and pysource.py scripts

Browse source 
I suppose that these scripts didn't work since Python 3.0.
This commit is contained in:
Victor Stinner 2012-08-01 20:12:51 +02:00
parent 7c7ea62e6c
commit 98516a6930
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Tools/scripts/findnocoding.py
View file

@ -32,7 +32,7 @@ except ImportError:
"no sophisticated Python source file search will be done.", file=sys.stderr)
decl_re = re.compile(r"coding[=:]\s*([-\w.]+)")
decl_re = re.compile(rb"coding[=:]\s*([-\w.]+)")
def get_declaration(line):
match = decl_re.search(line)
@ -50,21 +50,21 @@ def has_correct_encoding(text, codec):
def needs_declaration(fullpath):
try:
infile = open(fullpath)
infile = open(fullpath, 'rb')
except IOError: # Oops, the file was removed - ignore it
return None
line1 = infile.readline()
line2 = infile.readline()
with infile:
line1 = infile.readline()
line2 = infile.readline()
if get_declaration(line1) or get_declaration(line2):
# the file does have an encoding declaration, so trust it
infile.close()
return False
if get_declaration(line1) or get_declaration(line2):
# the file does have an encoding declaration, so trust it
infile.close()
return False
# check the whole file for non utf-8 characters
rest = infile.read()
infile.close()
# check the whole file for non utf-8 characters
rest = infile.read()
if has_correct_encoding(line1+line2+rest, "utf-8"):
return False