From 2f285a6015abaf75ced34231f698537ef210ffed Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Sat, 26 Mar 2016 11:26:42 +0800 Subject: Setting CONTENT_MISSING to None --- netlib/http/message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'netlib') diff --git a/netlib/http/message.py b/netlib/http/message.py index e3d8ce37..4ddc1b81 100644 --- a/netlib/http/message.py +++ b/netlib/http/message.py @@ -7,7 +7,7 @@ import six from .headers import Headers from .. import encoding, utils -CONTENT_MISSING = 0 +CONTENT_MISSING = None if six.PY2: # pragma: nocover _native = lambda x: x -- cgit v1.2.3 From 08ff00f36d49ef53b1d20d7635a74fa46a249c17 Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Sat, 26 Mar 2016 16:00:51 +0800 Subject: replace CONTENT_MISSING with None. --- netlib/http/__init__.py | 4 ++-- netlib/http/http1/assemble.py | 10 ++++------ netlib/http/message.py | 2 -- 3 files changed, 6 insertions(+), 10 deletions(-) (limited to 'netlib') diff --git a/netlib/http/__init__.py b/netlib/http/__init__.py index fd632cd5..917080f7 100644 --- a/netlib/http/__init__.py +++ b/netlib/http/__init__.py @@ -2,13 +2,13 @@ from __future__ import absolute_import, print_function, division from .request import Request from .response import Response from .headers import Headers -from .message import decoded, CONTENT_MISSING +from .message import decoded from . import http1, http2 __all__ = [ "Request", "Response", "Headers", - "decoded", "CONTENT_MISSING", + "decoded", "http1", "http2", ] diff --git a/netlib/http/http1/assemble.py b/netlib/http/http1/assemble.py index 785ee8d3..db5a49ce 100644 --- a/netlib/http/http1/assemble.py +++ b/netlib/http/http1/assemble.py @@ -3,12 +3,10 @@ from __future__ import absolute_import, print_function, division from ... import utils import itertools from ...exceptions import HttpException -from .. import CONTENT_MISSING - def assemble_request(request): - if request.content == CONTENT_MISSING: - raise HttpException("Cannot assemble flow with CONTENT_MISSING") + if request.content == None: + raise HttpException("Cannot assemble flow with None content") head = assemble_request_head(request) body = b"".join(assemble_body(request.data.headers, [request.data.content])) return head + body @@ -21,8 +19,8 @@ def assemble_request_head(request): def assemble_response(response): - if response.content == CONTENT_MISSING: - raise HttpException("Cannot assemble flow with CONTENT_MISSING") + if response.content == None: + raise HttpException("Cannot assemble flow with None content") head = assemble_response_head(response) body = b"".join(assemble_body(response.data.headers, [response.data.content])) return head + body diff --git a/netlib/http/message.py b/netlib/http/message.py index 4ddc1b81..1df0f087 100644 --- a/netlib/http/message.py +++ b/netlib/http/message.py @@ -7,8 +7,6 @@ import six from .headers import Headers from .. import encoding, utils -CONTENT_MISSING = None - if six.PY2: # pragma: nocover _native = lambda x: x _always_bytes = lambda x: x -- cgit v1.2.3 From 66bd27e6f9018832f99be1c211e76c8f71165c92 Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Sat, 26 Mar 2016 17:49:22 +0800 Subject: update comments --- netlib/http/http1/assemble.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'netlib') diff --git a/netlib/http/http1/assemble.py b/netlib/http/http1/assemble.py index db5a49ce..f06ad5a1 100644 --- a/netlib/http/http1/assemble.py +++ b/netlib/http/http1/assemble.py @@ -5,8 +5,8 @@ import itertools from ...exceptions import HttpException def assemble_request(request): - if request.content == None: - raise HttpException("Cannot assemble flow with None content") + if request.content is None: + raise HttpException("Cannot assemble flow with missing content") head = assemble_request_head(request) body = b"".join(assemble_body(request.data.headers, [request.data.content])) return head + body @@ -19,8 +19,8 @@ def assemble_request_head(request): def assemble_response(response): - if response.content == None: - raise HttpException("Cannot assemble flow with None content") + if response.content is None: + raise HttpException("Cannot assemble flow with missing content") head = assemble_response_head(response) body = b"".join(assemble_body(response.data.headers, [response.data.content])) return head + body -- cgit v1.2.3 From ec68d8b8e4a9fc24e45379359f96b3ebc30e381a Mon Sep 17 00:00:00 2001 From: Thomas Kriechbaumer Date: Sun, 27 Mar 2016 12:02:41 +0200 Subject: s/nocover/no cover/g according to coveralls docs --- netlib/http/authentication.py | 2 +- netlib/http/headers.py | 6 +++--- netlib/http/message.py | 6 +++--- netlib/http/request.py | 28 ++++++++++++++-------------- netlib/http/response.py | 8 ++++---- 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'netlib') diff --git a/netlib/http/authentication.py b/netlib/http/authentication.py index d769abe5..6db70fdd 100644 --- a/netlib/http/authentication.py +++ b/netlib/http/authentication.py @@ -140,7 +140,7 @@ class AuthAction(Action): authenticator = BasicProxyAuth(passman, "mitmproxy") setattr(namespace, self.dest, authenticator) - def getPasswordManager(self, s): # pragma: nocover + def getPasswordManager(self, s): # pragma: no cover raise NotImplementedError() diff --git a/netlib/http/headers.py b/netlib/http/headers.py index 78404796..9b8fdae4 100644 --- a/netlib/http/headers.py +++ b/netlib/http/headers.py @@ -8,7 +8,7 @@ from __future__ import absolute_import, print_function, division import copy try: from collections.abc import MutableMapping -except ImportError: # pragma: nocover +except ImportError: # pragma: no cover from collections import MutableMapping # Workaround for Python < 3.3 @@ -16,7 +16,7 @@ import six from netlib.utils import always_byte_args, always_bytes, Serializable -if six.PY2: # pragma: nocover +if six.PY2: # pragma: no cover _native = lambda x: x _always_bytes = lambda x: x _always_byte_args = lambda x: x @@ -106,7 +106,7 @@ class Headers(MutableMapping, Serializable): else: return b"" - if six.PY2: # pragma: nocover + if six.PY2: # pragma: no cover __str__ = __bytes__ @_always_byte_args diff --git a/netlib/http/message.py b/netlib/http/message.py index 1df0f087..b6d846ba 100644 --- a/netlib/http/message.py +++ b/netlib/http/message.py @@ -7,7 +7,7 @@ import six from .headers import Headers from .. import encoding, utils -if six.PY2: # pragma: nocover +if six.PY2: # pragma: no cover _native = lambda x: x _always_bytes = lambda x: x else: @@ -180,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 diff --git a/netlib/http/request.py b/netlib/http/request.py index 1a9b6f18..d35c1874 100644 --- a/netlib/http/request.py +++ b/netlib/http/request.py @@ -100,7 +100,7 @@ class Request(Message): Setting the host attribute also updates the host header, if present. """ - if six.PY2: # pragma: nocover + if six.PY2: # pragma: no cover return self.data.host if not self.data.host: @@ -324,59 +324,59 @@ class Request(Message): # Legacy - def get_cookies(self): # pragma: nocover + def get_cookies(self): # pragma: no cover warnings.warn(".get_cookies is deprecated, use .cookies instead.", DeprecationWarning) return self.cookies - def set_cookies(self, odict): # pragma: nocover + def set_cookies(self, odict): # pragma: no cover warnings.warn(".set_cookies is deprecated, use .cookies instead.", DeprecationWarning) self.cookies = odict - def get_query(self): # pragma: nocover + def get_query(self): # pragma: no cover warnings.warn(".get_query is deprecated, use .query instead.", DeprecationWarning) return self.query or ODict([]) - def set_query(self, odict): # pragma: nocover + def set_query(self, odict): # pragma: no cover warnings.warn(".set_query is deprecated, use .query instead.", DeprecationWarning) self.query = odict - def get_path_components(self): # pragma: nocover + def get_path_components(self): # pragma: no cover warnings.warn(".get_path_components is deprecated, use .path_components instead.", DeprecationWarning) return self.path_components - def set_path_components(self, lst): # pragma: nocover + def set_path_components(self, lst): # pragma: no cover warnings.warn(".set_path_components is deprecated, use .path_components instead.", DeprecationWarning) self.path_components = lst - def get_form_urlencoded(self): # pragma: nocover + def get_form_urlencoded(self): # pragma: no cover warnings.warn(".get_form_urlencoded is deprecated, use .urlencoded_form instead.", DeprecationWarning) return self.urlencoded_form or ODict([]) - def set_form_urlencoded(self, odict): # pragma: nocover + def set_form_urlencoded(self, odict): # pragma: no cover warnings.warn(".set_form_urlencoded is deprecated, use .urlencoded_form instead.", DeprecationWarning) self.urlencoded_form = odict - def get_form_multipart(self): # pragma: nocover + def get_form_multipart(self): # pragma: no cover warnings.warn(".get_form_multipart is deprecated, use .multipart_form instead.", DeprecationWarning) return self.multipart_form or ODict([]) @property - def form_in(self): # pragma: nocover + def form_in(self): # pragma: no cover warnings.warn(".form_in is deprecated, use .first_line_format instead.", DeprecationWarning) return self.first_line_format @form_in.setter - def form_in(self, form_in): # pragma: nocover + def form_in(self, form_in): # pragma: no cover warnings.warn(".form_in is deprecated, use .first_line_format instead.", DeprecationWarning) self.first_line_format = form_in @property - def form_out(self): # pragma: nocover + def form_out(self): # pragma: no cover warnings.warn(".form_out is deprecated, use .first_line_format instead.", DeprecationWarning) return self.first_line_format @form_out.setter - def form_out(self, form_out): # pragma: nocover + def form_out(self, form_out): # pragma: no cover warnings.warn(".form_out is deprecated, use .first_line_format instead.", DeprecationWarning) self.first_line_format = form_out diff --git a/netlib/http/response.py b/netlib/http/response.py index 8f4d6215..da2c8142 100644 --- a/netlib/http/response.py +++ b/netlib/http/response.py @@ -97,20 +97,20 @@ class Response(Message): # Legacy - def get_cookies(self): # pragma: nocover + def get_cookies(self): # pragma: no cover warnings.warn(".get_cookies is deprecated, use .cookies instead.", DeprecationWarning) return self.cookies - def set_cookies(self, odict): # pragma: nocover + def set_cookies(self, odict): # pragma: no cover warnings.warn(".set_cookies is deprecated, use .cookies instead.", DeprecationWarning) self.cookies = odict @property - def msg(self): # pragma: nocover + def msg(self): # pragma: no cover warnings.warn(".msg is deprecated, use .reason instead.", DeprecationWarning) return self.reason @msg.setter - def msg(self, reason): # pragma: nocover + def msg(self, reason): # pragma: no cover warnings.warn(".msg is deprecated, use .reason instead.", DeprecationWarning) self.reason = reason -- cgit v1.2.3