summaryrefslogtreecommitdiff
path: root/python2/httplib2/socks.py
diff options
context:
space:
mode:
authorAugie Fackler <durin42@gmail.com>2010-07-22 00:28:01 -0500
committerAugie Fackler <durin42@gmail.com>2010-07-22 00:28:01 -0500
commitb741feb9e539deebff1beab4368d7d35198a44e7 (patch)
tree521fbfff3bd46686e8b864b0c105c3ba71146e02 /python2/httplib2/socks.py
parente98b6c74e926d647456edbd4d824695b0c4551be (diff)
downloadhttplib2-b741feb9e539deebff1beab4368d7d35198a44e7.tar.gz
socks: clean up trailing whitespace
Diffstat (limited to 'python2/httplib2/socks.py')
-rw-r--r--python2/httplib2/socks.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/python2/httplib2/socks.py b/python2/httplib2/socks.py
index 7367d95..bbbf9a0 100644
--- a/python2/httplib2/socks.py
+++ b/python2/httplib2/socks.py
@@ -13,7 +13,7 @@ are permitted provided that the following conditions are met:
3. Neither the name of Dan Haim nor the names of his contributors may be used
to endorse or promote products derived from this software without specific
prior written permission.
-
+
THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
@@ -129,15 +129,15 @@ def setdefaultproxy(proxytype=None,addr=None,port=None,rdns=True,username=None,p
"""
global _defaultproxy
_defaultproxy = (proxytype,addr,port,rdns,username,password)
-
+
class socksocket(socket.socket):
"""socksocket([family[, type[, proto]]]) -> socket object
-
+
Open a SOCKS enabled socket. The parameters are the same as
those of the standard socket init. In order for SOCKS to work,
you must specify family=AF_INET, type=SOCK_STREAM and proto=0.
"""
-
+
def __init__(self, family=socket.AF_INET, type=socket.SOCK_STREAM, proto=0, _sock=None):
_orgsocket.__init__(self,family,type,proto,_sock)
if _defaultproxy != None:
@@ -146,7 +146,7 @@ class socksocket(socket.socket):
self.__proxy = (None, None, None, None, None, None)
self.__proxysockname = None
self.__proxypeername = None
-
+
def __decode(self, bytes):
if 'decode' in dir(bytes):
try:
@@ -154,7 +154,7 @@ class socksocket(socket.socket):
except Exception:
pass
return bytes
-
+
def __encode(self, bytes):
if 'encode' in dir(bytes):
try:
@@ -162,7 +162,7 @@ class socksocket(socket.socket):
except Exception:
pass
return bytes
-
+
def __recvall(self, count):
"""__recvall(count) -> data
Receive EXACTLY the number of bytes requested from the socket.
@@ -174,10 +174,10 @@ class socksocket(socket.socket):
if not d: raise GeneralProxyError((0,"connection closed unexpectedly"))
data = data + self.__decode(d)
return data
-
+
def sendall(self, bytes):
socket.socket.sendall(self, self.__encode(bytes))
-
+
def setproxy(self,proxytype=None,addr=None,port=None,rdns=True,username=None,password=None):
"""setproxy(proxytype, addr[, port[, rdns[, username[, password]]]])
Sets the proxy to be used.
@@ -196,7 +196,7 @@ class socksocket(socket.socket):
Only relevant when username is also provided.
"""
self.__proxy = (proxytype,addr,port,rdns,username,password)
-
+
def __negotiatesocks5(self,destaddr,destport):
"""__negotiatesocks5(self,destaddr,destport)
Negotiates a connection through a SOCKS5 server.
@@ -288,26 +288,26 @@ class socksocket(socket.socket):
self.__proxypeername = (socket.inet_ntoa(ipaddr),destport)
else:
self.__proxypeername = (destaddr,destport)
-
+
def getproxysockname(self):
"""getsockname() -> address info
Returns the bound IP address and port number at the proxy.
"""
return self.__proxysockname
-
+
def getproxypeername(self):
"""getproxypeername() -> address info
Returns the IP and port number of the proxy.
"""
return _orgsocket.getpeername(self)
-
+
def getpeername(self):
"""getpeername() -> address info
Returns the IP address and port number of the destination
machine (note: getproxypeername returns the proxy)
"""
return self.__proxypeername
-
+
def __negotiatesocks4(self,destaddr,destport):
"""__negotiatesocks4(self,destaddr,destport)
Negotiates a connection through a SOCKS4 server.
@@ -355,7 +355,7 @@ class socksocket(socket.socket):
self.__proxypeername = (socket.inet_ntoa(ipaddr),destport)
else:
self.__proxypeername = (destaddr,destport)
-
+
def __negotiatehttp(self,destaddr,destport):
"""__negotiatehttp(self,destaddr,destport)
Negotiates a connection through an HTTP server.
@@ -386,7 +386,7 @@ class socksocket(socket.socket):
raise HTTPError((statuscode,statusline[2]))
self.__proxysockname = ("0.0.0.0",0)
self.__proxypeername = (addr,destport)
-
+
def connect(self,destpair):
"""connect(self,despair)
Connects to the specified destination through a proxy.