From a3f19c3f52ddff85dd52eaa01b77b2d50cc9af3f Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sun, 6 May 2018 10:52:38 +0300 Subject: Remove mojibake in the locale aliases mapping. (GH-6716) --- Lib/locale.py | 2 -- Tools/i18n/makelocalealias.py | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/locale.py b/Lib/locale.py index 876d2eb..f3d3973 100644 --- a/Lib/locale.py +++ b/Lib/locale.py @@ -923,7 +923,6 @@ locale_alias = { 'bo_in': 'bo_IN.UTF-8', 'bokmal': 'nb_NO.ISO8859-1', 'bokm\xe5l': 'nb_NO.ISO8859-1', - 'bokm\xef\xbf\xbd': 'nb_NO.ISO8859-1', 'br': 'br_FR.ISO8859-1', 'br_fr': 'br_FR.ISO8859-1', 'brx_in': 'brx_IN.UTF-8', @@ -1072,7 +1071,6 @@ locale_alias = { 'fr_fr': 'fr_FR.ISO8859-1', 'fr_lu': 'fr_LU.ISO8859-1', 'fran\xe7ais': 'fr_FR.ISO8859-1', - 'fran\xef\xbf\xbdis': 'fr_FR.ISO8859-1', 'fre_fr': 'fr_FR.ISO8859-1', 'french': 'fr_FR.ISO8859-1', 'french.iso88591': 'fr_CH.ISO8859-1', diff --git a/Tools/i18n/makelocalealias.py b/Tools/i18n/makelocalealias.py index c7ecace..b407a8a 100755 --- a/Tools/i18n/makelocalealias.py +++ b/Tools/i18n/makelocalealias.py @@ -19,6 +19,9 @@ def parse(filename): with open(filename, encoding='latin1') as f: lines = list(f) + # Remove mojibake in /usr/share/X11/locale/locale.alias. + # b'\xef\xbf\xbd' == '\ufffd'.encode('utf-8') + lines = [line for line in lines if '\xef\xbf\xbd' not in line] data = {} for line in lines: line = line.strip() -- cgit v0.12