| 1 |
Author: zmedico |
| 2 |
Date: 2009-02-28 05:20:35 +0000 (Sat, 28 Feb 2009) |
| 3 |
New Revision: 12731 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Add support to _ensure_default_encoding() for the same ascii and utf_8 |
| 9 |
aliases that encodings.aliases has. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2009-02-28 01:06:30 UTC (rev 12730) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2009-02-28 05:20:35 UTC (rev 12731) |
| 16 |
@@ -7549,7 +7549,7 @@ |
| 17 |
class AsciiStreamReader(codecs.StreamReader): |
| 18 |
decode = codecs.ascii_decode |
| 19 |
|
| 20 |
- encodings['ascii'] = codecs.CodecInfo( |
| 21 |
+ codec_info = codecs.CodecInfo( |
| 22 |
name='ascii', |
| 23 |
encode=codecs.ascii_encode, |
| 24 |
decode=codecs.ascii_decode, |
| 25 |
@@ -7559,6 +7559,11 @@ |
| 26 |
streamreader=AsciiStreamReader, |
| 27 |
) |
| 28 |
|
| 29 |
+ for alias in ('ascii', '646', 'ansi_x3.4_1968', 'ansi_x3_4_1968', |
| 30 |
+ 'ansi_x3.4_1986', 'cp367', 'csascii', 'ibm367', 'iso646_us', |
| 31 |
+ 'iso_646.irv_1991', 'iso_ir_6', 'us', 'us_ascii'): |
| 32 |
+ encodings[alias] = codec_info |
| 33 |
+ |
| 34 |
if 'utf_8' in missing_encodings: |
| 35 |
|
| 36 |
def utf8decode(input, errors='strict'): |
| 37 |
@@ -7577,7 +7582,7 @@ |
| 38 |
class Utf8StreamReader(codecs.StreamReader): |
| 39 |
decode = codecs.utf_8_decode |
| 40 |
|
| 41 |
- encodings['utf_8'] = codecs.CodecInfo( |
| 42 |
+ codec_info = codecs.CodecInfo( |
| 43 |
name='utf-8', |
| 44 |
encode=codecs.utf_8_encode, |
| 45 |
decode=utf8decode, |
| 46 |
@@ -7587,6 +7592,9 @@ |
| 47 |
streamwriter=Utf8StreamReader, |
| 48 |
) |
| 49 |
|
| 50 |
+ for alias in ('utf_8', 'u8', 'utf', 'utf8', 'utf8_ucs2', 'utf8_ucs4'): |
| 51 |
+ encodings[alias] = codec_info |
| 52 |
+ |
| 53 |
return encodings |
| 54 |
|
| 55 |
def _ensure_default_encoding(): |
| 56 |
@@ -7630,6 +7638,8 @@ |
| 57 |
encodings[default_encoding] = encodings[default_fallback] |
| 58 |
|
| 59 |
def search_function(name): |
| 60 |
+ name = name.lower() |
| 61 |
+ name = name.replace('-', '_') |
| 62 |
codec_info = encodings.get(name) |
| 63 |
if codec_info is not None: |
| 64 |
return codecs.CodecInfo( |
Archives