From: Marc-André Lemburg <mal@egenix.com>
Date: Fri, 21 Oct 2005 14:02:28 +0000 (+0000)
Subject: Alias iso8859_1 to latin_1 which is the same encoding, but has
X-Git-Tag: v2.5a0~1253
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7797be7b3b738689343dc6adaef29ee0a893874b;p=thirdparty%2FPython%2Fcpython.git

Alias iso8859_1 to latin_1 which is the same encoding, but has
a much faster codec implementation.
---

diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index 7362e7884054..681f9e356caf 100644
--- a/Lib/encodings/aliases.py
+++ b/Lib/encodings/aliases.py
@@ -393,11 +393,18 @@ aliases = {
     'cskoi8r'            : 'koi8_r',
 
     # latin_1 codec
+    #
+    # Note that the latin_1 codec is implemented internally in C and a
+    # lot faster than the charmap codec iso8859_1 which uses the same
+    # encoding. This is why we discourage the use of the iso8859_1
+    # codec and alias it to latin_1 instead.
+    #
     '8859'               : 'latin_1',
     'cp819'              : 'latin_1',
     'csisolatin1'        : 'latin_1',
     'ibm819'             : 'latin_1',
     'iso8859'            : 'latin_1',
+    'iso8859_1'          : 'latin_1',
     'iso_8859_1'         : 'latin_1',
     'iso_8859_1_1987'    : 'latin_1',
     'iso_ir_100'         : 'latin_1',