ensure we're importing our local socks lib.

KP · KP · commit 303f6dfd05ad · 2011-09-25T11:47:12.000-07:00
re-added previous mods from amorton
diff --git a/shotgun_api3/lib/httplib2/__init__.py b/shotgun_api3/lib/httplib2/__init__.py
@@ -55,7 +55,8 @@
 import socket
 
 try:
-    from httplib2 import socks
+    #from httplib2 import socks
+    import socks
 except ImportError:
     socks = None
 
@@ -772,6 +773,8 @@ def connect(self):
             try:
                 if self.proxy_info and self.proxy_info.isgood():
                     self.sock = socks.socksocket(af, socktype, proto)
+                    # HACK: amorton enabled TCP_NODELAY on socket
+                    self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
                     self.sock.setproxy(*self.proxy_info.astuple())
                 else:
                     self.sock = socket.socket(af, socktype, proto)
@@ -877,6 +880,8 @@ def connect(self):
             try:
                 if self.proxy_info and self.proxy_info.isgood():
                     sock = socks.socksocket(family, socktype, proto)
+                    # HACK: amorton enabled TCP_NODELAY on socket
+                    sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
                     sock.setproxy(*self.proxy_info.astuple())
                 else:
                     sock = socket.socket(family, socktype, proto)
