diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:29:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:29:33 +0000 |
| commit | 560cb3796077feb70de4bbe25d23cf915dbcf993 (patch) | |
| tree | 1951791df27b291db4920a67a0445002a31f9acd /pym | |
| parent | 9a34060f3c0d7a62ceeb8ecb74dbb4f5a34d6b3d (diff) | |
| download | portage-560cb3796077feb70de4bbe25d23cf915dbcf993.tar.gz portage-560cb3796077feb70de4bbe25d23cf915dbcf993.tar.bz2 portage-560cb3796077feb70de4bbe25d23cf915dbcf993.zip | |
Add support to _ensure_default_encoding() for the same ascii and utf_8
aliases that encodings.aliases has. (trunk r12731)
svn path=/main/branches/2.1.6/; revision=12980
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index be54d3325..5e3e70c1a 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -7536,7 +7536,7 @@ def _gen_missing_encodings(missing_encodings): class AsciiStreamReader(codecs.StreamReader): decode = codecs.ascii_decode - encodings['ascii'] = codecs.CodecInfo( + codec_info = codecs.CodecInfo( name='ascii', encode=codecs.ascii_encode, decode=codecs.ascii_decode, @@ -7546,6 +7546,11 @@ def _gen_missing_encodings(missing_encodings): streamreader=AsciiStreamReader, ) + for alias in ('ascii', '646', 'ansi_x3.4_1968', 'ansi_x3_4_1968', + 'ansi_x3.4_1986', 'cp367', 'csascii', 'ibm367', 'iso646_us', + 'iso_646.irv_1991', 'iso_ir_6', 'us', 'us_ascii'): + encodings[alias] = codec_info + if 'utf_8' in missing_encodings: def utf8decode(input, errors='strict'): @@ -7564,7 +7569,7 @@ def _gen_missing_encodings(missing_encodings): class Utf8StreamReader(codecs.StreamReader): decode = codecs.utf_8_decode - encodings['utf_8'] = codecs.CodecInfo( + codec_info = codecs.CodecInfo( name='utf-8', encode=codecs.utf_8_encode, decode=utf8decode, @@ -7574,6 +7579,9 @@ def _gen_missing_encodings(missing_encodings): streamwriter=Utf8StreamReader, ) + for alias in ('utf_8', 'u8', 'utf', 'utf8', 'utf8_ucs2', 'utf8_ucs4'): + encodings[alias] = codec_info + return encodings def _ensure_default_encoding(): @@ -7617,6 +7625,8 @@ def _ensure_default_encoding(): encodings[default_encoding] = encodings[default_fallback] def search_function(name): + name = name.lower() + name = name.replace('-', '_') codec_info = encodings.get(name) if codec_info is not None: return codecs.CodecInfo( |