From: Noel Power <noel.power@suse.com>
Date: Wed, 28 Nov 2018 15:33:28 +0000 (+0000)
Subject: python/samba: PY3 compat py2/p3 symbol for SocketServer/socketserver
X-Git-Tag: tdb-1.3.17~462
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdf2deb3ba18932d255e19acb08b67cb3f24f6f4;p=thirdparty%2Fsamba.git

python/samba: PY3 compat py2/p3 symbol for SocketServer/socketserver

SocketServer was renamed to socketserver in Py3, this patch
create a samba.compat.SocketServer which can be used in py2 or
py3

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 ff5f3c21762..fdb2902a11f 100644
--- a/python/samba/compat.py
+++ b/python/samba/compat.py
@@ -73,6 +73,7 @@ if PY3:
     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
+    import socketserver as SocketServer
 
     # compat types
     integer_types = int,
@@ -151,6 +152,7 @@ else:
     from urllib import quote as urllib_quote
     from urllib import urlopen as urllib_urlopen
     from urlparse import urljoin as urllib_join
+    import SocketServer as SocketServer
 
     # compat types
     integer_types = (int, long)