From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Mon, 25 May 2020 23:33:42 +0000 (+1200)
Subject: python: do not always import socket_server
X-Git-Tag: ldb-2.2.0~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2323ea6f07f0a05a4bc3091236fa3a6502ca12bd;p=thirdparty%2Fsamba.git

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>
---

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