[Python-checkins] python/dist/src/Tools/unicode mkstringprep.py, 1.1, 1.2 (original) (raw)

arigo at users.sourceforge.net arigo at users.sourceforge.net
Wed May 19 15:10:22 EDT 2004

Update of /cvsroot/python/python/dist/src/Tools/unicode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11125/Tools/unicode

Modified Files: mkstringprep.py Log Message: Applying SF patch #949329 on behalf of Raymond Hettinger.

Index: mkstringprep.py

RCS file: /cvsroot/python/python/dist/src/Tools/unicode/mkstringprep.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mkstringprep.py 18 Apr 2003 10:39:54 -0000 1.1 --- mkstringprep.py 19 May 2004 19:10:18 -0000 1.2

*** 1,4 **** ! import re, unicodedata, sys, sets ! from sets import Set

if sys.maxunicode == 65535: --- 1,3 ---- ! import re, unicodedata, sys

if sys.maxunicode == 65535:

*** 41,48 **** tuple = " + ".join(["range(%d,%d)" % t for t in tuple]) if not single: ! return "sets.Set(%s)" % tuple if not tuple: ! return "sets.Set(%s)" % repr(single) ! return "sets.Set(%s + %s)" % (repr(single),tuple)

############## Read the tables in the RFC ####################### --- 40,47 ---- tuple = " + ".join(["range(%d,%d)" % t for t in tuple]) if not single: ! return "set(%s)" % tuple if not tuple: ! return "set(%s)" % repr(single) ! return "set(%s + %s)" % (repr(single),tuple)

############## Read the tables in the RFC #######################

*** 115,119 **** """

! import unicodedata, sets """

--- 114,118 ---- """

! import unicodedata """

*** 125,136 **** del tables[0] assert name == "A.1" ! table = Set(table.keys()) ! Cn = Set(gen_category(["Cn"]))

FDD0..FDEF are process internal codes

! Cn -= Set(range(0xFDD0, 0xFDF0))

not a character

! Cn -= Set(range(0xFFFE, 0x110000, 0x10000)) ! Cn -= Set(range(0xFFFF, 0x110000, 0x10000))

assert table == Cn

--- 124,135 ---- del tables[0] assert name == "A.1" ! table = set(table.keys()) ! Cn = set(gen_category(["Cn"]))

FDD0..FDEF are process internal codes

! Cn -= set(range(0xFDD0, 0xFDF0))

not a character

! Cn -= set(range(0xFFFE, 0x110000, 0x10000)) ! Cn -= set(range(0xFFFF, 0x110000, 0x10000))

assert table == Cn

*** 252,257 **** assert name == "C.1.2"

! # table = Set(table.keys()) ! # Zs = Set(gen_category(["Zs"])) - Set([0x20])

assert Zs == table

--- 251,256 ---- assert name == "C.1.2"

! # table = set(table.keys()) ! # Zs = set(gen_category(["Zs"])) - set([0x20])

assert Zs == table

*** 269,275 **** assert name == "C.2.1"

! Cc = Set(gen_category(["Cc"])) ! Cc_ascii = Cc & Set(range(128)) ! table_c21 = Set(table_c21.keys()) assert Cc_ascii == table_c21

--- 268,274 ---- assert name == "C.2.1"

! Cc = set(gen_category(["Cc"])) ! Cc_ascii = Cc & set(range(128)) ! table_c21 = set(table_c21.keys()) assert Cc_ascii == table_c21

*** 286,290 ****

Cc_nonascii = Cc - Cc_ascii ! table_c22 = Set(table_c22.keys()) assert len(Cc_nonascii - table_c22) == 0

--- 285,289 ----

Cc_nonascii = Cc - Cc_ascii ! table_c22 = set(table_c22.keys()) assert len(Cc_nonascii - table_c22) == 0

*** 309,314 **** assert name == "C.3"

! Co = Set(gen_category(["Co"])) ! assert Set(table.keys()) == Co

print """ --- 308,313 ---- assert name == "C.3"

! Co = set(gen_category(["Co"])) ! assert set(table.keys()) == Co

print """

*** 323,330 **** assert name == "C.4"

! nonchar = Set(range(0xFDD0,0xFDF0) + range(0xFFFE,0x110000,0x10000) + range(0xFFFF,0x110000,0x10000)) ! table = Set(table.keys()) assert table == nonchar

--- 322,329 ---- assert name == "C.4"

! nonchar = set(range(0xFDD0,0xFDF0) + range(0xFFFE,0x110000,0x10000) + range(0xFFFF,0x110000,0x10000)) ! table = set(table.keys()) assert table == nonchar

*** 342,347 **** assert name == "C.5"

! Cs = Set(gen_category(["Cs"])) ! assert Set(table.keys()) == Cs

print """ --- 341,346 ---- assert name == "C.5"

! Cs = set(gen_category(["Cs"])) ! assert set(table.keys()) == Cs

print """

*** 411,416 **** assert name == "D.1"

! RandAL = Set(gen_bidirectional(["R","AL"])) ! assert Set(table.keys()) == RandAL

print """ --- 410,415 ---- assert name == "D.1"

! RandAL = set(gen_bidirectional(["R","AL"])) ! assert set(table.keys()) == RandAL

print """

*** 424,429 **** assert name == "D.2"

! L = Set(gen_bidirectional(["L"])) ! assert Set(table.keys()) == L

print """ --- 423,428 ---- assert name == "D.2"

! L = set(gen_bidirectional(["L"])) ! assert set(table.keys()) == L

print """

More information about the Python-checkins mailing list