diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-01 09:58:01 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-01 09:58:01 +1200 |
| commit | a061e4587772f4a87eb43d84f2ed358f7cc98fbd (patch) | |
| tree | 1aba05c9d0d6f654fe946897dcb8b5d9127a3de2 /netlib/tcp.py | |
| parent | 06703542037d1c84b0dcb60c6d1c500a0d189e93 (diff) | |
| parent | a7abf8b731658b4e7ed8705f7a94a6a62f08d51d (diff) | |
| download | mitmproxy-a061e4587772f4a87eb43d84f2ed358f7cc98fbd.tar.gz mitmproxy-a061e4587772f4a87eb43d84f2ed358f7cc98fbd.tar.bz2 mitmproxy-a061e4587772f4a87eb43d84f2ed358f7cc98fbd.zip | |
Merge branch 'master' of github.com:cortesi/mitmproxy
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 |