Merge ~mateus-morais/ubuntu/+source/lazr.restfulclient:launchpadlib-proposed-migration into ubuntu/+source/lazr.restfulclient:ubuntu/devel

[Mateus Rodrigues de Morais]

This Merge Proposal replaces ConfigParser.readfp (deprecated and removed from Python 3.12) with ConfigParser.read_file when the latter is available.

This will remove the block from python-launchpadlib on the migration of package python3-defaults, which adds support for Python 3.12. The library python-launchpadlib depends on lazr.restfulclient and, as it is currently, it contains a regression due to this Python breaking change.

PPA: https://launchpad.net/~mateus-morais/+archive/ubuntu/lazr.restfulclient-ppa-test

[Mateus Rodrigues de Morais (mateus-morais)]

This has also been forwarded to upstream: https://code.launchpad.net/~mateus-morais/lazr.restfulclient/+git/lazr.restfulclient/+merge/456978

a45f89b... by Mateus Rodrigues de Morais on 2023-12-07

  * d/p/0001-ConfigParser.readfp-was-removed-in-Python-3.12.patch: replaced
    readfp (removed in Python 3.12) with read_file. (LP: #2045169)

638900e... by Mateus Rodrigues de Morais on 2023-12-07

update-maintainer

89d439d... by Mateus Rodrigues de Morais on 2023-12-07

changelog

Unmerged commits

89d439d... by Mateus Rodrigues de Morais on 2023-12-07

changelog

638900e... by Mateus Rodrigues de Morais on 2023-12-07

update-maintainer

a45f89b... by Mateus Rodrigues de Morais on 2023-12-07

  * d/p/0001-ConfigParser.readfp-was-removed-in-Python-3.12.patch: replaced
    readfp (removed in Python 3.12) with read_file. (LP: #2045169)

diff --git a/debian/changelog b/debian/changelog
index 76f49b0..ef246a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lazr.restfulclient (0.14.5-1ubuntu1) noble; urgency=medium
+
+  * d/p/0001-ConfigParser.readfp-was-removed-in-Python-3.12.patch: replaced
+    readfp (removed in Python 3.12) with read_file when it's available.
+    (LP: #2045169)
+
+ -- Mateus Rodrigues de Morais <[e-mail]>  Thu, 07 Dec 2023 10:33:48 -0300
+
 lazr.restfulclient (0.14.5-1) unstable; urgency=medium
 
   [ Stefano Rivera ]
diff --git a/debian/control b/debian/control
index b980521..a6e4bf7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: lazr.restfulclient
 Section: python
 Priority: optional
-Maintainer: Stefano Rivera <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Stefano Rivera <[e-mail]>
 Uploaders: Debian Python Team <[e-mail]>
 Build-Depends:
  debhelper-compat (= 13),
diff --git a/debian/patches/0001-ConfigParser.readfp-was-removed-in-Python-3.12.patch b/debian/patches/0001-ConfigParser.readfp-was-removed-in-Python-3.12.patch
new file mode 100644
index 0000000..b2fa7ce
--- /dev/null
+++ b/debian/patches/0001-ConfigParser.readfp-was-removed-in-Python-3.12.patch
@@ -0,0 +1,25 @@
+From: Mateus Rodrigues de Morais <[e-mail]>
+Date: Wed, 29 Nov 2023 15:32:45 -0300
+Subject: ConfigParser.readfp was removed in Python 3.12. This replaces it
+ with read_file when it is available.
+
+---
+ src/lazr/restfulclient/authorize/oauth.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/lazr/restfulclient/authorize/oauth.py b/src/lazr/restfulclient/authorize/oauth.py
+index 09abf0b..c8dfc6b 100644
+--- a/src/lazr/restfulclient/authorize/oauth.py
++++ b/src/lazr/restfulclient/authorize/oauth.py
+@@ -191,7 +191,10 @@ class OAuthAuthorizer(HttpAuthorizer):
+         """
+         # Attempt to load the access token from the file.
+         parser = SafeConfigParser()
+-        reader = getattr(parser, "read_file", parser.readfp)
++        if hasattr(parser, "read_file"):
++            reader = parser.read_file
++        else:
++            reader = parser.readfp
+         reader(readable_file)
+         # Check the version number and extract the access token and
+         # secret.  Then convert these to the appropriate instances.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..094a092
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-ConfigParser.readfp-was-removed-in-Python-3.12.patch