Skip to content

Commit 68c0b6e

Browse files
authored
Merge pull request #71 from mleinart/socksipy_compatibility/setdefaultproxy
Make SocksiPy legacy functions kwarg-compatible
2 parents 485c4fe + 682ac28 commit 68c0b6e

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

socks.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,10 @@ def set_default_proxy(proxy_type=None, addr=None, port=None, rdns=True, username
154154
username.encode() if username else None,
155155
password.encode() if password else None)
156156

157-
setdefaultproxy = set_default_proxy
157+
def setdefaultproxy(*args, **kwargs):
158+
if 'proxytype' in kwargs:
159+
kwargs['proxy_type'] = kwargs.pop('proxytype')
160+
return set_default_proxy(*args, **kwargs)
158161

159162
def get_default_proxy():
160163
"""
@@ -344,7 +347,10 @@ def set_proxy(self, proxy_type=None, addr=None, port=None, rdns=True, username=N
344347
username.encode() if username else None,
345348
password.encode() if password else None)
346349

347-
setproxy = set_proxy
350+
def setproxy(self, *args, **kwargs):
351+
if 'proxytype' in kwargs:
352+
kwargs['proxy_type'] = kwargs.pop('proxytype')
353+
return self.set_proxy(*args, **kwargs)
348354

349355
def bind(self, *pos, **kw):
350356
"""

0 commit comments

Comments
 (0)