testprogs/blackbox: PY3 bulk change for python scripts use correct python

[amitay/samba.git] / python / samba / compat.py

diff --git a/python/samba/compat.py b/python/samba/compat.py
index e328cc54574fb40ea8b91a64e49096bbca9fa124..ff5f3c2176295fbbfc19ef2021a15b419ccd9a42 100644 (file)
--- a/python/samba/compat.py
+++ b/python/samba/compat.py
@@ -22,6 +22,42 @@ import sys
 PY3 = sys.version_info[0] == 3
 
 if PY3:
+    # Sometimes in PY3 we have variables whose content can be 'bytes' or
+    # 'str' and we can't be sure which. Generally this is because the
+    # code variable can be initialised (or reassigned) a value from different
+    # api(s) or functions depending on complex conditions or logic. Or another
+    # common case is in PY2 the variable is 'type <str>' and in PY3 it is
+    # 'class <str>' and the function to use e.g. b64encode requires 'bytes'
+    # in PY3. In such cases it would be nice to avoid excessive testing in
+    # the client code. Calling such a helper function should be avoided
+    # if possible but sometimes this just isn't possible.
+    # If a 'str' object is passed in it is encoded using 'utf8' or if 'bytes'
+    # is passed in it is returned unchanged.
+    # Using this function is PY2/PY3 code should ensure in most cases
+    # the PY2 code runs unchanged in PY2 whereas the code in PY3 possibly
+    # encodes the variable (see PY2 implementation of this function below)
+    def get_bytes(bytesorstring):
+        tmp = bytesorstring
+        if isinstance(bytesorstring, str):
+            tmp = bytesorstring.encode('utf8')
+        elif not isinstance(bytesorstring, bytes):
+            raise ValueError('Expected byte or string for %s:%s' % (type(bytesorstring), bytesorstring))
+        return tmp
+
+    # helper function to get a string from a variable that maybe 'str' or
+    # 'bytes' if 'bytes' then it is decoded using 'utf8'. If 'str' is passed
+    # it is returned unchanged
+    # Using this function is PY2/PY3 code should ensure in most cases
+    # the PY2 code runs unchanged in PY2 whereas the code in PY3 possibly
+    # decodes the variable (see PY2 implementation of this function below)
+    def get_string(bytesorstring):
+        tmp = bytesorstring
+        if isinstance(bytesorstring, bytes):
+            tmp = bytesorstring.decode('utf8')
+        elif not isinstance(bytesorstring, str):
+            raise ValueError('Expected byte of string for %s:%s' % (type(bytesorstring), bytesorstring))
+        return tmp
+
     def cmp_fn(x, y):
         """
         Replacement for built-in function cmp that was removed in Python 3
@@ -34,6 +70,7 @@ if PY3:
         return (x > y) - (x < y)
     # compat functions
     from urllib.parse import quote as urllib_quote
+    from urllib.parse import urljoin as urllib_join
     from urllib.request import urlopen as urllib_urlopen
     from functools import cmp_to_key as cmp_to_key_fn
 
@@ -46,7 +83,36 @@ 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
+    # the result returned. If 'str' is passed then it is returned unchanged.
+    # Using this function is PY2/PY3 code should ensure in most cases
+    # the PY2 code runs unchanged in PY2 whereas the code in PY3 possibly
+    # encodes the variable (see PY3 implementation of this function above)
+    def get_bytes(bytesorstring):
+        tmp = bytesorstring
+        if isinstance(bytesorstring, unicode):
+            tmp = bytesorstring.encode('utf8')
+        elif not isinstance(bytesorstring, str):
+            raise ValueError('Expected string for %s:%s' % (type(bytesorstring), bytesorstring))
+        return tmp
+
+    # Helper function to return string.
+    # if 'str' or 'unicode' passed in they are returned unchanged
+    # otherwise an exception is generated
+    # Using this function is PY2/PY3 code should ensure in most cases
+    # the PY2 code runs unchanged in PY2 whereas the code in PY3 possibly
+    # decodes the variable (see PY3 implementation of this function above)
+    def get_string(bytesorstring):
+        tmp = bytesorstring
+        if not(isinstance(bytesorstring, str) or isinstance(bytesorstring, unicode)):
+            raise ValueError('Expected str or unicode for %s:%s' % (type(bytesorstring), bytesorstring))
+        return tmp
+
 
     if sys.version_info < (2, 7):
         def cmp_to_key_fn(mycmp):
@@ -84,6 +150,7 @@ else:
     # compat functions
     from urllib import quote as urllib_quote
     from urllib import urlopen as urllib_urlopen
+    from urlparse import urljoin as urllib_join
 
     # compat types
     integer_types = (int, long)
@@ -94,4 +161,5 @@ else:
     # alias
     import cStringIO
     StringIO = cStringIO.StringIO
+    from ConfigParser import ConfigParser
     cmp_fn = cmp