diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-08-16 15:53:07 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-08-16 15:53:07 +0200 |
| commit | 6d1b601ddf070ef1335be1804386fa0f4a2fcbd4 (patch) | |
| tree | 54c3a433a9562759a02bc5b57008c7ff6fe1b3c0 /netlib/socks.py | |
| parent | 1c1167eda0a2757b8fb6588f0400d47020fdb1ab (diff) | |
| download | mitmproxy-6d1b601ddf070ef1335be1804386fa0f4a2fcbd4.tar.gz mitmproxy-6d1b601ddf070ef1335be1804386fa0f4a2fcbd4.tar.bz2 mitmproxy-6d1b601ddf070ef1335be1804386fa0f4a2fcbd4.zip | |
minor cleanups
Diffstat (limited to 'netlib/socks.py')
| -rw-r--r-- | netlib/socks.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/netlib/socks.py b/netlib/socks.py index 97df3478..1da5b6cc 100644 --- a/netlib/socks.py +++ b/netlib/socks.py @@ -1,7 +1,8 @@ +from __future__ import (absolute_import, print_function, division) import socket import struct -from array import array -from . import tcp, utils +import array +from . import tcp class SocksError(Exception): @@ -10,24 +11,24 @@ class SocksError(Exception): self.code = code -class VERSION: +class VERSION(object): SOCKS4 = 0x04 SOCKS5 = 0x05 -class CMD: +class CMD(object): CONNECT = 0x01 BIND = 0x02 UDP_ASSOCIATE = 0x03 -class ATYP: +class ATYP(object): IPV4_ADDRESS = 0x01 DOMAINNAME = 0x03 IPV6_ADDRESS = 0x04 -class REP: +class REP(object): SUCCEEDED = 0x00 GENERAL_SOCKS_SERVER_FAILURE = 0x01 CONNECTION_NOT_ALLOWED_BY_RULESET = 0x02 @@ -39,7 +40,7 @@ class REP: ADDRESS_TYPE_NOT_SUPPORTED = 0x08 -class METHOD: +class METHOD(object): NO_AUTHENTICATION_REQUIRED = 0x00 GSSAPI = 0x01 USERNAME_PASSWORD = 0x02 @@ -56,7 +57,7 @@ class ClientGreeting(object): @classmethod def from_file(cls, f): ver, nmethods = struct.unpack("!BB", f.read(2)) - methods = array("B") + methods = array.array("B") methods.fromstring(f.read(nmethods)) return cls(ver, methods) |