geventhttpclient 2.3.3__tar.gz → 2.3.4__tar.gz

{geventhttpclient-2.3.3/src/geventhttpclient.egg-info → geventhttpclient-2.3.4}/PKG-INFO

@@ -1,31 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: geventhttpclient
-Version: 2.3.3
+Version: 2.3.4
 Summary: HTTP client library for gevent
 Author-email: Antonin Amand <antonin.amand@gmail.com>
-License: This software is licensed under the MIT License.
-        
-        Copyright Antonin Amand <antonin.amand@gmail.com>, 2018.
-        
-        Permission is hereby granted, free of charge, to any person obtaining a
-        copy of this software and associated documentation files (the
-        "Software"), to deal in the Software without restriction, including
-        without limitation the rights to use, copy, modify, merge, publish,
-        distribute, sublicense, and/or sell copies of the Software, and to permit
-        persons to whom the Software is furnished to do so, subject to the
-        following conditions:
-        
-        The above copyright notice and this permission notice shall be included
-        in all copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-        OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-        NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-        DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-        OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-        USE OR OTHER DEALINGS IN THE SOFTWARE.
-        
+License-Expression: MIT
 Project-URL: homepage, http://github.com/geventhttpclient/geventhttpclient
 Project-URL: issues, http://github.com/geventhttpclient/geventhttpclient/issues
 Project-URL: download, https://pypi.org/project/geventhttpclient/#files
@@ -33,7 +11,6 @@ Keywords: http,gevent,client
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -60,6 +37,7 @@ Requires-Dist: urllib3; extra == "benchmarks"
 Requires-Dist: httplib2; extra == "benchmarks"
 Provides-Extra: examples
 Requires-Dist: oauth2; extra == "examples"
+Dynamic: license-file
 
 [![GitHub Workflow CI Status](https://img.shields.io/github/actions/workflow/status/geventhttpclient/geventhttpclient/test.yml?branch=master&logo=github&style=flat)](https://github.com/geventhttpclient/geventhttpclient/actions)
 [![PyPI](https://img.shields.io/pypi/v/geventhttpclient.svg?style=flat)](https://pypi.org/project/geventhttpclient/)

{geventhttpclient-2.3.3 → geventhttpclient-2.3.4}/pyproject.toml

@@ -5,18 +5,17 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "geventhttpclient"
-version = "2.3.3" # don't forget to update version __init__.py as well
+version = "2.3.4" # don't forget to update version __init__.py as well
 description = "HTTP client library for gevent"
 readme = "README.md"
 requires-python = ">=3.9"
-license = {file = "LICENSE-MIT"}
+license = "MIT"
 keywords = ["http", "gevent", "client"]
 authors = [{name = "Antonin Amand", email = "antonin.amand@gmail.com"}]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Intended Audience :: Information Technology",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.9",

{geventhttpclient-2.3.3 → geventhttpclient-2.3.4}/src/geventhttpclient/__init__.py

@@ -1,6 +1,6 @@
 # package
 
-__version__ = "2.3.3"  # don't forget to update version in pyproject.toml as well
+__version__ = "2.3.4"  # don't forget to update version in pyproject.toml as well
 
 from geventhttpclient.api import delete, get, head, options, patch, post, put, request
 from geventhttpclient.client import HTTPClient

{geventhttpclient-2.3.3 → geventhttpclient-2.3.4}/src/geventhttpclient/url.py

@@ -33,9 +33,6 @@ class URL:
         if params is not None:
             new_params = _encode_params(params)
             query = query + "&" + new_params if query else new_params
-        if query:
-            # get a little closer to the behaviour of requests.utils.requote_uri
-            query = query.replace(" ", "%20")
         self._parsed = urlparse.ParseResult(scheme, netloc, path, parsed_params, query, fragment)
 
     def __str__(self):
@@ -109,6 +106,14 @@ class URL:
         parsed = urlparse.ParseResult(scheme, netloc, path, params, query, fragment)
         return type(self)(parsed)
 
+    @property
+    def quoted(self):
+        return requote_uri(str(self))
+
+    @property
+    def quoted_uri(self):
+        return requote_uri(self.request_uri)
+
 
 def _encode_params(data):
     """Encode parameters in a piece of data.
@@ -158,3 +163,64 @@ def to_key_val_list(value):
         value = value.items()
 
     return list(value)
+
+
+class InvalidURL(Exception):
+    pass
+
+
+# The following functions are taken from requests
+# Copyright of the original requests project:
+# :copyright: (c) 2012 by Kenneth Reitz.
+# :license: Apache2, see LICENSE for more details.
+
+# The unreserved URI characters (RFC 3986)
+UNRESERVED_SET = frozenset(
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + "0123456789-._~"
+)
+
+
+def unquote_unreserved(uri):
+    """Un-escape any percent-escape sequences in a URI that are unreserved
+    characters. This leaves all reserved, illegal and non-ASCII bytes encoded.
+
+    :rtype: str
+    """
+    parts = uri.split("%")
+    for i in range(1, len(parts)):
+        h = parts[i][0:2]
+        if len(h) == 2 and h.isalnum():
+            try:
+                c = chr(int(h, 16))
+            except ValueError:
+                raise InvalidURL(f"Invalid percent-escape sequence: '{h}'")
+
+            if c in UNRESERVED_SET:
+                parts[i] = c + parts[i][2:]
+            else:
+                parts[i] = f"%{parts[i]}"
+        else:
+            parts[i] = f"%{parts[i]}"
+    return "".join(parts)
+
+
+def requote_uri(uri):
+    """Re-quote the given URI.
+
+    This function passes the given URI through an unquote/quote cycle to
+    ensure that it is fully and consistently quoted.
+
+    :rtype: str
+    """
+    safe_with_percent = "!#$%&'()*+,/:;=?@[]~"
+    safe_without_percent = "!#$&'()*+,/:;=?@[]~"
+    try:
+        # Unquote only the unreserved characters
+        # Then quote only illegal characters (do not quote reserved,
+        # unreserved, or '%')
+        return urlparse.quote(unquote_unreserved(uri), safe=safe_with_percent)
+    except InvalidURL:
+        # We couldn't unquote the given URI, so let's try quoting it, but
+        # there may be unquoted '%'s in the URI. We need to make sure they're
+        # properly quoted so they do not cause issues elsewhere.
+        return urlparse.quote(uri, safe=safe_without_percent)

{geventhttpclient-2.3.3 → geventhttpclient-2.3.4}/src/geventhttpclient/useragent.py

@@ -457,7 +457,7 @@ class UserAgent:
         client = self.clientpool.get_client(request.url_split)
         resp = client.request(
             request.method,
-            request.url_split.request_uri,
+            request.url_split.quoted_uri,
             body=request.payload,
             headers=request.headers,
         )

{geventhttpclient-2.3.3 → geventhttpclient-2.3.4/src/geventhttpclient.egg-info}/PKG-INFO

@@ -1,31 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: geventhttpclient
-Version: 2.3.3
+Version: 2.3.4
 Summary: HTTP client library for gevent
 Author-email: Antonin Amand <antonin.amand@gmail.com>
-License: This software is licensed under the MIT License.
-        
-        Copyright Antonin Amand <antonin.amand@gmail.com>, 2018.
-        
-        Permission is hereby granted, free of charge, to any person obtaining a
-        copy of this software and associated documentation files (the
-        "Software"), to deal in the Software without restriction, including
-        without limitation the rights to use, copy, modify, merge, publish,
-        distribute, sublicense, and/or sell copies of the Software, and to permit
-        persons to whom the Software is furnished to do so, subject to the
-        following conditions:
-        
-        The above copyright notice and this permission notice shall be included
-        in all copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-        OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-        NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-        DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-        OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-        USE OR OTHER DEALINGS IN THE SOFTWARE.
-        
+License-Expression: MIT
 Project-URL: homepage, http://github.com/geventhttpclient/geventhttpclient
 Project-URL: issues, http://github.com/geventhttpclient/geventhttpclient/issues
 Project-URL: download, https://pypi.org/project/geventhttpclient/#files
@@ -33,7 +11,6 @@ Keywords: http,gevent,client
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -60,6 +37,7 @@ Requires-Dist: urllib3; extra == "benchmarks"
 Requires-Dist: httplib2; extra == "benchmarks"
 Provides-Extra: examples
 Requires-Dist: oauth2; extra == "examples"
+Dynamic: license-file
 
 [![GitHub Workflow CI Status](https://img.shields.io/github/actions/workflow/status/geventhttpclient/geventhttpclient/test.yml?branch=master&logo=github&style=flat)](https://github.com/geventhttpclient/geventhttpclient/actions)
 [![PyPI](https://img.shields.io/pypi/v/geventhttpclient.svg?style=flat)](https://pypi.org/project/geventhttpclient/)

{geventhttpclient-2.3.3 → geventhttpclient-2.3.4}/tests/test_ssl.py

@@ -164,7 +164,7 @@ def sni_checker_server():
     def run(sock):
         while True:
             conn, addr = sock.accept()
-            client_hello = conn.recv(1024)
+            client_hello = conn.recv(4096)
             return extract_sni_from_client_hello(client_hello)
 
     def extract_sni_from_client_hello(hello_packet):

{geventhttpclient-2.3.3 → geventhttpclient-2.3.4}/tests/test_url.py

@@ -41,13 +41,22 @@ def test_params_urlencoded():
     assert url.fragment == "frag"
 
 
-def test_query_urlencoded():
+def test_quote_spaces():
     url = URL("http://gevent.org/?foo=bar with spaces")
-    assert url.query == "foo=bar%20with%20spaces"
+    assert url.quoted == "http://gevent.org/?foo=bar%20with%20spaces"
+    assert url.quoted_uri == "/?foo=bar%20with%20spaces"
     assert url.host == "gevent.org"
     assert url.port == 80
 
 
+def test_quote_non_ascii():
+    url = URL("http://127.0.0.1:8000/ы")
+    assert url.quoted == "http://127.0.0.1:8000/%D1%8B"
+    assert url.quoted_uri == "/%D1%8B"
+    assert url.host == "127.0.0.1"
+    assert url.port == 8000
+
+
 def test_tuple_unpack():
     url = URL("http://gevent.org/somepath?foo=bar#frag")
     assert len(tuple(url)) == 6