From: Noel Power <noel.power@suse.com>
Date: Thu, 10 May 2018 12:14:22 +0000 (+0100)
Subject: python/samba/tests: remove Py2 specific imports.
X-Git-Tag: ldb-1.5.0~299
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=337ae8cd586aeb43721f79485f6a35a68b6060f2;p=thirdparty%2Fsamba.git

python/samba/tests: remove Py2 specific imports.

Remove some python2 specific import, probably this was due to
previous unavailability for some c-modules in python3

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 8eb41cee538..1d507102095 100644
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -38,12 +38,10 @@ import samba.dcerpc.base
 from samba.compat import PY3, text_type
 from samba.compat import string_types
 from random import randint
-if not PY3:
-    # Py2 only
-    from samba.samdb import SamDB
-    import samba.ndr
-    import samba.dcerpc.dcerpc
-    import samba.dcerpc.epmapper
+from samba.samdb import SamDB
+import samba.ndr
+import samba.dcerpc.dcerpc
+import samba.dcerpc.epmapper
 
 try:
     from unittest import SkipTest