diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2016-04-03 10:16:06 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2016-04-03 10:16:06 +0200 |
| commit | 16fdbb4f2fcee8f1db4a516d173ec2881161b3ea (patch) | |
| tree | 9e26268baed2151c2aad934c251409f6c25ada61 /netlib/http | |
| parent | 94342891ee17c1647e5071d6591ad413b6650473 (diff) | |
| parent | e6fa2688c9a892cc7a251e572006a9f8951508bc (diff) | |
| download | mitmproxy-16fdbb4f2fcee8f1db4a516d173ec2881161b3ea.tar.gz mitmproxy-16fdbb4f2fcee8f1db4a516d173ec2881161b3ea.tar.bz2 mitmproxy-16fdbb4f2fcee8f1db4a516d173ec2881161b3ea.zip | |
Merge pull request #1073 from mitmproxy/first-line-format
form_(in|out) -> first_line_format
Diffstat (limited to 'netlib/http')
| -rw-r--r-- | netlib/http/http2/connections.py | 8 | ||||
| -rw-r--r-- | netlib/http/request.py | 21 |
2 files changed, 4 insertions, 25 deletions
diff --git a/netlib/http/http2/connections.py b/netlib/http/http2/connections.py index 52fa7193..f900b67c 100644 --- a/netlib/http/http2/connections.py +++ b/netlib/http/http2/connections.py @@ -102,15 +102,15 @@ class HTTP2Protocol(object): port = None if path == '*' or path.startswith("/"): - form_in = "relative" + first_line_format = "relative" elif method == 'CONNECT': - form_in = "authority" + first_line_format = "authority" if ":" in authority: host, port = authority.split(":", 1) else: host = authority else: - form_in = "absolute" + first_line_format = "absolute" # FIXME: verify if path or :host contains what we need scheme, host, port, _ = utils.parse_url(path) scheme = scheme.decode('ascii') @@ -123,7 +123,7 @@ class HTTP2Protocol(object): port = int(port) request = Request( - form_in, + first_line_format, method.encode('ascii'), scheme.encode('ascii'), host.encode('ascii'), diff --git a/netlib/http/request.py b/netlib/http/request.py index 5bd2547e..db4901b7 100644 --- a/netlib/http/request.py +++ b/netlib/http/request.py @@ -358,24 +358,3 @@ class Request(Message): 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: 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: 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: 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: no cover - warnings.warn(".form_out is deprecated, use .first_line_format instead.", DeprecationWarning) - self.first_line_format = form_out - |