Merge pull request #1617 from cortesi/object

python3

1 files changed, 6 insertions, 7 deletions

diff --git a/netlib/socks.py b/netlib/socks.py
index 8d7c5279..9f1adb98 100644
--- a/netlib/socks.py
+++ b/netlib/socks.py
@@ -1,4 +1,3 @@
-from __future__ import (absolute_import, print_function, division)
 import struct
 import array
 import ipaddress
@@ -8,7 +7,7 @@ from netlib import tcp, utils
 
 class SocksError(Exception):
     def __init__(self, code, message):
-        super(SocksError, self).__init__(message)
+        super().__init__(message)
         self.code = code
 
 VERSION = utils.BiDi(
@@ -52,7 +51,7 @@ USERNAME_PASSWORD_VERSION = utils.BiDi(
 )
 
 
-class ClientGreeting(object):
+class ClientGreeting:
     __slots__ = ("ver", "methods")
 
     def __init__(self, ver, methods):
@@ -89,7 +88,7 @@ class ClientGreeting(object):
         f.write(self.methods.tostring())
 
 
-class ServerGreeting(object):
+class ServerGreeting:
     __slots__ = ("ver", "method")
 
     def __init__(self, ver, method):
@@ -117,7 +116,7 @@ class ServerGreeting(object):
         f.write(struct.pack("!BB", self.ver, self.method))
 
 
-class UsernamePasswordAuth(object):
+class UsernamePasswordAuth:
     __slots__ = ("ver", "username", "password")
 
     def __init__(self, ver, username, password):
@@ -147,7 +146,7 @@ class UsernamePasswordAuth(object):
         f.write(self.password.encode())
 
 
-class UsernamePasswordAuthResponse(object):
+class UsernamePasswordAuthResponse:
     __slots__ = ("ver", "status")
 
     def __init__(self, ver, status):
@@ -170,7 +169,7 @@ class UsernamePasswordAuthResponse(object):
         f.write(struct.pack("!BB", self.ver, self.status))
 
 
-class Message(object):
+class Message:
     __slots__ = ("ver", "msg", "atyp", "addr")
 
     def __init__(self, ver, msg, atyp, addr):