aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http/message.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-03-31 18:07:58 +0200
committerMaximilian Hils <git@maximilianhils.com>2016-03-31 18:07:58 +0200
commitc788e18e03e22bccb7c08eb7ac8283f3732aa50d (patch)
tree6cd4f99c6570a5c4e7f00a48f91cba147c5b4974 /netlib/http/message.py
parent5552b5e782deaa510ebb00f337e39e99ac452aae (diff)
parentde0f2cbcd349005a07679283befa2d209bd9d022 (diff)
downloadmitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.tar.gz
mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.tar.bz2
mitmproxy-c788e18e03e22bccb7c08eb7ac8283f3732aa50d.zip
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
Diffstat (limited to 'netlib/http/message.py')
-rw-r--r--netlib/http/message.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/netlib/http/message.py b/netlib/http/message.py
index e3d8ce37..b6d846ba 100644
--- a/netlib/http/message.py
+++ b/netlib/http/message.py
@@ -7,9 +7,7 @@ import six
from .headers import Headers
from .. import encoding, utils
-CONTENT_MISSING = 0
-
-if six.PY2: # pragma: nocover
+if six.PY2: # pragma: no cover
_native = lambda x: x
_always_bytes = lambda x: x
else:
@@ -182,12 +180,12 @@ class Message(utils.Serializable):
# Legacy
@property
- def body(self): # pragma: nocover
+ def body(self): # pragma: no cover
warnings.warn(".body is deprecated, use .content instead.", DeprecationWarning)
return self.content
@body.setter
- def body(self, body): # pragma: nocover
+ def body(self, body): # pragma: no cover
warnings.warn(".body is deprecated, use .content instead.", DeprecationWarning)
self.content = body