diff options
| author | Noel Power <noel.power@suse.com> | 2018-11-28 15:33:28 +0000 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2018-12-10 10:38:21 +0100 |
| commit | fdf2deb3ba18932d255e19acb08b67cb3f24f6f4 (patch) | |
| tree | 8b76824b09f68e095d53c1b0d43870f73109f5f1 /python | |
| parent | 1fb9887ea87de11515029d65c7f78873c8396e95 (diff) | |
| download | samba-fdf2deb3ba18932d255e19acb08b67cb3f24f6f4.tar.gz | |
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>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/compat.py | 2 |
1 files changed, 2 insertions, 0 deletions
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) |