From fdf2deb3ba18932d255e19acb08b67cb3f24f6f4 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Wed, 28 Nov 2018 15:33:28 +0000 Subject: [PATCH] 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 Reviewed-by: Andrew Bartlett --- python/samba/compat.py | 2 ++ 1 file changed, 2 insertions(+) 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) -- 2.34.1