summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-06-10 21:29:58 +0200
committerMichał Górny <mgorny@gentoo.org>2020-06-10 22:30:34 +0200
commita3ea150ce6740584732d29fa396bc08ba1c1fb86 (patch)
tree5b3892b023f8d2df8723a4505167f7980b6f1ec4 /dev-python/boto/files/boto-2.49.0-py38.patch
parentdev-python/pip: keyworded 20.0.2 for hppa (diff)
downloadgentoo-a3ea150ce6740584732d29fa396bc08ba1c1fb86.tar.gz
gentoo-a3ea150ce6740584732d29fa396bc08ba1c1fb86.tar.bz2
gentoo-a3ea150ce6740584732d29fa396bc08ba1c1fb86.zip
dev-python/boto: Port to py3.9, fix tests
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/boto/files/boto-2.49.0-py38.patch')
-rw-r--r--dev-python/boto/files/boto-2.49.0-py38.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/dev-python/boto/files/boto-2.49.0-py38.patch b/dev-python/boto/files/boto-2.49.0-py38.patch
new file mode 100644
index 000000000000..0052c6e32e86
--- /dev/null
+++ b/dev-python/boto/files/boto-2.49.0-py38.patch
@@ -0,0 +1,54 @@
+diff --git a/boto/ecs/item.py b/boto/ecs/item.py
+index 79177a31..292b05af 100644
+--- a/boto/ecs/item.py
++++ b/boto/ecs/item.py
+@@ -21,7 +21,7 @@
+
+
+ import xml.sax
+-import cgi
++import html
+ from boto.compat import six, StringIO
+
+ class ResponseGroup(xml.sax.ContentHandler):
+@@ -67,7 +67,7 @@ class ResponseGroup(xml.sax.ContentHandler):
+ return None
+
+ def endElement(self, name, value, connection):
+- self._xml.write("%s</%s>" % (cgi.escape(value).replace("&amp;amp;", "&amp;"), name))
++ self._xml.write("%s</%s>" % (html.escape(value).replace("&amp;amp;", "&amp;"), name))
+ if len(self._nodepath) == 0:
+ return
+ obj = None
+diff --git a/tests/unit/utils/test_utils.py b/tests/unit/utils/test_utils.py
+index db15b56d..89d1a524 100644
+--- a/tests/unit/utils/test_utils.py
++++ b/tests/unit/utils/test_utils.py
+@@ -85,7 +85,7 @@ class TestPassword(unittest.TestCase):
+ def hmac_hashfunc(cls, msg):
+ if not isinstance(msg, bytes):
+ msg = msg.encode('utf-8')
+- return hmac.new(b'mysecretkey', msg)
++ return hmac.new(b'mysecretkey', msg, digestmod='MD5')
+
+ class HMACPassword(Password):
+ hashfunc = hmac_hashfunc
+@@ -95,15 +95,15 @@ class TestPassword(unittest.TestCase):
+ password.set('foo')
+
+ self.assertEquals(str(password),
+- hmac.new(b'mysecretkey', b'foo').hexdigest())
++ hmac.new(b'mysecretkey', b'foo', digestmod='MD5').hexdigest())
+
+ def test_constructor(self):
+- hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg)
++ hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg, digestmod='MD5')
+
+ password = Password(hashfunc=hmac_hashfunc)
+ password.set('foo')
+ self.assertEquals(password.str,
+- hmac.new(b'mysecretkey', b'foo').hexdigest())
++ hmac.new(b'mysecretkey', b'foo', digestmod='MD5').hexdigest())
+
+
+ class TestPythonizeName(unittest.TestCase):