diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-02-08 04:28:49 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-02-08 04:28:49 +0100 |
| commit | 173ff0b235cdb45a8923f313807d9804830c2a2b (patch) | |
| tree | 84c40269bd4a9913341f913f0566992e8c080114 /netlib | |
| parent | fe0ed63c4a3486402f65638b476149ebba752055 (diff) | |
| download | mitmproxy-173ff0b235cdb45a8923f313807d9804830c2a2b.tar.gz mitmproxy-173ff0b235cdb45a8923f313807d9804830c2a2b.tar.bz2 mitmproxy-173ff0b235cdb45a8923f313807d9804830c2a2b.zip | |
fix py3 compat
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/certutils.py | 3 | ||||
| -rw-r--r-- | netlib/http/message.py | 5 | ||||
| -rw-r--r-- | netlib/tcp.py | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/netlib/certutils.py b/netlib/certutils.py index ecdc0624..616a778e 100644 --- a/netlib/certutils.py +++ b/netlib/certutils.py @@ -12,8 +12,9 @@ from pyasn1.codec.der.decoder import decode from pyasn1.error import PyAsn1Error import OpenSSL +from .utils import Serializable + # Default expiry must not be too long: https://github.com/mitmproxy/mitmproxy/issues/815 -from netlib.utils import Serializable DEFAULT_EXP = 94608000 # = 24 * 60 * 60 * 365 * 3 # Generated with "openssl dhparam". It's too slow to generate this on startup. diff --git a/netlib/http/message.py b/netlib/http/message.py index 3d65f93e..e3d8ce37 100644 --- a/netlib/http/message.py +++ b/netlib/http/message.py @@ -4,7 +4,6 @@ import warnings import six -from netlib.utils import Serializable from .headers import Headers from .. import encoding, utils @@ -19,7 +18,7 @@ else: _always_bytes = lambda x: utils.always_bytes(x, "utf-8", "surrogateescape") -class MessageData(Serializable): +class MessageData(utils.Serializable): def __eq__(self, other): if isinstance(other, MessageData): return self.__dict__ == other.__dict__ @@ -45,7 +44,7 @@ class MessageData(Serializable): return cls(**state) -class Message(Serializable): +class Message(utils.Serializable): def __init__(self, data): self.data = data diff --git a/netlib/tcp.py b/netlib/tcp.py index 2e91a70c..c8548aea 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -16,8 +16,7 @@ import six import OpenSSL from OpenSSL import SSL -from netlib.utils import Serializable -from . import certutils, version_check +from . import certutils, version_check, utils # This is a rather hackish way to make sure that # the latest version of pyOpenSSL is actually installed. @@ -299,7 +298,7 @@ class Reader(_FileLike): raise NotImplementedError("Can only peek into (pyOpenSSL) sockets") -class Address(Serializable): +class Address(utils.Serializable): """ This class wraps an IPv4/IPv6 tuple to provide named attributes and |