diff -r ad56dff3602f Tools/unicode/mkstringprep.py
--- a/Tools/unicode/mkstringprep.py	Tue May 28 16:27:08 2013 +0300
+++ b/Tools/unicode/mkstringprep.py	Tue May 28 20:50:10 2013 +0300
@@ -41,12 +41,13 @@
 if not single:
 return "set(%s)" % tuple
 if not tuple:
- return "set(%s)" % repr(single)
- return "set(%s + %s)" % (repr(single),tuple)
+ return "set(%r)" % (single,)
+ return "set(%r + %s)" % (single, tuple)
 
 ############## Read the tables in the RFC #######################
 
-data = open("rfc3454.txt").readlines()
+with open("rfc3454.txt") as f:
+ data = f.readlines()
 
 tables = []
 curname = None
@@ -55,8 +56,7 @@
 if not l:
 continue
 # Skip RFC page breaks
- if l.startswith("Hoffman & Blanchet") or\
- l.startswith("RFC 3454"):
+ if l.startswith(("Hoffman & Blanchet", "RFC 3454")):
 continue
 # Find start/end lines
 m = re.match("----- (Start|End) Table ([A-Z](.[0-9])+) -----", l)
@@ -116,7 +116,7 @@
 import unicodedata
 """)
 
-print("assert unicodedata.unidata_version == %s" % repr(unicodedata.unidata_version))
+print("assert unicodedata.unidata_version == %r" % (unicodedata.unidata_version,))
 
 # A.1 is the table of unassigned characters
 # XXX Plane 15 PUA is listed as unassigned in Python.
@@ -249,7 +249,7 @@
 assert name == "C.1.2"
 
 # table = set(table.keys())
-# Zs = set(gen_category(["Zs"])) - set([0x20])
+# Zs = set(gen_category(["Zs"])) - {0x20}
 # assert Zs == table
 
 print("""
</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://bugs.python.org/file30403/mkstringprep_cosmetic.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file30403/mkstringprep_cosmetic.patch" 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>