Sync from SUSE:SLFO:1.1 python-httpbin revision dfcb0978467612f29b3b0f3b6afc3ada

flask3.patch

@@ -0,0 +1,109 @@
+From c1d9e33049263fed3cb27806a97f094acc350905 Mon Sep 17 00:00:00 2001
+From: Nate Prewitt <nate.prewitt@gmail.com>
+Date: Thu, 12 Oct 2023 08:30:42 -0700
+Subject: [PATCH] Support Flask 3.0 (#29)
+
+---
+ httpbin/core.py    |  8 +++-----
+ httpbin/helpers.py | 21 ++++++++++++++++-----
+ pyproject.toml     |  3 +--
+ 3 files changed, 20 insertions(+), 12 deletions(-)
+
+diff --git a/httpbin/core.py b/httpbin/core.py
+index 5c1783a1..a82c1b88 100644
+--- a/httpbin/core.py
++++ b/httpbin/core.py
+@@ -32,7 +32,7 @@
+     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 @@
+     H,
+     ROBOT_TXT,
+     ANGRY_ASCII,
++    parse_authorization_header,
+     parse_multi_value_header,
+     next_stale_after_value,
+     digest_challenge_response,
+@@ -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
+ 
+diff --git a/httpbin/helpers.py b/httpbin/helpers.py
+index b29e1835..836c8026 100644
+--- a/httpbin/helpers.py
++++ b/httpbin/helpers.py
+@@ -13,8 +13,14 @@
+ 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
+diff --git a/pyproject.toml b/pyproject.toml
+index 020457ec..9454e569 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -31,14 +31,13 @@ classifiers = [
+     "Programming Language :: Python :: 3.12",
+ ]
+ dependencies = [
+-    "Flask",
++    "flask >= 2.2.4",
+     "brotlicffi",
+     "decorator",
+     "flasgger",
+     '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",
+ ]
+ 

python-httpbin.changes

@@ -1,17 +1,3 @@
--------------------------------------------------------------------
-Tue Jan 28 01:22:41 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
-
-- Add patch remove-six.patch:
-  * Remove use of six.
-
--------------------------------------------------------------------
-Tue Oct  1 14:35:38 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
-
-- Update to 0.10.2
-  * Added support for Flask 3.0
-- Drop flask3.patch, merged upstream
-- Update Requires from setup.py
-
 -------------------------------------------------------------------
 Tue Oct 24 13:30:26 UTC 2023 - Markéta Machová <mmachova@suse.com>
 

python-httpbin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-httpbin
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,14 +19,14 @@
 %define modname httpbin
 %{?sle15_python_module_pythons}
 Name:           python-httpbin
-Version:        0.10.2
+Version:        0.10.1
 Release:        0
 Summary:        HTTP Request and Response Service
 License:        MIT
 URL:            https://github.com/psf/httpbin
 Source:         https://files.pythonhosted.org/packages/source/h/%{modname}/%{modname}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM gh#psf/httpbin#40
+# PATCH-FIX-UPSTREAM https://github.com/psf/httpbin/pull/29 Support Flask 3.0
-Patch0:         remove-six.patch
+Patch:          flask3.patch
 BuildRequires:  %{python_module Brotli}
 BuildRequires:  %{python_module Flask >= 2.2.4}
 BuildRequires:  %{python_module Werkzeug >= 2.0}
@@ -41,10 +41,11 @@ BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-Brotli
 Requires:       python-Flask >= 2.2.4
-Requires:       python-Werkzeug >= 2.2.2
+Requires:       python-Werkzeug >= 2.0
 Requires:       python-decorator
 Requires:       python-flasgger
 Requires:       python-gevent
+Requires:       python-six
 BuildArch:      noarch
 %python_subpackages
 
@@ -79,6 +80,6 @@ export LANG=en_US.UTF-8
 %doc README.md
 %license LICENSE
 %{python_sitelib}/httpbin
-%{python_sitelib}/httpbin-%{version}.dist-info
+%{python_sitelib}/httpbin-%{version}*-info
 
 %changelog

remove-six.patch

@@ -1,57 +0,0 @@
-From 17d02f215e18df999facc20808f47fcbb72f3a18 Mon Sep 17 00:00:00 2001
-From: Alexandre Detiste <alexandre.detiste@gmail.com>
-Date: Fri, 5 Jan 2024 15:21:04 +0100
-Subject: [PATCH] cleanup remaining usage of "six"
-
----
- httpbin/filters.py | 2 +-
- httpbin/helpers.py | 3 ++-
- pyproject.toml     | 1 -
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/httpbin/filters.py b/httpbin/filters.py
-index 4deeaaad..a656279e 100644
---- a/httpbin/filters.py
-+++ b/httpbin/filters.py
-@@ -12,7 +12,7 @@
- 
- import brotlicffi as _brotli
- 
--from six import BytesIO
-+from io import BytesIO
- from decimal import Decimal
- from time import time as now
- 
-diff --git a/httpbin/helpers.py b/httpbin/helpers.py
-index 836c8026..cdf045c0 100644
---- a/httpbin/helpers.py
-+++ b/httpbin/helpers.py
-@@ -13,6 +13,8 @@
- import time
- import os
- from hashlib import md5, sha256, sha512
-+from urllib.parse import urlparse, urlunparse
-+
- from werkzeug.datastructures import WWWAuthenticate
- from werkzeug.http import dump_header
- 
-@@ -23,7 +25,6 @@
-     parse_authorization_header = Authorization.from_header
- 
- from flask import request, make_response
--from six.moves.urllib.parse import urlparse, urlunparse
- 
- 
- from .structures import CaseInsensitiveDict
-diff --git a/pyproject.toml b/pyproject.toml
-index c5bdb811..b82f7b6f 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -38,7 +38,6 @@ dependencies = [
-     'greenlet < 3.0; python_version<"3.12"',
-     'greenlet >= 3.0.0a1; python_version>="3.12.0rc0"',
-     'importlib-metadata; python_version<"3.8"',
--    "six",
-     "werkzeug >= 2.2.2",
- ]
-