From: Logarithmus <Logarithmus@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] s3cmd: backport Python 3.9 compatibility fix
Date: Fri, 13 Nov 2020 09:11:45 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26347@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 481 bytes --]
There is a new pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages s3cmd
https://github.com/void-linux/void-packages/pull/26347
s3cmd: backport Python 3.9 compatibility fix
https://github.com/s3tools/s3cmd/issues/1146 is fixed in `master` by https://github.com/s3tools/s3cmd/pull/1137. This PR adds corresponding patch.
A patch file from https://github.com/void-linux/void-packages/pull/26347.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-s3cmd-26347.patch --]
[-- Type: text/x-diff, Size: 2828 bytes --]
From 7f7e28134d33c714d34e0aba813ae9cbb0c357bf Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Fri, 13 Nov 2020 11:08:47 +0300
Subject: [PATCH] s3cmd: backport Python 3.9 compatibility fix
---
.../patches/python-3.9-compatibility.patch | 36 +++++++++++++++++++
srcpkgs/s3cmd/template | 4 +--
2 files changed, 38 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/s3cmd/patches/python-3.9-compatibility.patch
diff --git a/srcpkgs/s3cmd/patches/python-3.9-compatibility.patch b/srcpkgs/s3cmd/patches/python-3.9-compatibility.patch
new file mode 100644
index 00000000000..292d979aa29
--- /dev/null
+++ b/srcpkgs/s3cmd/patches/python-3.9-compatibility.patch
@@ -0,0 +1,36 @@
+--- S3/Exceptions.py
++++ S3/Exceptions.py
+@@ -126,7 +126,7 @@ class S3Error (S3Exception):
+ if not error_node.tag == "Error":
+ error_node = tree.find(".//Error")
+ if error_node is not None:
+- for child in error_node.getchildren():
++ for child in error_node:
+ if child.text != "":
+ debug("ErrorXML: " + child.tag + ": " + repr(child.text))
+ info[child.tag] = child.text
+--- S3/Utils.py
++++ S3/Utils.py
+@@ -64,9 +64,9 @@ def parseNodes(nodes):
+ retval = []
+ for node in nodes:
+ retval_item = {}
+- for child in node.getchildren():
++ for child in node:
+ name = decode_from_s3(child.tag)
+- if child.getchildren():
++ if list(child):
+ retval_item[name] = parseNodes([child])
+ else:
+ found_text = node.findtext(".//%s" % child.tag)
+@@ -122,8 +122,8 @@ __all__.append("getListFromXml")
+
+ def getDictFromTree(tree):
+ ret_dict = {}
+- for child in tree.getchildren():
+- if child.getchildren():
++ for child in tree:
++ if list(child):
+ ## Complex-type child. Recurse
+ content = getDictFromTree(child)
+ else:
diff --git a/srcpkgs/s3cmd/template b/srcpkgs/s3cmd/template
index 4ec5cf053a8..40cd669dc97 100644
--- a/srcpkgs/s3cmd/template
+++ b/srcpkgs/s3cmd/template
@@ -1,14 +1,14 @@
# Template file for 's3cmd'
pkgname=s3cmd
version=2.1.0
-revision=2
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-dateutil"
short_desc="Command line tool for Amazon S3"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
-#changelog="https://github.com/s3tools/s3cmd/raw/master/NEWS"
+changelog="https://github.com/s3tools/s3cmd/raw/master/NEWS"
homepage="http://s3tools.org/s3cmd"
distfiles="https://github.com/s3tools/${pkgname}/archive/v${version}.tar.gz"
checksum=2293f775fde77201bf8e489f20516fd594168c77897168f129e5c1a2b33b7e37
next reply other threads:[~2020-11-13 8:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 8:11 Logarithmus [this message]
2020-11-13 12:57 ` ericonr
2020-11-13 16:20 ` [PR PATCH] [Updated] " Logarithmus
2020-11-13 16:21 ` Logarithmus
2020-11-14 2:04 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26347@inbox.vuxu.org \
--to=logarithmus@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).