Control: tags 1028743 + pending
Dear maintainer,
I've prepared an NMU for python-bottle (versioned as 0.12.23-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
I've attached the debdiff to this message, but I've also opened a MR on
Salsa, if you prefer to merge this.
https://salsa.debian.org/debian/python-bottle/-/merge_requests/1
Regards.
--
⢀⣴⠾⠻⢶⣦⠀
⣾⠁⢠⠒⠀⣿⡁ Louis-Philippe Véronneau
⢿⡄⠘⠷⠚⠋ po...@debian.org / veronneau.org
⠈⠳⣄
diff -Nru python-bottle-0.12.23/debian/changelog
python-bottle-0.12.23/debian/changelog
--- python-bottle-0.12.23/debian/changelog 2022-09-17 06:37:25.000000000
-0400
+++ python-bottle-0.12.23/debian/changelog 2023-02-26 15:59:44.000000000
-0500
@@ -1,3 +1,13 @@
+python-bottle (0.12.23-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ James Addison ]
+ * d/patches: add 0004 to disable the local proxy for the tests. (Closes:
+ #1028743)
+
+ -- Louis-Philippe Véronneau <po...@debian.org> Sun, 26 Feb 2023 15:59:44
-0500
+
python-bottle (0.12.23-1) unstable; urgency=medium
* New upstream release
diff -Nru
python-bottle-0.12.23/debian/patches/0004-Localhost-request-no-proxy.patch
python-bottle-0.12.23/debian/patches/0004-Localhost-request-no-proxy.patch
--- python-bottle-0.12.23/debian/patches/0004-Localhost-request-no-proxy.patch
1969-12-31 19:00:00.000000000 -0500
+++ python-bottle-0.12.23/debian/patches/0004-Localhost-request-no-proxy.patch
2023-02-26 15:59:44.000000000 -0500
@@ -0,0 +1,30 @@
+Description: Fix the test_server 'fetch' method to disable proxying within
+ tests cases where it is used. This resolve the connection refused errors due
to
+ the HTTP proxy enabled by default during autopkgtests.
+Author: James Addison <j...@jp-hosting.net>
+--- a/test/test_server.py
++++ b/test/test_server.py
+@@ -11,9 +11,9 @@
+ from bottle import _e
+
+ try:
+- from urllib.request import urlopen
++ from urllib.request import ProxyHandler, build_opener
+ except:
+- from urllib2 import urlopen
++ from urllib2 import ProxyHandler, build_opener
+
+ serverscript = os.path.join(os.path.dirname(__file__), 'servertest.py')
+
+@@ -77,8 +77,10 @@
+ raise AssertionError(line.strip().decode('utf8'))
+
+ def fetch(self, url):
++ proxy_handler = ProxyHandler(proxies={})
++ url_opener = build_opener(proxy_handler)
+ try:
+- return urlopen('http://127.0.0.1:%d/%s' % (self.port, url)).read()
++ return url_opener.open('http://127.0.0.1:%d/%s' % (self.port,
url)).read()
+ except Exception:
+ return repr(_e())
+
diff -Nru python-bottle-0.12.23/debian/patches/series
python-bottle-0.12.23/debian/patches/series
--- python-bottle-0.12.23/debian/patches/series 2022-09-17 06:37:25.000000000
-0400
+++ python-bottle-0.12.23/debian/patches/series 2023-02-26 15:50:45.000000000
-0500
@@ -1,3 +1,4 @@
0001-Remove-bottle.py-from-scripts.patch
0002-Add-CLI-manpage.patch
0003-Disable-failing-tests.patch
+0004-Localhost-request-no-proxy.patch
