Changeset 391 for python/trunk/Tools/unicode/gencodec.py

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:

• . (modified) (1 prop)
• Tools/unicode/gencodec.py (modified) (6 diffs)

python/trunk/Tools/unicode/gencodec.py

@@ -41 +41 @@
                    '(#.+)?')
 
-def parsecodes(codes,
-               len=len, filter=filter,range=range):
+def parsecodes(codes, len=len, range=range):
 
     """ Converts code combinations to either a single code integer
@@ -63 +62 @@
         except ValueError:
             l[i] = None
-    l = filter(lambda x: x is not None, l)
+    l = [x for x in l if x is not None]
     if len(l) == 1:
         return l[0]
@@ -139 +138 @@
     l = []
     append = l.append
-    if map.has_key("IDENTITY"):
+    if "IDENTITY" in map:
         append("%s = codecs.make_identity_dict(range(%d))" %
                (varname, map["IDENTITY"]))
@@ -151 +150 @@
         identity = 0
 
-    mappings = map.items()
-    mappings.sort()
+    mappings = sorted(map.items())
     i = 0
     key_precision, value_precision = precisions
@@ -200 +198 @@
 
     # Analyze map and create table dict
-    mappings = map.items()
-    mappings.sort()
+    mappings = sorted(map.items())
     table = {}
     maxkey = 0
-    if map.has_key('IDENTITY'):
+    if 'IDENTITY' in map:
         for key in range(256):
             table[key] = (key, '')
@@ -422 +419 @@
     import sys
     if 1:
-        apply(convertdir,tuple(sys.argv[1:]))
-    else:
-        apply(rewritepythondir,tuple(sys.argv[1:]))
+        convertdir(*sys.argv[1:])
+    else:
+        rewritepythondir(*sys.argv[1:])