From: Noel Power Date: Tue, 17 Apr 2018 12:52:58 +0000 (+0100) Subject: Add aliases for StringIO.StringIO X-Git-Tag: ldb-1.4.0~508 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d331ddf47f7b0ee360a8c7a61e0b38d279ecbd48;p=thirdparty%2Fsamba.git Add aliases for StringIO.StringIO cStringIO doesn't handle unicode, StringIO does. With py2/py3 compatable code we can easily find ourselves getting passed unicode so we don't alias cStringIO Signed-off-by: Noel Power Reviewed-by: Alexander Bokovoy --- diff --git a/python/samba/compat.py b/python/samba/compat.py index d17dc3c2ce9..5662095fed5 100644 --- a/python/samba/compat.py +++ b/python/samba/compat.py @@ -30,6 +30,10 @@ if PY3: integer_types = int, string_types = str text_type = str + + # alias + import io + StringIO = io.StringIO else: # compat functions from urllib import quote as urllib_quote @@ -39,3 +43,7 @@ else: integer_types = (int, long) string_types = basestring text_type = unicode + + # alias + import StringIO + StringIO = StringIO.StringIO