Bug #1245379: Add "unicode-1-1-utf-7" as an alias for "utf-7" as specified

by RFC 1642.

diff --git a/Doc/lib/libcodecs.tex b/Doc/lib/libcodecs.tex
index 7e22386814c27087cfa91736585218f3d75a12f4..bd5f3c9eda0b4c6fae56ac4a2d2305cc554763be 100644 (file)
--- a/Doc/lib/libcodecs.tex
+++ b/Doc/lib/libcodecs.tex
@@ -883,7 +883,7 @@ exist:
         {all languages (BMP only)}
 
 \lineiii{utf_7}
-        {U7}
+        {U7, unicode-1-1-utf-7}
         {all languages}
 
 \lineiii{utf_8}

diff --git a/Lib/encodings/aliases.py b/Lib/encodings/aliases.py
index bf7643efb9cf83997da0b7e55af1bc0463f66b8b..7362e78840543c741cad1bef538725b5073c6808 100644 (file)
--- a/Lib/encodings/aliases.py
+++ b/Lib/encodings/aliases.py
@@ -482,6 +482,7 @@ aliases = {
     # utf_7 codec
     'u7'                 : 'utf_7',
     'utf7'               : 'utf_7',
+    'unicode_1_1_utf_7'  : 'utf_7',
 
     # utf_8 codec
     'u8'                 : 'utf_8',

diff --git a/Misc/NEWS b/Misc/NEWS
index 4f134e1e74e3a0f16ae413c29b3de46013a9023e..77e85699f0fab28b22de9448714973483ca9c89b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -517,6 +517,8 @@ Library
 - Bug #1202493: Fixing SRE parser to handle '{}' as perl does, rather than
   considering it exactly like a '*'.
 
+- Bug #1245379: Add "unicode-1-1-utf-7" as an alias for "utf-7" to
+  ``encodings.aliases``.
 
 Build
 -----