diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2020-05-26 11:33:42 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2020-06-13 05:25:31 +0000 |
| commit | 2323ea6f07f0a05a4bc3091236fa3a6502ca12bd (patch) | |
| tree | 8e0ddcd07f89ab7a3dfe53a644ac55627af88595 /python | |
| parent | 5c06ab83381c5e652626d66b95c3b67ce309b249 (diff) | |
| download | samba-2323ea6f07f0a05a4bc3091236fa3a6502ca12bd.tar.gz | |
python: do not always import socket_server
This cost around 10ms for every Python script, and was only used in one
test.
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/compat.py | 3 | ||||
| -rw-r--r-- | python/samba/tests/dns_forwarder_helpers/server.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/python/samba/compat.py b/python/samba/compat.py index 603cb08fe52..3762ca441e1 100644 --- a/python/samba/compat.py +++ b/python/samba/compat.py @@ -70,7 +70,6 @@ if PY3: return (x > y) - (x < y) # compat functions from functools import cmp_to_key as cmp_to_key_fn - import socketserver as SocketServer # compat types integer_types = int, @@ -145,8 +144,6 @@ else: return K else: from functools import cmp_to_key as cmp_to_key_fn - # compat functions - import SocketServer as SocketServer # compat types integer_types = (int, long) diff --git a/python/samba/tests/dns_forwarder_helpers/server.py b/python/samba/tests/dns_forwarder_helpers/server.py index 32b0ffe052a..803372f73c1 100644 --- 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 -from samba.compat import SocketServer +import socketserver as SocketServer import sys from threading import Timer from samba.dcerpc import dns |