From: Noel Power <noel.power@suse.com>
Date: Fri, 24 Aug 2018 08:55:08 +0000 (+0100)
Subject: python/samba: add alias for ConfigParser for PY2/PY3 compatability
X-Git-Tag: tdb-1.3.17~1247
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=600fde58ab616f7c786b43da23acb0b441bd6885;p=thirdparty%2Fsamba.git

python/samba: add alias for ConfigParser for PY2/PY3 compatability

ConfigParser module changed name to configParser in PY3, additionally
the behaviour regarding interpolation has changed. ConfigParser now
has a default interpolation param whose behaviour demands that '%' is
escaped. To maintain behaviour with the python2 version this default
param needs to be changed. Add some alias(s) and 'shim' Configparser
symbol in samba.compat to cater for this.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/compat.py b/python/samba/compat.py
index 0c1869ad3b5..ff5f3c21762 100644
--- a/python/samba/compat.py
+++ b/python/samba/compat.py
@@ -83,6 +83,9 @@ if PY3:
     # alias
     import io
     StringIO = io.StringIO
+    def ConfigParser(defaults=None, dict_type=None, allow_no_value=None):
+        from configparser import ConfigParser
+        return ConfigParser(defaults, dict_type, allow_no_value, interpolation=None)
 else:
     # Helper function to return bytes.
     # if 'unicode' is passed in then it is decoded using 'utf8' and
@@ -158,4 +161,5 @@ else:
     # alias
     import cStringIO
     StringIO = cStringIO.StringIO
+    from ConfigParser import ConfigParser
     cmp_fn = cmp