Remove "import *" from text_socket

supervisor/datatypes.py

@@ -205,7 +205,7 @@ class InetStreamSocketConfig(SocketConfig):
         return self.host, self.port
 
     def create_and_bind(self):
-        sock = text_socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sock = text_socket.text_socket(socket.AF_INET, socket.SOCK_STREAM)
         try:
             sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             sock.bind(self.addr())
@@ -234,7 +234,7 @@ class UnixStreamSocketConfig(SocketConfig):
     def create_and_bind(self):
         if os.path.exists(self.path):
             os.unlink(self.path)
-        sock = text_socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        sock = text_socket.text_socket(socket.AF_UNIX, socket.SOCK_STREAM)
         try:
             sock.bind(self.addr())
             self._chown()

supervisor/http.py

@@ -525,7 +525,7 @@ class supervisor_af_inet_http_server(supervisor_http_server):
     def __init__(self, ip, port, logger_object):
         self.ip = ip
         self.port = port
-        sock = text_socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sock = text_socket.text_socket(socket.AF_INET, socket.SOCK_STREAM)
         self.prebind(sock, logger_object)
         self.bind((ip, port))
 
@@ -570,7 +570,7 @@ class supervisor_af_unix_http_server(supervisor_http_server):
             pass
 
         while 1:
-            sock = text_socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            sock = text_socket.text_socket(socket.AF_UNIX, socket.SOCK_STREAM)
             try:
                 sock.bind(tempname)
                 os.chmod(tempname, sockchmod)
@@ -624,7 +624,7 @@ class supervisor_af_unix_http_server(supervisor_http_server):
         self.postbind()
 
     def checkused(self, socketname):
-        s = text_socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        s = text_socket.text_socket(socket.AF_UNIX, socket.SOCK_STREAM)
         try:
             s.connect(socketname)
             s.send("GET / HTTP/1.0\r\n\r\n")

supervisor/medusa/asyncore_25.py

@@ -257,7 +257,7 @@ class dispatcher:
 
     def create_socket(self, family, type):
         self.family_and_type = family, type
-        self.socket = text_socket.socket(family, type)
+        self.socket = text_socket.text_socket(family, type)
         self.socket.setblocking(0)
         self._fileno = self.socket.fileno()
         self.add_channel()

supervisor/medusa/text_socket.py

@@ -1,16 +1,12 @@
-# -*- Mode: Python -*-
+import socket
+from supervisor.compat import PY3, as_string, as_bytes
 
-__author__ = 'Scott Maxwell'
-
-from supervisor.compat import PY3
-from supervisor.compat import as_string, as_bytes
-
-from socket import * # relied on to be imported from elsewhere
+bin_socket = socket.socket
 
 if PY3:
-    bin_socket = socket
-    class text_socket(socket):
-        def __init__(self, family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None):
+    class text_socket(bin_socket):
+        def __init__(self, family=socket.AF_INET, type=socket.SOCK_STREAM,
+                           proto=0, fileno=None):
             bin_socket.__init__(self, family, type, proto, fileno)
 
         def recv(self, *args, **kwargs):
@@ -39,9 +35,11 @@ if PY3:
             # Issue #7995: if no default timeout is set and the listening
             # socket had a (non-zero) timeout, force the new socket in blocking
             # mode to override platform-specific socket flags inheritance.
-            if getdefaulttimeout() is None and self.gettimeout():
+            if socket.getdefaulttimeout() is None and self.gettimeout():
                 sock.setblocking(True)
             return sock, addr
 
     text_socket.__init__.__doc__ = bin_socket.__init__.__doc__
-    socket = text_socket
+
+else:
+    text_socket = bin_socket

supervisor/xmlrpc.py

@@ -499,7 +499,7 @@ class SupervisorTransport(xmlrpclib.Transport):
 
 class UnixStreamHTTPConnection(httplib.HTTPConnection):
     def connect(self): # pragma: no cover
-        self.sock = text_socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        self.sock = text_socket.text_socket(socket.AF_UNIX, socket.SOCK_STREAM)
         # we abuse the host parameter as the socketname
         self.sock.connect(self.socketfile)