Merge ~lvoytek/ubuntu/+source/requests:merge-lp1993439-lunar into ubuntu/+source/requests:debian/sid

[Lena Voytek]

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/requests-merge-lunar

autopkgtest results:

autopkgtest [07:42:42]: @@@@@@@@@@@@@@@@@@@@ summary
python3-requests PASS

[Sergio Durigan Junior (sergiodj)]

I'll take this one.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Lena.

Overall, the merge LGTM. I see you've refreshed the patches we're carrying. You can/should consider squashing those "Refresh" commits with their respective main commits. This is usually done in the "logical" step of the merge.

I think it's worth submitting the patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011276 as a Merge Request on salsa instead. Apparently the maintainer is more responsive there.

Package builds fine and autopkgtest is OK. LGTM with the commit squashing done and the colons removed from the changelog entry. Let me know when it's ready and I'll be happy to sponsor.

review: Approve

6d77a86... by Lena Voytek on 2022-11-29

* Fix autopkgtest when http_proxy, https_proxy or no_proxy variable is set
  (LP: #1974182)

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, lvoytek
Uploaders: sergiodj
MP auto-approved

review: Approve

ac46098... by Lena Voytek on 2022-11-29

reconstruct-changelog

[Lena Voytek (lvoytek)]

Thanks for the review! Fixed the commits and changelog

[Sergio Durigan Junior (sergiodj)]

On Tuesday, November 29 2022, Lena Voytek wrote:

> Thanks for the review! Fixed the commits and changelog

Thanks, Lena.

Uploaded:

$ dput requests_2.28.1+dfsg-1ubuntu1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/requests/requests_2.28.1+dfsg-1ubuntu1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/requests/requests_2.28.1+dfsg-1ubuntu1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading requests_2.28.1+dfsg-1ubuntu1.dsc: done.
  Uploading requests_2.28.1+dfsg.orig.tar.xz: done.
  Uploading requests_2.28.1+dfsg-1ubuntu1.debian.tar.xz: done.
  Uploading requests_2.28.1+dfsg-1ubuntu1_source.buildinfo: done.
  Uploading requests_2.28.1+dfsg-1ubuntu1_source.changes: done.
Successfully uploaded packages.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/debian/changelog b/debian/changelog
index 56d6991..0f3d24e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+requests (2.28.1+dfsg-1ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #1993439). Remaining changes:
+    - Fix autopkgtest when http_proxy, https_proxy or no_proxy variable is set
+      (LP #1974182)
+    - d/p/remove-charset-normalizer-dependency.patch: Remove charset-normalizer
+      as a dependency of requests (LP #1975541)
+
+ -- Lena Voytek <[e-mail]>  Mon, 28 Nov 2022 15:18:43 -0700
+
 requests (2.28.1+dfsg-1) unstable; urgency=medium
 
   [ Lena Voytek ]
@@ -12,6 +22,20 @@ requests (2.28.1+dfsg-1) unstable; urgency=medium
 
  -- Daniele Tricoli <[e-mail]>  Thu, 24 Nov 2022 00:23:09 +0100
 
+requests (2.27.1+dfsg-1ubuntu2) kinetic; urgency=medium
+
+  * d/p/remove-charset-normalizer-dependency.patch: Remove charset-normalizer
+    as a dependency of requests (LP: #1975541)
+
+ -- Lena Voytek <[e-mail]>  Mon, 23 May 2022 15:06:07 -0700
+
+requests (2.27.1+dfsg-1ubuntu1) kinetic; urgency=medium
+
+  * Fix autopkgtest when http_proxy, https_proxy or no_proxy variable is set
+    (LP: #1974182)
+
+ -- Olivier Gayot <[e-mail]>  Thu, 19 May 2022 14:14:07 +0200
+
 requests (2.27.1+dfsg-1) unstable; urgency=medium
 
   [ root ]
diff --git a/debian/control b/debian/control
index 691d7e1..8141f29 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: requests
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Daniele Tricoli <[e-mail]>
 Section: python
 Priority: optional
diff --git a/debian/patches/0002-Fix-tests-with-HTTP-proxy.patch b/debian/patches/0002-Fix-tests-with-HTTP-proxy.patch
new file mode 100644
index 0000000..253a77f
--- /dev/null
+++ b/debian/patches/0002-Fix-tests-with-HTTP-proxy.patch
@@ -0,0 +1,79 @@
+Description: Fix autopkgtest when HTTP/HTTPS proxy is set
+ The pytest suite does not expect the http_proxy, https_proxy and no_proxy
+ variables to be present in the environment. They make pytest fail and
+ therefore autopkgtest fail as well.
+Author: Olivier Gayot <[e-mail]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1011276
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/requests/+bug/1974182
+Forwarded: no
+Last-Update: 2022-11-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/test_requests.py
++++ b/tests/test_requests.py
+@@ -578,8 +578,9 @@
+         ),
+     )
+     def test_errors(self, url, exception):
+-        with pytest.raises(exception):
+-            requests.get(url, timeout=1)
++        with override_environ(http_proxy=None, https_proxy=None):
++            with pytest.raises(exception):
++                requests.get(url, timeout=1)
+ 
+     def test_proxy_error(self):
+         # any proxy related error (address resolution, no route to host, etc) should result in a ProxyError
+@@ -602,14 +603,14 @@
+             requests.get(httpbin(), proxies={"http": "http:///example.com:8080"})
+ 
+     def test_respect_proxy_env_on_send_self_prepared_request(self, httpbin):
+-        with override_environ(http_proxy=INVALID_PROXY):
++        with override_environ(no_proxy=None, http_proxy=INVALID_PROXY):
+             with pytest.raises(ProxyError):
+                 session = requests.Session()
+                 request = requests.Request("GET", httpbin())
+                 session.send(request.prepare())
+ 
+     def test_respect_proxy_env_on_send_session_prepared_request(self, httpbin):
+-        with override_environ(http_proxy=INVALID_PROXY):
++        with override_environ(no_proxy=None, http_proxy=INVALID_PROXY):
+             with pytest.raises(ProxyError):
+                 session = requests.Session()
+                 request = requests.Request("GET", httpbin())
+@@ -617,7 +618,7 @@
+                 session.send(prepared)
+ 
+     def test_respect_proxy_env_on_send_with_redirects(self, httpbin):
+-        with override_environ(http_proxy=INVALID_PROXY):
++        with override_environ(no_proxy=None, http_proxy=INVALID_PROXY):
+             with pytest.raises(ProxyError):
+                 session = requests.Session()
+                 url = httpbin("redirect/1")
+@@ -626,13 +627,13 @@
+                 session.send(request.prepare())
+ 
+     def test_respect_proxy_env_on_get(self, httpbin):
+-        with override_environ(http_proxy=INVALID_PROXY):
++        with override_environ(no_proxy=None, http_proxy=INVALID_PROXY):
+             with pytest.raises(ProxyError):
+                 session = requests.Session()
+                 session.get(httpbin())
+ 
+     def test_respect_proxy_env_on_request(self, httpbin):
+-        with override_environ(http_proxy=INVALID_PROXY):
++        with override_environ(no_proxy=None, http_proxy=INVALID_PROXY):
+             with pytest.raises(ProxyError):
+                 session = requests.Session()
+                 session.request(method="GET", url=httpbin())
+--- a/tests/utils.py
++++ b/tests/utils.py
+@@ -7,7 +7,8 @@
+     save_env = dict(os.environ)
+     for key, value in kwargs.items():
+         if value is None:
+-            del os.environ[key]
++            with contextlib.suppress(KeyError):
++                del os.environ[key]
+         else:
+             os.environ[key] = value
+     try:
diff --git a/debian/patches/remove-charset-normalizer-dependency.patch b/debian/patches/remove-charset-normalizer-dependency.patch
new file mode 100644
index 0000000..cbe58c0
--- /dev/null
+++ b/debian/patches/remove-charset-normalizer-dependency.patch
@@ -0,0 +1,91 @@
+Description: Remove charset-normalizer package as a backup to chardet
+ Since requests can use either chardet or charset-normalizer for character set
+ interpretations, and charset-normalizer is in universe, remove it as a
+ dependency to keep requests in main without issues.
+Forwarded: not-needed
+X-Not-Forwarded-Reason: charset-normalizer being in universe is Ubuntu-specific
+Author: Lena Voytek <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/requests/+bug/1975541
+Last-Update: 2022-11-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/requests/compat.py
++++ b/requests/compat.py
+@@ -7,11 +7,7 @@
+ compatibility until the next major version.
+ """
+ 
+-try:
+-    import chardet
+-except ImportError:
+-    import charset_normalizer as chardet
+-
++import chardet
+ import sys
+ 
+ # -------
+--- a/requests/help.py
++++ b/requests/help.py
+@@ -10,10 +10,7 @@
+ 
+ from . import __version__ as requests_version
+ 
+-try:
+-    import charset_normalizer
+-except ImportError:
+-    charset_normalizer = None
++charset_normalizer = None
+ 
+ try:
+     import chardet
+@@ -112,7 +109,7 @@
+         "implementation": implementation_info,
+         "system_ssl": system_ssl_info,
+         "using_pyopenssl": pyopenssl is not None,
+-        "using_charset_normalizer": chardet is None,
++        "using_charset_normalizer": False,
+         "pyOpenSSL": pyopenssl_info,
+         "urllib3": urllib3_info,
+         "chardet": chardet_info,
+--- a/requests/__init__.py
++++ b/requests/__init__.py
+@@ -44,10 +44,7 @@
+ 
+ from .exceptions import RequestsDependencyWarning
+ 
+-try:
+-    from charset_normalizer import __version__ as charset_normalizer_version
+-except ImportError:
+-    charset_normalizer_version = None
++charset_normalizer_version = None
+ 
+ try:
+     from chardet import __version__ as chardet_version
+--- a/requests/packages.py
++++ b/requests/packages.py
+@@ -1,13 +1,5 @@
+ import sys
+-
+-try:
+-    import chardet
+-except ImportError:
+-    import warnings
+-
+-    import charset_normalizer as chardet
+-
+-    warnings.filterwarnings("ignore", "Trying to detect", module="charset_normalizer")
++import chardet
+ 
+ # This code exists for backwards compatibility reasons.
+ # I don't like it either. Just look the other way. :)
+--- a/setup.py
++++ b/setup.py
+@@ -59,7 +59,7 @@
+     sys.exit()
+ 
+ requires = [
+-    "charset_normalizer>=2,<3",
++    "chardet>=3.0.2,<5",
+     "idna>=2.5,<4",
+     "urllib3>=1.21.1,<1.27",
+     "certifi>=2017.4.17",
diff --git a/debian/patches/series b/debian/patches/series
index db9dfd8..81e1af9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-Remove-remote-images-traking-code-and-ads.patch
+0002-Fix-tests-with-HTTP-proxy.patch
+remove-charset-normalizer-dependency.patch