merge

brettcannon · brettcannon · commit 2a4df127c731 · 2013-04-09T17:03:27.000-04:00
diff --git a/Lib/encodings/cp037.py b/Lib/encodings/cp037.py
@@ -301,7 +301,6 @@ def getregentry():
     '\xd9'     #  0xFD -> LATIN CAPITAL LETTER U WITH GRAVE
     '\xda'     #  0xFE -> LATIN CAPITAL LETTER U WITH ACUTE
     '\x9f'     #  0xFF -> CONTROL
-    '\ufffe'   ## Widen to UCS2 for optimization
 )
 
 ### Encoding table
diff --git a/Lib/encodings/cp500.py b/Lib/encodings/cp500.py
@@ -301,7 +301,6 @@ def getregentry():
     '\xd9'     #  0xFD -> LATIN CAPITAL LETTER U WITH GRAVE
     '\xda'     #  0xFE -> LATIN CAPITAL LETTER U WITH ACUTE
     '\x9f'     #  0xFF -> CONTROL
-    '\ufffe'   ## Widen to UCS2 for optimization
 )
 
 ### Encoding table
diff --git a/Lib/encodings/iso8859_1.py b/Lib/encodings/iso8859_1.py
@@ -301,7 +301,6 @@ def getregentry():
     '\xfd'     #  0xFD -> LATIN SMALL LETTER Y WITH ACUTE
     '\xfe'     #  0xFE -> LATIN SMALL LETTER THORN (Icelandic)
     '\xff'     #  0xFF -> LATIN SMALL LETTER Y WITH DIAERESIS
-    '\ufffe'   ## Widen to UCS2 for optimization
 )
 
 ### Encoding table
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c

Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,6 @@ def getregentry():`
`301`	`301`	`'\xd9' # 0xFD -> LATIN CAPITAL LETTER U WITH GRAVE`
`302`	`302`	`'\xda' # 0xFE -> LATIN CAPITAL LETTER U WITH ACUTE`
`303`	`303`	`'\x9f' # 0xFF -> CONTROL`
`304`		`- '\ufffe' ## Widen to UCS2 for optimization`
`305`	`304`	`)`
`306`	`305`
`307`	`306`	`### Encoding table`