httpbin 0.10.1__tar.gz → 0.10.3__tar.gz

{httpbin-0.10.1 → httpbin-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: httpbin
-Version: 0.10.1
+Version: 0.10.3
 Summary: HTTP Request and Response Service
 Author-email: Kenneth Reitz <me@kennethreitz.org>
 License: MIT or ISC
@@ -12,20 +12,35 @@ Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: ISC License (ISCL)
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.7
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: test
-Provides-Extra: mainapp
 License-File: LICENSE
 License-File: LICENSE.ISC
 License-File: LICENSE.MIT
 License-File: AUTHORS
+Requires-Dist: brotlicffi
+Requires-Dist: decorator
+Requires-Dist: flasgger
+Requires-Dist: flask>=2.2.4
+Requires-Dist: greenlet<3.0; python_version < "3.12"
+Requires-Dist: greenlet>=3.0.0a1; python_version >= "3.12.0rc0"
+Requires-Dist: importlib-metadata; python_version < "3.8"
+Requires-Dist: six
+Requires-Dist: werkzeug>=2.2.2
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: tox; extra == "test"
+Provides-Extra: mainapp
+Requires-Dist: gunicorn; extra == "mainapp"
+Requires-Dist: gevent; extra == "mainapp"
+Dynamic: license-file
 
 # httpbin(1): HTTP Request & Response Service
 
@@ -104,6 +119,12 @@ Releases are triggered on commits tagged with `release-` (for example
 
 
 ## Changelog
+* 0.10.3:
+  - Fixed the /bytes endpoint to return bytes (not bytearray) for WSGI compliance with newer Werkzeug, thanks @swt2c
+  - Dropped support for Python 3.7
+  - Build and publish arm64 Docker images
+* 0.10.2:
+  - Added support for Flask 3.0
 * 0.10.1:
   - Substantial housekeeping, dependency cleanup, image building, and packaging revamp, thanks to @exhuma and @mgorny
 * 0.10.0:

{httpbin-0.10.1 → httpbin-0.10.3}/README.md

@@ -75,6 +75,12 @@ Releases are triggered on commits tagged with `release-` (for example
 
 
 ## Changelog
+* 0.10.3:
+  - Fixed the /bytes endpoint to return bytes (not bytearray) for WSGI compliance with newer Werkzeug, thanks @swt2c
+  - Dropped support for Python 3.7
+  - Build and publish arm64 Docker images
+* 0.10.2:
+  - Added support for Flask 3.0
 * 0.10.1:
   - Substantial housekeeping, dependency cleanup, image building, and packaging revamp, thanks to @exhuma and @mgorny
 * 0.10.0:

{httpbin-0.10.1 → httpbin-0.10.3}/httpbin/core.py

@@ -32,7 +32,7 @@ try:
     from werkzeug.wrappers import Response
 except ImportError:  # werkzeug < 2.1
     from werkzeug.wrappers import BaseResponse as Response
-from werkzeug.http import parse_authorization_header
+
 from flasgger import Swagger, NO_SANITIZER
 
 from . import filters
@@ -47,6 +47,7 @@ from .helpers import (
     H,
     ROBOT_TXT,
     ANGRY_ASCII,
+    parse_authorization_header,
     parse_multi_value_header,
     next_stale_after_value,
     digest_challenge_response,
@@ -88,7 +89,7 @@ tmpl_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "templates")
 
 app = Flask(__name__, template_folder=tmpl_dir)
 app.debug = bool(os.environ.get("DEBUG"))
-app.config["JSONIFY_PRETTYPRINT_REGULAR"] = True
+app.json.compact = False
 
 app.add_template_global("HTTPBIN_TRACKING" in os.environ, name="tracking_enabled")
 
@@ -636,16 +637,13 @@ def redirect_to():
     args_dict = request.args.items()
     args = CaseInsensitiveDict(args_dict)
 
-    # We need to build the response manually and convert to UTF-8 to prevent
-    # werkzeug from "fixing" the URL. This endpoint should set the Location
-    # header to the exact string supplied.
     response = app.make_response("")
     response.status_code = 302
     if "status_code" in args:
         status_code = int(args["status_code"])
         if status_code >= 300 and status_code < 400:
             response.status_code = status_code
-    response.headers["Location"] = args["url"].encode("utf-8")
+    response.headers["Location"] = args["url"]
 
     return response
 
@@ -1451,7 +1449,7 @@ def random_bytes(n):
     response = make_response()
 
     # Note: can't just use os.urandom here because it ignores the seed
-    response.data = bytearray(random.randint(0, 255) for i in range(n))
+    response.data = bytes(random.randint(0, 255) for i in range(n))
     response.content_type = "application/octet-stream"
     return response
 

{httpbin-0.10.1 → httpbin-0.10.3}/httpbin/helpers.py

@@ -13,8 +13,14 @@ import re
 import time
 import os
 from hashlib import md5, sha256, sha512
-from werkzeug.http import parse_authorization_header
 from werkzeug.datastructures import WWWAuthenticate
+from werkzeug.http import dump_header
+
+try:
+    from werkzeug.http import parse_authorization_header
+except ImportError: # werkzeug < 2.3
+    from werkzeug.datastructures import Authorization
+    parse_authorization_header = Authorization.from_header
 
 from flask import request, make_response
 from six.moves.urllib.parse import urlparse, urlunparse
@@ -466,9 +472,14 @@ def digest_challenge_response(app, qop, algorithm, stale = False):
     ]), algorithm)
     opaque = H(os.urandom(10), algorithm)
 
-    auth = WWWAuthenticate("digest")
-    auth.set_digest('me@kennethreitz.com', nonce, opaque=opaque,
-                    qop=('auth', 'auth-int') if qop is None else (qop,), algorithm=algorithm)
-    auth.stale = stale
+    values = {
+        'realm': 'me@kennethreitz.com',
+        'nonce': nonce,
+        'opaque': opaque,
+        'qop': dump_header(('auth', 'auth-int') if qop is None else (qop,)),
+        'algorithm': algorithm,
+        'stale': stale,
+    }
+    auth = WWWAuthenticate("digest", values=values)
     response.headers['WWW-Authenticate'] = auth.to_header()
     return response

{httpbin-0.10.1 → httpbin-0.10.3}/httpbin.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: httpbin
-Version: 0.10.1
+Version: 0.10.3
 Summary: HTTP Request and Response Service
 Author-email: Kenneth Reitz <me@kennethreitz.org>
 License: MIT or ISC
@@ -12,20 +12,35 @@ Classifier: Natural Language :: English
 Classifier: License :: OSI Approved :: ISC License (ISCL)
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.7
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: test
-Provides-Extra: mainapp
 License-File: LICENSE
 License-File: LICENSE.ISC
 License-File: LICENSE.MIT
 License-File: AUTHORS
+Requires-Dist: brotlicffi
+Requires-Dist: decorator
+Requires-Dist: flasgger
+Requires-Dist: flask>=2.2.4
+Requires-Dist: greenlet<3.0; python_version < "3.12"
+Requires-Dist: greenlet>=3.0.0a1; python_version >= "3.12.0rc0"
+Requires-Dist: importlib-metadata; python_version < "3.8"
+Requires-Dist: six
+Requires-Dist: werkzeug>=2.2.2
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: tox; extra == "test"
+Provides-Extra: mainapp
+Requires-Dist: gunicorn; extra == "mainapp"
+Requires-Dist: gevent; extra == "mainapp"
+Dynamic: license-file
 
 # httpbin(1): HTTP Request & Response Service
 
@@ -104,6 +119,12 @@ Releases are triggered on commits tagged with `release-` (for example
 
 
 ## Changelog
+* 0.10.3:
+  - Fixed the /bytes endpoint to return bytes (not bytearray) for WSGI compliance with newer Werkzeug, thanks @swt2c
+  - Dropped support for Python 3.7
+  - Build and publish arm64 Docker images
+* 0.10.2:
+  - Added support for Flask 3.0
 * 0.10.1:
   - Substantial housekeeping, dependency cleanup, image building, and packaging revamp, thanks to @exhuma and @mgorny
 * 0.10.0:

{httpbin-0.10.1 → httpbin-0.10.3}/httpbin.egg-info/requires.txt

@@ -1,9 +1,9 @@
-Flask
 brotlicffi
 decorator
 flasgger
-werkzeug>=0.14.1
+flask>=2.2.4
 six
+werkzeug>=2.2.2
 
 [:python_version < "3.12"]
 greenlet<3.0

{httpbin-0.10.1 → httpbin-0.10.3}/pyproject.toml

@@ -8,8 +8,8 @@ Repository = "https://github.com/psf/httpbin"
 
 [project]
 name = "httpbin"
-version = "0.10.1"
-requires-python = ">=3.7"
+version = "0.10.3"
+requires-python = ">=3.8"
 description = "HTTP Request and Response Service"
 readme = "README.md"
 license = {text = "MIT or ISC"}
@@ -23,23 +23,24 @@ classifiers = [
     "License :: OSI Approved :: ISC License (ISCL)",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-    "Flask",
     "brotlicffi",
     "decorator",
     "flasgger",
+    "flask >= 2.2.4",
     'greenlet < 3.0; python_version<"3.12"',
     'greenlet >= 3.0.0a1; python_version>="3.12.0rc0"',
     'importlib-metadata; python_version<"3.8"',
-    "werkzeug >= 0.14.1",
     "six",
+    "werkzeug >= 2.2.2",
 ]
 
 [project.optional-dependencies]

{httpbin-0.10.1 → httpbin-0.10.3}/tests/test_httpbin.py

@@ -146,10 +146,9 @@ class HttpbinTestCase(unittest.TestCase):
         self.assertEqual(response.status_code, 200)
         data = json.loads(response.data.decode('utf-8'))
         self.assertEqual(data['args'], {})
-        self.assertEqual(data['headers']['Host'], 'localhost')
         self.assertEqual(data['headers']['User-Agent'], 'test')
         # self.assertEqual(data['origin'], None)
-        self.assertEqual(data['url'], 'http://localhost/get')
+        self.assertRegex(data['url'], '^http://[^/]*/get$')
         self.assertTrue(response.data.endswith(b'\n'))
 
     def test_anything(self):
@@ -159,8 +158,7 @@ class HttpbinTestCase(unittest.TestCase):
         self.assertEqual(response.status_code, 200)
         data = json.loads(response.data.decode('utf-8'))
         self.assertEqual(data['args'], {})
-        self.assertEqual(data['headers']['Host'], 'localhost')
-        self.assertEqual(data['url'], 'http://localhost/anything/foo/bar')
+        self.assertRegex(data['url'], '^http://[^/]*/anything/foo/bar$')
         self.assertEqual(data['method'], 'GET')
         self.assertTrue(response.data.endswith(b'\n'))
 
@@ -521,6 +519,19 @@ class HttpbinTestCase(unittest.TestCase):
             response.data, b'\xc5\xd7\x14\x84\xf8\xcf\x9b\xf4\xb7o'
         )
 
+    def test_bytes_endpoint_yields_bytes(self):
+        """WSGI bodies must be bytes (not bytearray) so strict servers
+        (wsgiref / pytest-httpbin) don't 500. The test client coerces the
+        body, so we inspect the raw WSGI iterable. Regression for /bytes."""
+        from werkzeug.test import create_environ
+        env = create_environ('/bytes/64', 'http://localhost/')
+        chunks = list(httpbin.app(env, lambda *a, **k: None))
+        self.assertTrue(chunks, "no body produced")
+        self.assertTrue(
+            all(type(c) is bytes for c in chunks),
+            [type(c).__name__ for c in chunks]
+        )
+
     def test_delete_endpoint_returns_body(self):
         response = self.app.delete(
             '/delete',
@@ -581,8 +592,8 @@ class HttpbinTestCase(unittest.TestCase):
 
     def test_redirect_absolute_param_n_higher_than_1(self):
         response = self.app.get('/redirect/5?absolute=true')
-        self.assertEqual(
-            response.headers.get('Location'), 'http://localhost/absolute-redirect/4'
+        self.assertRegex(
+            response.headers.get('Location'), '^http://[^/]*/absolute-redirect/4$'
         )
 
     def test_redirect_n_equals_to_1(self):
@@ -607,15 +618,15 @@ class HttpbinTestCase(unittest.TestCase):
 
     def test_absolute_redirect_n_higher_than_1(self):
         response = self.app.get('/absolute-redirect/5')
-        self.assertEqual(
-            response.headers.get('Location'), 'http://localhost/absolute-redirect/4'
+        self.assertRegex(
+            response.headers.get('Location'), '^http://[^/]*/absolute-redirect/4$'
         )
 
     def test_absolute_redirect_n_equals_to_1(self):
         response = self.app.get('/absolute-redirect/1')
         self.assertEqual(response.status_code, 302)
-        self.assertEqual(
-            response.headers.get('Location'), 'http://localhost/get'
+        self.assertRegex(
+            response.headers.get('Location'), '^http://[^/]*/get$'
         )
 
     def test_request_range(self):