]> granicus.if.org Git - python/commitdiff
Issue #23358: Add missing BaseServer entry to socketserver.__all__.
authorBerker Peksag <berker.peksag@gmail.com>
Tue, 3 Feb 2015 09:55:32 +0000 (11:55 +0200)
committerBerker Peksag <berker.peksag@gmail.com>
Tue, 3 Feb 2015 09:55:32 +0000 (11:55 +0200)
Patch by Martin Panter.

1  2 
Lib/socketserver.py
Lib/test/test_socketserver.py

index fc4ee4eed0fffd2c599b579d1c8814ba23910d72,5cb89bea196acdf439b7d91033534e05573f0adb..c43f1be578d267b1fc635774fecd475be84b6b97
@@@ -136,12 -137,11 +136,12 @@@ try
      import threading
  except ImportError:
      import dummy_threading as threading
 +from time import monotonic as time
  
- __all__ = ["TCPServer","UDPServer","ForkingUDPServer","ForkingTCPServer",
-            "ThreadingUDPServer","ThreadingTCPServer","BaseRequestHandler",
-            "StreamRequestHandler","DatagramRequestHandler",
-            "ThreadingMixIn", "ForkingMixIn"]
+ __all__ = ["BaseServer", "TCPServer", "UDPServer", "ForkingUDPServer",
+            "ForkingTCPServer", "ThreadingUDPServer", "ThreadingTCPServer",
+            "BaseRequestHandler", "StreamRequestHandler",
+            "DatagramRequestHandler", "ThreadingMixIn", "ForkingMixIn"]
  if hasattr(socket, "AF_UNIX"):
      __all__.extend(["UnixStreamServer","UnixDatagramServer",
                      "ThreadingUnixStreamServer",
Simple merge