Ignore:
Timestamp:
Mar 19, 2014, 11:31:01 PM (11 years ago)
Author:
dmik
Message:

python: Merge vendor 2.7.6 to trunk.

Location:
python/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • python/trunk

  • python/trunk/Tools/unicode/mkstringprep.py

    r2 r391  
    22
    33if sys.maxunicode == 65535:
    4     raise RuntimeError, "need UCS-4 Python"
     4    raise RuntimeError("need UCS-4 Python")
    55
    66def gen_category(cats):
    … …  
    6464        if m.group(1) == "Start":
    6565            if curname:
    66                 raise "Double Start",(curname, l)
     66                raise RuntimeError("Double Start", (curname, l))
    6767            curname = m.group(2)
    6868            table = {}
    … …  
    7171        else:
    7272            if not curname:
    73                 raise "End without start", l
     73                raise RuntimeError("End without start", l)
    7474            curname = None
    7575            continue
    … …  
    8888                start, end = fields
    8989            except ValueError:
    90                 raise "Unpacking problem", l
     90                raise RuntimeError("Unpacking problem", l)
    9191        else:
    9292            start = end = fields[0]
    … …  
    147147del tables[0]
    148148assert name == "B.1"
    149 table = table.keys()
    150 table.sort()
     149table = sorted(table.keys())
    151150print """
    152151b1_set = """ + compact_set(table) + """
    … …  
    178177        b3_exceptions[k] = u"".join(map(unichr,v))
    179178
    180 b3 = b3_exceptions.items()
    181 b3.sort()
     179b3 = sorted(b3_exceptions.items())
    182180
    183181print """
    … …  
    354352assert name == "C.6"
    355353
    356 table = table.keys()
    357 table.sort()
     354table = sorted(table.keys())
    358355
    359356print """
    … …  
    368365assert name == "C.7"
    369366
    370 table = table.keys()
    371 table.sort()
     367table = sorted(table.keys())
    372368
    373369print """
    … …  
    382378assert name == "C.8"
    383379
    384 table = table.keys()
    385 table.sort()
     380table = sorted(table.keys())
    386381
    387382print """
    … …  
    396391assert name == "C.9"
    397392
    398 table = table.keys()
    399 table.sort()
     393table = sorted(table.keys())
    400394
    401395print """
Note: See TracChangeset for help on using the changeset viewer.