diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2019-12-02 13:09:17 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-12-02 13:09:17 +0300 |
| commit | 38fde63f74091af1f6a0d485474769bb6b4f17ce (patch) | |
| tree | 1317a1fa2ef61c710ff5c653f43c0af8bb164ca6 /debian/patches/locale-module | |
| download | pypy-debian.tar.gz | |
Import pypy (7.2.0+dfsg-1)debian/7.2.0+dfsg-1debian
Diffstat (limited to 'debian/patches/locale-module')
| -rw-r--r-- | debian/patches/locale-module | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/locale-module b/debian/patches/locale-module new file mode 100644 index 0000000..539598f --- /dev/null +++ b/debian/patches/locale-module @@ -0,0 +1,29 @@ +From: Stefano Rivera <stefanor@debian.org> +Date: Sat, 7 Oct 2017 09:38:58 +0200 +Subject: Don't map 'utf8', 'utf-8' to 'utf' + +'utf' is not a known encoding for glibc. + +Author: Matthias Klose <doko@debian.org> +Origin: Debian cpython packaging +Bug-cpython: http://bugs.python.org/issue1166957 +Last-Update: 2011-12-19 +--- + lib-python/2.7/locale.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib-python/2.7/locale.py b/lib-python/2.7/locale.py +index 5aab163..9527d95 100644 +--- a/lib-python/2.7/locale.py ++++ b/lib-python/2.7/locale.py +@@ -1701,8 +1701,8 @@ locale_alias = { + 'uk_ua.iso88595': 'uk_UA.ISO8859-5', + 'uk_ua.koi8u': 'uk_UA.KOI8-U', + 'uk_ua.microsoftcp1251': 'uk_UA.CP1251', +- 'univ': 'en_US.utf', +- 'universal': 'en_US.utf', ++ 'univ': 'en_US.UTF-8', ++ 'universal': 'en_US.UTF-8', + 'universal.utf8@ucs4': 'en_US.UTF-8', + 'unm_us': 'unm_US.UTF-8', + 'ur': 'ur_PK.CP1256', |