Skip to content

Commit ba91b9f

Browse files
arigoarigo
committed
Applying SF patch #949329 on behalf of Raymond Hettinger.
1 parent 16581c8 commit ba91b9f

2 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎Lib/stringprep.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
and mappings, for which a mapping function is provided.
66
"""
77

8-
import unicodedata, sets
8+
import unicodedata
99

1010
assert unicodedata.unidata_version == '3.2.0'
1111

@@ -16,7 +16,7 @@ def in_table_a1(code):
1616
return (c & 0xFFFF) not in (0xFFFE, 0xFFFF)
1717

1818

19-
b1_set = sets.Set([173, 847, 6150, 6155, 6156, 6157, 8203, 8204, 8205, 8288, 65279] + range(65024,65040))
19+
b1_set = set([173, 847, 6150, 6155, 6156, 6157, 8203, 8204, 8205, 8288, 65279] + range(65024,65040))
2020
def in_table_b1(code):
2121
return ord(code) in b1_set
2222

@@ -217,7 +217,7 @@ def in_table_c11_c12(code):
217217
def in_table_c21(code):
218218
return ord(code) < 128 and unicodedata.category(code) == "Cc"
219219

220-
c22_specials = sets.Set([1757, 1807, 6158, 8204, 8205, 8232, 8233, 65279] + range(8288,8292) + range(8298,8304) + range(65529,65533) + range(119155,119163))
220+
c22_specials = set([1757, 1807, 6158, 8204, 8205, 8232, 8233, 65279] + range(8288,8292) + range(8298,8304) + range(65529,65533) + range(119155,119163))
221221
def in_table_c22(code):
222222
c = ord(code)
223223
if c < 128: return False
@@ -244,22 +244,22 @@ def in_table_c5(code):
244244
return unicodedata.category(code) == "Cs"
245245

246246

247-
c6_set = sets.Set(range(65529,65534))
247+
c6_set = set(range(65529,65534))
248248
def in_table_c6(code):
249249
return ord(code) in c6_set
250250

251251

252-
c7_set = sets.Set(range(12272,12284))
252+
c7_set = set(range(12272,12284))
253253
def in_table_c7(code):
254254
return ord(code) in c7_set
255255

256256

257-
c8_set = sets.Set([832, 833, 8206, 8207] + range(8234,8239) + range(8298,8304))
257+
c8_set = set([832, 833, 8206, 8207] + range(8234,8239) + range(8298,8304))
258258
def in_table_c8(code):
259259
return ord(code) in c8_set
260260

261261

262-
c9_set = sets.Set([917505] + range(917536,917632))
262+
c9_set = set([917505] + range(917536,917632))
263263
def in_table_c9(code):
264264
return ord(code) in c9_set
265265

@@ -270,3 +270,4 @@ def in_table_d1(code):
270270

271271
def in_table_d2(code):
272272
return unicodedata.bidirectional(code) == "L"
273+

‎Tools/unicode/mkstringprep.py‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import re, unicodedata, sys, sets
2-
from sets import Set
1+
import re, unicodedata, sys
32

43
if sys.maxunicode == 65535:
54
raise RuntimeError, "need UCS-4 Python"
@@ -40,10 +39,10 @@ def compact_set(l):
4039
single.append(prev)
4140
tuple = " + ".join(["range(%d,%d)" % t for t in tuple])
4241
if not single:
43-
return "sets.Set(%s)" % tuple
42+
return "set(%s)" % tuple
4443
if not tuple:
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)
4746

4847
############## Read the tables in the RFC #######################
4948

@@ -114,7 +113,7 @@ def compact_set(l):
114113
and mappings, for which a mapping function is provided.
115114
\"\"\"
116115
117-
import unicodedata, sets
116+
import unicodedata
118117
"""
119118

120119
print "assert unicodedata.unidata_version == %s" % repr(unicodedata.unidata_version)
@@ -124,14 +123,14 @@ def compact_set(l):
124123
name, table = tables[0]
125124
del tables[0]
126125
assert name == "A.1"
127-
table = Set(table.keys())
128-
Cn = Set(gen_category(["Cn"]))
126+
table = set(table.keys())
127+
Cn = set(gen_category(["Cn"]))
129128

130129
# 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))
135134

136135
# assert table == Cn
137136

@@ -251,8 +250,8 @@ def in_table_c11(code):
251250
del tables[0]
252251
assert name == "C.1.2"
253252

254-
# 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
257256

258257
print """
@@ -268,9 +267,9 @@ def in_table_c11_c12(code):
268267
del tables[0]
269268
assert name == "C.2.1"
270269

271-
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())
274273
assert Cc_ascii == table_c21
275274

276275
print """
@@ -285,7 +284,7 @@ def in_table_c21(code):
285284
assert name == "C.2.2"
286285

287286
Cc_nonascii = Cc - Cc_ascii
288-
table_c22 = Set(table_c22.keys())
287+
table_c22 = set(table_c22.keys())
289288
assert len(Cc_nonascii - table_c22) == 0
290289

291290
specials = list(table_c22 - Cc_nonascii)
@@ -308,8 +307,8 @@ def in_table_c21_c22(code):
308307
del tables[0]
309308
assert name == "C.3"
310309

311-
Co = Set(gen_category(["Co"]))
312-
assert Set(table.keys()) == Co
310+
Co = set(gen_category(["Co"]))
311+
assert set(table.keys()) == Co
313312

314313
print """
315314
def in_table_c3(code):
@@ -322,10 +321,10 @@ def in_table_c3(code):
322321
del tables[0]
323322
assert name == "C.4"
324323

325-
nonchar = Set(range(0xFDD0,0xFDF0) +
324+
nonchar = set(range(0xFDD0,0xFDF0) +
326325
range(0xFFFE,0x110000,0x10000) +
327326
range(0xFFFF,0x110000,0x10000))
328-
table = Set(table.keys())
327+
table = set(table.keys())
329328
assert table == nonchar
330329

331330
print """
@@ -341,8 +340,8 @@ def in_table_c4(code):
341340
del tables[0]
342341
assert name == "C.5"
343342

344-
Cs = Set(gen_category(["Cs"]))
345-
assert Set(table.keys()) == Cs
343+
Cs = set(gen_category(["Cs"]))
344+
assert set(table.keys()) == Cs
346345

347346
print """
348347
def in_table_c5(code):
@@ -410,8 +409,8 @@ def in_table_c9(code):
410409
del tables[0]
411410
assert name == "D.1"
412411

413-
RandAL = Set(gen_bidirectional(["R","AL"]))
414-
assert Set(table.keys()) == RandAL
412+
RandAL = set(gen_bidirectional(["R","AL"]))
413+
assert set(table.keys()) == RandAL
415414

416415
print """
417416
def in_table_d1(code):
@@ -423,8 +422,8 @@ def in_table_d1(code):
423422
del tables[0]
424423
assert name == "D.2"
425424

426-
L = Set(gen_bidirectional(["L"]))
427-
assert Set(table.keys()) == L
425+
L = set(gen_bidirectional(["L"]))
426+
assert set(table.keys()) == L
428427

429428
print """
430429
def in_table_d2(code):

0 commit comments

Comments
 (0)