From fb22f2ff4f75783ba786935c93b75f372ede21f5 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 17:11:21 +1300 Subject: Zap object base class --- netlib/tcp.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'netlib/tcp.py') diff --git a/netlib/tcp.py b/netlib/tcp.py index e4e134c4..a0e0b69d 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -72,7 +72,7 @@ sslversion_choices = { } -class SSLKeyLogger(object): +class SSLKeyLogger(): def __init__(self, filename): self.filename = filename @@ -111,7 +111,7 @@ log_ssl_key = SSLKeyLogger.create_logfun( os.getenv("MITMPROXY_SSLKEYLOGFILE") or os.getenv("SSLKEYLOGFILE")) -class _FileLike(object): +class _FileLike(): BLOCKSIZE = 1024 * 32 def __init__(self, o): @@ -426,7 +426,7 @@ def close_socket(sock): sock.close() -class _Connection(object): +class _Connection(): rbufsize = -1 wbufsize = -1 @@ -574,7 +574,7 @@ class _Connection(object): return context -class ConnectionCloser(object): +class ConnectionCloser(): def __init__(self, conn): self.conn = conn self._canceled = False @@ -888,7 +888,7 @@ class Counter: self._count -= 1 -class TCPServer(object): +class TCPServer(): request_queue_size = 20 def __init__(self, address): -- cgit v1.2.3 From a647b30365593a4a3056fcf6936f5441ab9eda88 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 17:29:45 +1300 Subject: python3: clean up class brackets --- netlib/tcp.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'netlib/tcp.py') diff --git a/netlib/tcp.py b/netlib/tcp.py index a0e0b69d..05ceef5a 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -72,7 +72,7 @@ sslversion_choices = { } -class SSLKeyLogger(): +class SSLKeyLogger: def __init__(self, filename): self.filename = filename @@ -111,7 +111,7 @@ log_ssl_key = SSLKeyLogger.create_logfun( os.getenv("MITMPROXY_SSLKEYLOGFILE") or os.getenv("SSLKEYLOGFILE")) -class _FileLike(): +class _FileLike: BLOCKSIZE = 1024 * 32 def __init__(self, o): @@ -426,7 +426,7 @@ def close_socket(sock): sock.close() -class _Connection(): +class _Connection: rbufsize = -1 wbufsize = -1 @@ -574,7 +574,7 @@ class _Connection(): return context -class ConnectionCloser(): +class ConnectionCloser: def __init__(self, conn): self.conn = conn self._canceled = False @@ -888,7 +888,7 @@ class Counter: self._count -= 1 -class TCPServer(): +class TCPServer: request_queue_size = 20 def __init__(self, address): -- cgit v1.2.3 From c774a9fec93feedc37a450400a03b83f5f4cb4b9 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 17 Oct 2016 17:34:46 +1300 Subject: python3: clean up super and __future__ --- netlib/tcp.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'netlib/tcp.py') diff --git a/netlib/tcp.py b/netlib/tcp.py index 05ceef5a..aeb1d447 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -1,4 +1,3 @@ -from __future__ import (absolute_import, print_function, division) import os import select import socket @@ -597,7 +596,7 @@ class ConnectionCloser: class TCPClient(_Connection): def __init__(self, address, source_address=None, spoof_source_address=None): - super(TCPClient, self).__init__(None) + super().__init__(None) self.address = address self.source_address = source_address self.cert = None @@ -769,7 +768,7 @@ class BaseHandler(_Connection): """ def __init__(self, connection, address, server): - super(BaseHandler, self).__init__(connection) + super().__init__(connection) self.address = Address.wrap(address) self.server = server self.clientcert = None -- cgit v1.2.3