From 75cf728398421435186559306b0962c70f333c6e Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Tue, 26 Feb 2019 15:35:44 +1300 Subject: [PATCH] gpo: Parse GPT.INI with Latin-1 For some reason the French version of RSAT turns accents into ISO-8859-1. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13806 Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett --- python/samba/gp_parse/gp_ini.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/python/samba/gp_parse/gp_ini.py b/python/samba/gp_parse/gp_ini.py index 58aee88a1e1..590b71b9a6c 100644 --- a/python/samba/gp_parse/gp_ini.py +++ b/python/samba/gp_parse/gp_ini.py @@ -105,6 +105,17 @@ class GPIniParser(GPParser): class GPTIniParser(GPIniParser): encoding = 'utf-8' + def parse(self, contents): + try: + super(GPTIniParser, self).parse(contents) + except UnicodeDecodeError: + # Required dict_type in Python 2.7 + self.ini_conf = ConfigParser(dict_type=collections.OrderedDict) + self.ini_conf.optionxform = str + + # Fallback to Latin-1 which RSAT appears to use + self.ini_conf.readfp(StringIO(contents.decode('iso-8859-1'))) + class GPScriptsIniParser(GPIniParser): def build_xml_parameter(self, section_xml, section, key_ini, val_ini):