git.samba.org
/
martins
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fdf2deb
)
python/samba: Py3 Use new compat.sockerserver symbol
author
Noel Power
<noel.power@suse.com>
Wed, 28 Nov 2018 15:35:33 +0000
(15:35 +0000)
committer
Noel Power
<npower@samba.org>
Mon, 10 Dec 2018 09:38:21 +0000
(10:38 +0100)
SocketServer symbol changed in PY3 to socketserver so
we need to use a compat symbol for PY2/PY3 code.
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/tests/dns_forwarder_helpers/server.py
patch
|
blob
|
history
diff --git
a/python/samba/tests/dns_forwarder_helpers/server.py
b/python/samba/tests/dns_forwarder_helpers/server.py
index 4292827f4f916a6066c350611c44f1cbfcdcbf8d..d7a89ca995be0377e7d98a113470f57d94d485d3 100644
(file)
--- a/
python/samba/tests/dns_forwarder_helpers/server.py
+++ b/
python/samba/tests/dns_forwarder_helpers/server.py
@@
-18,7
+18,7
@@
#
# Based on the EchoServer example from python docs
from __future__ import print_function
-import SocketServer
+
from samba.compat
import SocketServer
import sys
from threading import Timer
from samba.dcerpc import dns