[tests] Don't subclass from object for Python 3

This commit is contained in:
John Newbery
2017-10-16 21:46:23 -04:00
parent 8f9e3627ef
commit f893085325
12 changed files with 60 additions and 60 deletions

View File

@@ -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)