aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http/message.py
diff options
context:
space:
mode:
authorZohar Lorberbaum <zlorber@gmail.com>2016-03-28 10:03:26 -0700
committerZohar Lorberbaum <zlorber@gmail.com>2016-03-28 10:03:26 -0700
commit6d16f44ab723ef23a633b175c1cb4575919b07c4 (patch)
tree2cf1d25543e4e81475aa97207d91a8629ce538dd /netlib/http/message.py
parente56198ae7cf5de1d00c799133d3257434072998e (diff)
downloadmitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.tar.gz
mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.tar.bz2
mitmproxy-6d16f44ab723ef23a633b175c1cb4575919b07c4.zip
Merge with master
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