diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-05-31 21:03:42 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2016-05-31 21:03:42 +1200 |
| commit | a7abf8b731658b4e7ed8705f7a94a6a62f08d51d (patch) | |
| tree | cb86e2e483530f5e1e8b0c5d60839de21fcf7390 /netlib/tcp.py | |
| parent | 2f526393d29b6a03e43d1f6240175b4dfb13dc7d (diff) | |
| parent | 4da125b6a098cc0fd8b1fd2878584beb5df75c6c (diff) | |
| download | mitmproxy-a7abf8b731658b4e7ed8705f7a94a6a62f08d51d.tar.gz mitmproxy-a7abf8b731658b4e7ed8705f7a94a6a62f08d51d.tar.bz2 mitmproxy-a7abf8b731658b4e7ed8705f7a94a6a62f08d51d.zip | |
Merge pull request #1179 from cortesi/reorg
Start reorganising */utils.py
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index c7231dbb..5662c973 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -16,7 +16,7 @@ import six import OpenSSL from OpenSSL import SSL -from . import certutils, version_check, utils +from . import certutils, version_check, basetypes # This is a rather hackish way to make sure that # the latest version of pyOpenSSL is actually installed. @@ -302,7 +302,7 @@ class Reader(_FileLike): raise NotImplementedError("Can only peek into (pyOpenSSL) sockets") -class Address(utils.Serializable): +class Address(basetypes.Serializable): """ This class wraps an IPv4/IPv6 tuple to provide named attributes and |