changeset: 78375:67d36e8ddcfc
user: Victor Stinner <victor.stinner@gmail.com>
date: Wed Aug 01 20:12:51 2012 +0200
files: Tools/scripts/findnocoding.py Tools/scripts/pysource.py
description:
Fix findnocoding.p and pysource.py scripts
I suppose that these scripts didn't work since Python 3.0.
diff -r 3edc71ed19e7 -r 67d36e8ddcfc Tools/scripts/findnocoding.py
--- a/Tools/scripts/findnocoding.py	Wed Aug 01 20:03:49 2012 +0200
+++ b/Tools/scripts/findnocoding.py	Wed Aug 01 20:12:51 2012 +0200
@@ -32,7 +32,7 @@
 "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 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
diff -r 3edc71ed19e7 -r 67d36e8ddcfc Tools/scripts/pysource.py
--- a/Tools/scripts/pysource.py	Wed Aug 01 20:03:49 2012 +0200
+++ b/Tools/scripts/pysource.py	Wed Aug 01 20:12:51 2012 +0200
@@ -22,7 +22,7 @@
 
 import os, re
 
-binary_re = re.compile('[\x00-\x08\x0E-\x1F\x7F]')
+binary_re = re.compile(br'[\x00-\x08\x0E-\x1F\x7F]')
 
 debug = False
 
@@ -42,7 +42,7 @@
 return None
 
 try:
- return open(fullpath)
+ return open(fullpath, "rb")
 except IOError as err: # Access denied, or a special file - ignore it
 print_debug("%s: access denied: %s" % (fullpath, err))
 return None
@@ -65,7 +65,7 @@
 
 if fullpath.endswith(".py") or fullpath.endswith(".pyw"):
 return True
- elif "python" in line:
+ elif b"python" in line:
 # disguised Python script (e.g. CGI)
 return True
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/67d36e8ddcfc">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/67d36e8ddcfc" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>