aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_framework/socks5.py
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2017-10-16 21:46:23 -0400
committerJohn Newbery <john@johnnewbery.com>2017-10-16 21:46:23 -0400
commitf893085325b57dd07bde78a01e5dcb7d303154de (patch)
treedd0fcd3155fde2b3a50f6cfee75f482d857c185b /test/functional/test_framework/socks5.py
parent8f9e3627ef054c9732f4e529c6ed429ed8dc7183 (diff)
[tests] Don't subclass from object for Python 3
Diffstat (limited to 'test/functional/test_framework/socks5.py')
-rw-r--r--test/functional/test_framework/socks5.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/test_framework/socks5.py b/test/functional/test_framework/socks5.py
index 0070844168..7b40c47fbf 100644
--- a/test/functional/test_framework/socks5.py
+++ b/test/functional/test_framework/socks5.py
@@ -31,7 +31,7 @@ def recvall(s, n):
return rv
### Implementation classes
-class Socks5Configuration(object):
+class Socks5Configuration():
"""Proxy configuration."""
def __init__(self):
self.addr = None # Bind address (must be set)
@@ -39,7 +39,7 @@ class Socks5Configuration(object):
self.unauth = False # Support unauthenticated
self.auth = False # Support authentication
-class Socks5Command(object):
+class Socks5Command():
"""Information about an incoming socks5 command."""
def __init__(self, cmd, atyp, addr, port, username, password):
self.cmd = cmd # Command (one of Command.*)
@@ -51,7 +51,7 @@ class Socks5Command(object):
def __repr__(self):
return 'Socks5Command(%s,%s,%s,%s,%s,%s)' % (self.cmd, self.atyp, self.addr, self.port, self.username, self.password)
-class Socks5Connection(object):
+class Socks5Connection():
def __init__(self, serv, conn, peer):
self.serv = serv
self.conn = conn
@@ -122,7 +122,7 @@ class Socks5Connection(object):
finally:
self.conn.close()
-class Socks5Server(object):
+class Socks5Server():
def __init__(self, conf):
self.conf = conf
self.s = socket.socket(conf.af)