@@ -1,5 +1,4 @@
1-importre, unicodedata, sys, sets
2-fromsetsimportSet
1+importre, unicodedata, sys
3243ifsys.maxunicode==65535:
54raiseRuntimeError, "need UCS-4 Python"
@@ -40,10 +39,10 @@ def compact_set(l):
4039single.append(prev)
4140tuple=" + ".join(["range(%d,%d)"%tfortintuple])
4241ifnotsingle:
43-return"sets.Set(%s)"%tuple
42+return"set(%s)"%tuple
4443ifnottuple:
45-return"sets.Set(%s)"%repr(single)
46-return"sets.Set(%s + %s)"% (repr(single),tuple)
44+return"set(%s)"%repr(single)
45+return"set(%s + %s)"% (repr(single),tuple)
47464847############## Read the tables in the RFC #######################
4948@@ -114,7 +113,7 @@ def compact_set(l):
114113and mappings, for which a mapping function is provided.
115114\"\"\"
116115117-import unicodedata, sets
116+import unicodedata
118117"""
119118120119print"assert unicodedata.unidata_version == %s"%repr(unicodedata.unidata_version)
@@ -124,14 +123,14 @@ def compact_set(l):
124123name, table=tables[0]
125124deltables[0]
126125assertname=="A.1"
127-table=Set(table.keys())
128-Cn=Set(gen_category(["Cn"]))
126+table=set(table.keys())
127+Cn=set(gen_category(["Cn"]))
129128130129# FDD0..FDEF are process internal codes
131-Cn-=Set(range(0xFDD0, 0xFDF0))
130+Cn-=set(range(0xFDD0, 0xFDF0))
132131# not a character
133-Cn-=Set(range(0xFFFE, 0x110000, 0x10000))
134-Cn-=Set(range(0xFFFF, 0x110000, 0x10000))
132+Cn-=set(range(0xFFFE, 0x110000, 0x10000))
133+Cn-=set(range(0xFFFF, 0x110000, 0x10000))
135134136135# assert table == Cn
137136@@ -251,8 +250,8 @@ def in_table_c11(code):
251250deltables[0]
252251assertname=="C.1.2"
253252254-# table = Set(table.keys())
255-# Zs = Set(gen_category(["Zs"])) - Set([0x20])
253+# table = set(table.keys())
254+# Zs = set(gen_category(["Zs"])) - set([0x20])
256255# assert Zs == table
257256258257print"""
@@ -268,9 +267,9 @@ def in_table_c11_c12(code):
268267deltables[0]
269268assertname=="C.2.1"
270269271-Cc=Set(gen_category(["Cc"]))
272-Cc_ascii=Cc&Set(range(128))
273-table_c21=Set(table_c21.keys())
270+Cc=set(gen_category(["Cc"]))
271+Cc_ascii=Cc&set(range(128))
272+table_c21=set(table_c21.keys())
274273assertCc_ascii==table_c21
275274276275print"""
@@ -285,7 +284,7 @@ def in_table_c21(code):
285284assertname=="C.2.2"
286285287286Cc_nonascii=Cc-Cc_ascii
288-table_c22=Set(table_c22.keys())
287+table_c22=set(table_c22.keys())
289288assertlen(Cc_nonascii-table_c22) ==0
290289291290specials=list(table_c22-Cc_nonascii)
@@ -308,8 +307,8 @@ def in_table_c21_c22(code):
308307deltables[0]
309308assertname=="C.3"
310309311-Co=Set(gen_category(["Co"]))
312-assertSet(table.keys()) ==Co
310+Co=set(gen_category(["Co"]))
311+assertset(table.keys()) ==Co
313312314313print"""
315314def in_table_c3(code):
@@ -322,10 +321,10 @@ def in_table_c3(code):
322321deltables[0]
323322assertname=="C.4"
324323325-nonchar=Set(range(0xFDD0,0xFDF0) +
324+nonchar=set(range(0xFDD0,0xFDF0) +
326325range(0xFFFE,0x110000,0x10000) +
327326range(0xFFFF,0x110000,0x10000))
328-table=Set(table.keys())
327+table=set(table.keys())
329328asserttable==nonchar
330329331330print"""
@@ -341,8 +340,8 @@ def in_table_c4(code):
341340deltables[0]
342341assertname=="C.5"
343342344-Cs=Set(gen_category(["Cs"]))
345-assertSet(table.keys()) ==Cs
343+Cs=set(gen_category(["Cs"]))
344+assertset(table.keys()) ==Cs
346345347346print"""
348347def in_table_c5(code):
@@ -410,8 +409,8 @@ def in_table_c9(code):
410409deltables[0]
411410assertname=="D.1"
412411413-RandAL=Set(gen_bidirectional(["R","AL"]))
414-assertSet(table.keys()) ==RandAL
412+RandAL=set(gen_bidirectional(["R","AL"]))
413+assertset(table.keys()) ==RandAL
415414416415print"""
417416def in_table_d1(code):
@@ -423,8 +422,8 @@ def in_table_d1(code):
423422deltables[0]
424423assertname=="D.2"
425424426-L=Set(gen_bidirectional(["L"]))
427-assertSet(table.keys()) ==L
425+L=set(gen_bidirectional(["L"]))
426+assertset(table.keys()) ==L
428427429428print"""
430429def in_table_d2(code):