diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-10-20 10:22:23 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-10-20 10:22:23 +1300 |
| commit | 1ecb25cdc10116c5341dc1024581365bec328b4e (patch) | |
| tree | 47c7d18aaeca5453182f837ff326e113344c36d7 /netlib/http | |
| parent | f45f4e677e8cddba8160d1e4e02ca8a4515e3456 (diff) | |
| download | mitmproxy-1ecb25cdc10116c5341dc1024581365bec328b4e.tar.gz mitmproxy-1ecb25cdc10116c5341dc1024581365bec328b4e.tar.bz2 mitmproxy-1ecb25cdc10116c5341dc1024581365bec328b4e.zip | |
mitmproxy.types.[basethread,multidict,serializable]
Diffstat (limited to 'netlib/http')
| -rw-r--r-- | netlib/http/cookies.py | 2 | ||||
| -rw-r--r-- | netlib/http/headers.py | 2 | ||||
| -rw-r--r-- | netlib/http/message.py | 6 | ||||
| -rw-r--r-- | netlib/http/request.py | 2 | ||||
| -rw-r--r-- | netlib/http/response.py | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/netlib/http/cookies.py b/netlib/http/cookies.py index cb816ca0..9f32fa5e 100644 --- a/netlib/http/cookies.py +++ b/netlib/http/cookies.py @@ -3,7 +3,7 @@ import email.utils import re import time -from netlib import multidict +from mitmproxy.types import multidict """ A flexible module for cookie parsing and manipulation. diff --git a/netlib/http/headers.py b/netlib/http/headers.py index 6c30d278..8fc0cd43 100644 --- a/netlib/http/headers.py +++ b/netlib/http/headers.py @@ -1,7 +1,7 @@ import re import collections -from netlib import multidict +from mitmproxy.types import multidict from mitmproxy.utils import strutils # See also: http://lucumr.pocoo.org/2013/7/2/the-updated-guide-to-unicode/ diff --git a/netlib/http/message.py b/netlib/http/message.py index 133a53ce..62c3aa38 100644 --- a/netlib/http/message.py +++ b/netlib/http/message.py @@ -4,7 +4,7 @@ from typing import Optional from mitmproxy.utils import strutils from netlib import encoding -from netlib import basetypes +from mitmproxy.types import serializable from netlib.http import headers @@ -17,7 +17,7 @@ def _always_bytes(x): return strutils.always_bytes(x, "utf-8", "surrogateescape") -class MessageData(basetypes.Serializable): +class MessageData(serializable.Serializable): def __eq__(self, other): if isinstance(other, MessageData): return self.__dict__ == other.__dict__ @@ -43,7 +43,7 @@ class MessageData(basetypes.Serializable): return cls(**state) -class Message(basetypes.Serializable): +class Message(serializable.Serializable): def __eq__(self, other): if isinstance(other, Message): return self.data == other.data diff --git a/netlib/http/request.py b/netlib/http/request.py index 3479fa4c..16b0c986 100644 --- a/netlib/http/request.py +++ b/netlib/http/request.py @@ -1,7 +1,7 @@ import re import urllib -from netlib import multidict +from mitmproxy.types import multidict from mitmproxy.utils import strutils from netlib.http import multipart from netlib.http import cookies diff --git a/netlib/http/response.py b/netlib/http/response.py index 12dba92a..4d1d5d24 100644 --- a/netlib/http/response.py +++ b/netlib/http/response.py @@ -1,7 +1,7 @@ import time from email.utils import parsedate_tz, formatdate, mktime_tz from mitmproxy.utils import human -from netlib import multidict +from mitmproxy.types import multidict from netlib.http import cookies from netlib.http import headers as nheaders from netlib.http import message |