1 files changed, 8 insertions, 10 deletions
diff --git a/qpid/python/qpid/messaging/transports.py b/qpid/python/qpid/messaging/transports.py
index 7abaae12e8..8133a45604 100644
--- a/qpid/python/qpid/messaging/transports.py
+++ b/qpid/python/qpid/messaging/transports.py
@@ -17,23 +17,18 @@
 # under the License.
 #
 
-import socket
 from qpid.util import connect
 
 TRANSPORTS = {}
 
-class SocketTransport:
+class tcp:
 
-  def __init__(self, conn, host, port):
+  def __init__(self, host, port):
     self.socket = connect(host, port)
-    if conn.tcp_nodelay:
-      self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
 
   def fileno(self):
     return self.socket.fileno()
 
-class tcp(SocketTransport):
-
   def reading(self, reading):
     return reading
 
@@ -57,14 +52,17 @@ try:
 except ImportError:
   pass
 else:
-  class tls(SocketTransport):
+  class tls:
 
-    def __init__(self, conn, host, port):
-      SocketTransport.__init__(self, conn, host, port)
+    def __init__(self, host, port):
+      self.socket = connect(host, port)
       self.tls = wrap_socket(self.socket)
       self.socket.setblocking(0)
       self.state = None
 
+    def fileno(self):
+      return self.socket.fileno()
+
     def reading(self, reading):
       if self.state is None:
         return reading