summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/lib/libcodecs.tex2
-rw-r--r--Lib/encodings/aliases.py1
-rw-r--r--Misc/NEWS2
3 files changed, 4 insertions, 1 deletions
diff --git a/Doc/lib/libcodecs.tex b/Doc/lib/libcodecs.tex
index 7e22386..bd5f3c9 100644
--- 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 bf7643e..7362e78 100644
--- 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 4f134e1..77e8569 100644
--- 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
-----