Patch #1359618: Speed-up charmap encoder.
diff --git a/Lib/encodings/cp1006.py b/Lib/encodings/cp1006.py
index 7829969..584dd31 100644
--- a/Lib/encodings/cp1006.py
+++ b/Lib/encodings/cp1006.py
@@ -9,14 +9,14 @@
class Codec(codecs.Codec):
def encode(self,input,errors='strict'):
- return codecs.charmap_encode(input,errors,encoding_map)
+ return codecs.charmap_encode(input,errors,encoding_table)
def decode(self,input,errors='strict'):
return codecs.charmap_decode(input,errors,decoding_table)
class IncrementalEncoder(codecs.IncrementalEncoder):
def encode(self, input, final=False):
- return codecs.charmap_encode(input,self.errors,encoding_map)[0]
+ return codecs.charmap_encode(input,self.errors,encoding_table)[0]
class IncrementalDecoder(codecs.IncrementalDecoder):
def decode(self, input, final=False):
@@ -303,262 +303,6 @@
u'\ufe7d' # 0xFF -> ARABIC SHADDA MEDIAL FORM
)
-### Encoding Map
+### Encoding table
+encoding_table=codecs.charmap_build(decoding_table)
-encoding_map = {
- 0x0000: 0x00, # NULL
- 0x0001: 0x01, # START OF HEADING
- 0x0002: 0x02, # START OF TEXT
- 0x0003: 0x03, # END OF TEXT
- 0x0004: 0x04, # END OF TRANSMISSION
- 0x0005: 0x05, # ENQUIRY
- 0x0006: 0x06, # ACKNOWLEDGE
- 0x0007: 0x07, # BELL
- 0x0008: 0x08, # BACKSPACE
- 0x0009: 0x09, # HORIZONTAL TABULATION
- 0x000A: 0x0A, # LINE FEED
- 0x000B: 0x0B, # VERTICAL TABULATION
- 0x000C: 0x0C, # FORM FEED
- 0x000D: 0x0D, # CARRIAGE RETURN
- 0x000E: 0x0E, # SHIFT OUT
- 0x000F: 0x0F, # SHIFT IN
- 0x0010: 0x10, # DATA LINK ESCAPE
- 0x0011: 0x11, # DEVICE CONTROL ONE
- 0x0012: 0x12, # DEVICE CONTROL TWO
- 0x0013: 0x13, # DEVICE CONTROL THREE
- 0x0014: 0x14, # DEVICE CONTROL FOUR
- 0x0015: 0x15, # NEGATIVE ACKNOWLEDGE
- 0x0016: 0x16, # SYNCHRONOUS IDLE
- 0x0017: 0x17, # END OF TRANSMISSION BLOCK
- 0x0018: 0x18, # CANCEL
- 0x0019: 0x19, # END OF MEDIUM
- 0x001A: 0x1A, # SUBSTITUTE
- 0x001B: 0x1B, # ESCAPE
- 0x001C: 0x1C, # FILE SEPARATOR
- 0x001D: 0x1D, # GROUP SEPARATOR
- 0x001E: 0x1E, # RECORD SEPARATOR
- 0x001F: 0x1F, # UNIT SEPARATOR
- 0x0020: 0x20, # SPACE
- 0x0021: 0x21, # EXCLAMATION MARK
- 0x0022: 0x22, # QUOTATION MARK
- 0x0023: 0x23, # NUMBER SIGN
- 0x0024: 0x24, # DOLLAR SIGN
- 0x0025: 0x25, # PERCENT SIGN
- 0x0026: 0x26, # AMPERSAND
- 0x0027: 0x27, # APOSTROPHE
- 0x0028: 0x28, # LEFT PARENTHESIS
- 0x0029: 0x29, # RIGHT PARENTHESIS
- 0x002A: 0x2A, # ASTERISK
- 0x002B: 0x2B, # PLUS SIGN
- 0x002C: 0x2C, # COMMA
- 0x002D: 0x2D, # HYPHEN-MINUS
- 0x002E: 0x2E, # FULL STOP
- 0x002F: 0x2F, # SOLIDUS
- 0x0030: 0x30, # DIGIT ZERO
- 0x0031: 0x31, # DIGIT ONE
- 0x0032: 0x32, # DIGIT TWO
- 0x0033: 0x33, # DIGIT THREE
- 0x0034: 0x34, # DIGIT FOUR
- 0x0035: 0x35, # DIGIT FIVE
- 0x0036: 0x36, # DIGIT SIX
- 0x0037: 0x37, # DIGIT SEVEN
- 0x0038: 0x38, # DIGIT EIGHT
- 0x0039: 0x39, # DIGIT NINE
- 0x003A: 0x3A, # COLON
- 0x003B: 0x3B, # SEMICOLON
- 0x003C: 0x3C, # LESS-THAN SIGN
- 0x003D: 0x3D, # EQUALS SIGN
- 0x003E: 0x3E, # GREATER-THAN SIGN
- 0x003F: 0x3F, # QUESTION MARK
- 0x0040: 0x40, # COMMERCIAL AT
- 0x0041: 0x41, # LATIN CAPITAL LETTER A
- 0x0042: 0x42, # LATIN CAPITAL LETTER B
- 0x0043: 0x43, # LATIN CAPITAL LETTER C
- 0x0044: 0x44, # LATIN CAPITAL LETTER D
- 0x0045: 0x45, # LATIN CAPITAL LETTER E
- 0x0046: 0x46, # LATIN CAPITAL LETTER F
- 0x0047: 0x47, # LATIN CAPITAL LETTER G
- 0x0048: 0x48, # LATIN CAPITAL LETTER H
- 0x0049: 0x49, # LATIN CAPITAL LETTER I
- 0x004A: 0x4A, # LATIN CAPITAL LETTER J
- 0x004B: 0x4B, # LATIN CAPITAL LETTER K
- 0x004C: 0x4C, # LATIN CAPITAL LETTER L
- 0x004D: 0x4D, # LATIN CAPITAL LETTER M
- 0x004E: 0x4E, # LATIN CAPITAL LETTER N
- 0x004F: 0x4F, # LATIN CAPITAL LETTER O
- 0x0050: 0x50, # LATIN CAPITAL LETTER P
- 0x0051: 0x51, # LATIN CAPITAL LETTER Q
- 0x0052: 0x52, # LATIN CAPITAL LETTER R
- 0x0053: 0x53, # LATIN CAPITAL LETTER S
- 0x0054: 0x54, # LATIN CAPITAL LETTER T
- 0x0055: 0x55, # LATIN CAPITAL LETTER U
- 0x0056: 0x56, # LATIN CAPITAL LETTER V
- 0x0057: 0x57, # LATIN CAPITAL LETTER W
- 0x0058: 0x58, # LATIN CAPITAL LETTER X
- 0x0059: 0x59, # LATIN CAPITAL LETTER Y
- 0x005A: 0x5A, # LATIN CAPITAL LETTER Z
- 0x005B: 0x5B, # LEFT SQUARE BRACKET
- 0x005C: 0x5C, # REVERSE SOLIDUS
- 0x005D: 0x5D, # RIGHT SQUARE BRACKET
- 0x005E: 0x5E, # CIRCUMFLEX ACCENT
- 0x005F: 0x5F, # LOW LINE
- 0x0060: 0x60, # GRAVE ACCENT
- 0x0061: 0x61, # LATIN SMALL LETTER A
- 0x0062: 0x62, # LATIN SMALL LETTER B
- 0x0063: 0x63, # LATIN SMALL LETTER C
- 0x0064: 0x64, # LATIN SMALL LETTER D
- 0x0065: 0x65, # LATIN SMALL LETTER E
- 0x0066: 0x66, # LATIN SMALL LETTER F
- 0x0067: 0x67, # LATIN SMALL LETTER G
- 0x0068: 0x68, # LATIN SMALL LETTER H
- 0x0069: 0x69, # LATIN SMALL LETTER I
- 0x006A: 0x6A, # LATIN SMALL LETTER J
- 0x006B: 0x6B, # LATIN SMALL LETTER K
- 0x006C: 0x6C, # LATIN SMALL LETTER L
- 0x006D: 0x6D, # LATIN SMALL LETTER M
- 0x006E: 0x6E, # LATIN SMALL LETTER N
- 0x006F: 0x6F, # LATIN SMALL LETTER O
- 0x0070: 0x70, # LATIN SMALL LETTER P
- 0x0071: 0x71, # LATIN SMALL LETTER Q
- 0x0072: 0x72, # LATIN SMALL LETTER R
- 0x0073: 0x73, # LATIN SMALL LETTER S
- 0x0074: 0x74, # LATIN SMALL LETTER T
- 0x0075: 0x75, # LATIN SMALL LETTER U
- 0x0076: 0x76, # LATIN SMALL LETTER V
- 0x0077: 0x77, # LATIN SMALL LETTER W
- 0x0078: 0x78, # LATIN SMALL LETTER X
- 0x0079: 0x79, # LATIN SMALL LETTER Y
- 0x007A: 0x7A, # LATIN SMALL LETTER Z
- 0x007B: 0x7B, # LEFT CURLY BRACKET
- 0x007C: 0x7C, # VERTICAL LINE
- 0x007D: 0x7D, # RIGHT CURLY BRACKET
- 0x007E: 0x7E, # TILDE
- 0x007F: 0x7F, # DELETE
- 0x0080: 0x80, # <control>
- 0x0081: 0x81, # <control>
- 0x0082: 0x82, # <control>
- 0x0083: 0x83, # <control>
- 0x0084: 0x84, # <control>
- 0x0085: 0x85, # <control>
- 0x0086: 0x86, # <control>
- 0x0087: 0x87, # <control>
- 0x0088: 0x88, # <control>
- 0x0089: 0x89, # <control>
- 0x008A: 0x8A, # <control>
- 0x008B: 0x8B, # <control>
- 0x008C: 0x8C, # <control>
- 0x008D: 0x8D, # <control>
- 0x008E: 0x8E, # <control>
- 0x008F: 0x8F, # <control>
- 0x0090: 0x90, # <control>
- 0x0091: 0x91, # <control>
- 0x0092: 0x92, # <control>
- 0x0093: 0x93, # <control>
- 0x0094: 0x94, # <control>
- 0x0095: 0x95, # <control>
- 0x0096: 0x96, # <control>
- 0x0097: 0x97, # <control>
- 0x0098: 0x98, # <control>
- 0x0099: 0x99, # <control>
- 0x009A: 0x9A, # <control>
- 0x009B: 0x9B, # <control>
- 0x009C: 0x9C, # <control>
- 0x009D: 0x9D, # <control>
- 0x009E: 0x9E, # <control>
- 0x009F: 0x9F, # <control>
- 0x00A0: 0xA0, # NO-BREAK SPACE
- 0x00AD: 0xAD, # SOFT HYPHEN
- 0x060C: 0xAB, # ARABIC COMMA
- 0x061B: 0xAC, # ARABIC SEMICOLON
- 0x061F: 0xAE, # ARABIC QUESTION MARK
- 0x06F0: 0xA1, # EXTENDED ARABIC-INDIC DIGIT ZERO
- 0x06F1: 0xA2, # EXTENDED ARABIC-INDIC DIGIT ONE
- 0x06F2: 0xA3, # EXTENDED ARABIC-INDIC DIGIT TWO
- 0x06F3: 0xA4, # EXTENDED ARABIC-INDIC DIGIT THREE
- 0x06F4: 0xA5, # EXTENDED ARABIC-INDIC DIGIT FOUR
- 0x06F5: 0xA6, # EXTENDED ARABIC-INDIC DIGIT FIVE
- 0x06F6: 0xA7, # EXTENDED ARABIC-INDIC DIGIT SIX
- 0x06F7: 0xA8, # EXTENDED ARABIC-INDIC DIGIT SEVEN
- 0x06F8: 0xA9, # EXTENDED ARABIC-INDIC DIGIT EIGHT
- 0x06F9: 0xAA, # EXTENDED ARABIC-INDIC DIGIT NINE
- 0xFB56: 0xB5, # ARABIC LETTER PEH ISOLATED FORM
- 0xFB58: 0xB6, # ARABIC LETTER PEH INITIAL FORM
- 0xFB66: 0xBA, # ARABIC LETTER TTEH ISOLATED FORM
- 0xFB68: 0xBB, # ARABIC LETTER TTEH INITIAL FORM
- 0xFB7A: 0xC0, # ARABIC LETTER TCHEH ISOLATED FORM
- 0xFB7C: 0xC1, # ARABIC LETTER TCHEH INITIAL FORM
- 0xFB84: 0xC7, # ARABIC LETTER DAHAL ISOLATED FORMN
- 0xFB8A: 0xCC, # ARABIC LETTER JEH ISOLATED FORM
- 0xFB8C: 0xCA, # ARABIC LETTER RREH ISOLATED FORM
- 0xFB92: 0xE5, # ARABIC LETTER GAF ISOLATED FORM
- 0xFB94: 0xE6, # ARABIC LETTER GAF INITIAL FORM
- 0xFB9E: 0xEC, # ARABIC LETTER NOON GHUNNA ISOLATED FORM
- 0xFBA6: 0xF1, # ARABIC LETTER HEH GOAL ISOLATED FORM
- 0xFBA8: 0xF2, # ARABIC LETTER HEH GOAL INITIAL FORM
- 0xFBA9: 0xF3, # ARABIC LETTER HEH GOAL MEDIAL FORM
- 0xFBAA: 0xF4, # ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM
- 0xFBAE: 0xFD, # ARABIC LETTER YEH BARREE ISOLATED FORM
- 0xFBB0: 0xFC, # ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM
- 0xFE7C: 0xFE, # ARABIC SHADDA ISOLATED FORM
- 0xFE7D: 0xFF, # ARABIC SHADDA MEDIAL FORM
- 0xFE80: 0xF5, # ARABIC LETTER HAMZA ISOLATED FORM
- 0xFE81: 0xAF, # ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM
- 0xFE85: 0xEF, # ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM
- 0xFE89: 0xF6, # ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM
- 0xFE8A: 0xF7, # ARABIC LETTER YEH WITH HAMZA ABOVE FINAL FORM
- 0xFE8B: 0xF8, # ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM
- 0xFE8D: 0xB0, # ARABIC LETTER ALEF ISOLATED FORM
- 0xFE8E: None, # ARABIC LETTER ALEF FINAL FORM
- 0xFE8F: 0xB3, # ARABIC LETTER BEH ISOLATED FORM
- 0xFE91: 0xB4, # ARABIC LETTER BEH INITIAL FORM
- 0xFE93: 0xB7, # ARABIC LETTER TEH MARBUTA ISOLATED FORM
- 0xFE95: 0xB8, # ARABIC LETTER TEH ISOLATED FORM
- 0xFE97: 0xB9, # ARABIC LETTER TEH INITIAL FORM
- 0xFE99: 0xBC, # ARABIC LETTER THEH ISOLATED FORM
- 0xFE9B: 0xBD, # ARABIC LETTER THEH INITIAL FORM
- 0xFE9D: 0xBE, # ARABIC LETTER JEEM ISOLATED FORM
- 0xFE9F: 0xBF, # ARABIC LETTER JEEM INITIAL FORM
- 0xFEA1: 0xC2, # ARABIC LETTER HAH ISOLATED FORM
- 0xFEA3: 0xC3, # ARABIC LETTER HAH INITIAL FORM
- 0xFEA5: 0xC4, # ARABIC LETTER KHAH ISOLATED FORM
- 0xFEA7: 0xC5, # ARABIC LETTER KHAH INITIAL FORM
- 0xFEA9: 0xC6, # ARABIC LETTER DAL ISOLATED FORM
- 0xFEAB: 0xC8, # ARABIC LETTER THAL ISOLATED FORM
- 0xFEAD: 0xC9, # ARABIC LETTER REH ISOLATED FORM
- 0xFEAF: 0xCB, # ARABIC LETTER ZAIN ISOLATED FORM
- 0xFEB1: 0xCD, # ARABIC LETTER SEEN ISOLATED FORM
- 0xFEB3: 0xCE, # ARABIC LETTER SEEN INITIAL FORM
- 0xFEB5: 0xCF, # ARABIC LETTER SHEEN ISOLATED FORM
- 0xFEB7: 0xD0, # ARABIC LETTER SHEEN INITIAL FORM
- 0xFEB9: 0xD1, # ARABIC LETTER SAD ISOLATED FORM
- 0xFEBB: 0xD2, # ARABIC LETTER SAD INITIAL FORM
- 0xFEBD: 0xD3, # ARABIC LETTER DAD ISOLATED FORM
- 0xFEBF: 0xD4, # ARABIC LETTER DAD INITIAL FORM
- 0xFEC1: 0xD5, # ARABIC LETTER TAH ISOLATED FORM
- 0xFEC5: 0xD6, # ARABIC LETTER ZAH ISOLATED FORM
- 0xFEC9: 0xD7, # ARABIC LETTER AIN ISOLATED FORM
- 0xFECA: 0xD8, # ARABIC LETTER AIN FINAL FORM
- 0xFECB: 0xD9, # ARABIC LETTER AIN INITIAL FORM
- 0xFECC: 0xDA, # ARABIC LETTER AIN MEDIAL FORM
- 0xFECD: 0xDB, # ARABIC LETTER GHAIN ISOLATED FORM
- 0xFECE: 0xDC, # ARABIC LETTER GHAIN FINAL FORM
- 0xFECF: 0xDD, # ARABIC LETTER GHAIN INITIAL FORM
- 0xFED0: 0xDE, # ARABIC LETTER GHAIN MEDIAL FORM
- 0xFED1: 0xDF, # ARABIC LETTER FEH ISOLATED FORM
- 0xFED3: 0xE0, # ARABIC LETTER FEH INITIAL FORM
- 0xFED5: 0xE1, # ARABIC LETTER QAF ISOLATED FORM
- 0xFED7: 0xE2, # ARABIC LETTER QAF INITIAL FORM
- 0xFED9: 0xE3, # ARABIC LETTER KAF ISOLATED FORM
- 0xFEDB: 0xE4, # ARABIC LETTER KAF INITIAL FORM
- 0xFEDD: 0xE7, # ARABIC LETTER LAM ISOLATED FORM
- 0xFEDF: 0xE8, # ARABIC LETTER LAM INITIAL FORM
- 0xFEE0: 0xE9, # ARABIC LETTER LAM MEDIAL FORM
- 0xFEE1: 0xEA, # ARABIC LETTER MEEM ISOLATED FORM
- 0xFEE3: 0xEB, # ARABIC LETTER MEEM INITIAL FORM
- 0xFEE5: 0xED, # ARABIC LETTER NOON ISOLATED FORM
- 0xFEE7: 0xEE, # ARABIC LETTER NOON INITIAL FORM
- 0xFEED: 0xF0, # ARABIC LETTER WAW ISOLATED FORM
- 0xFEF1: 0xF9, # ARABIC LETTER YEH ISOLATED FORM
- 0xFEF2: 0xFA, # ARABIC LETTER YEH FINAL FORM
- 0xFEF3: 0xFB, # ARABIC LETTER YEH INITIAL FORM
-}