[arch-commits] Commit in python-boto/trunk (PKGBUILD boto-python-3.8.patch)

[Antonio Rojas]

    Date: Friday, November 1, 2019 @ 08:57:53
  Author: arojas
Revision: 521762

Add fixes for python 3.8

Added:
  python-boto/trunk/boto-python-3.8.patch
Modified:
  python-boto/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   10 ++++++--
 boto-python-3.8.patch |   58 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-01 08:35:32 UTC (rev 521761)
+++ PKGBUILD	2019-11-01 08:57:53 UTC (rev 521762)
@@ -13,10 +13,16 @@
 makedepends=('python-setuptools' 'python2-setuptools')
 checkdepends=('python-nose' 'python2-nose' 'python-mock' 'python2-mock' 'python-requests'
               'python2-requests' 'python-httpretty' 'python2-httpretty')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/boto/boto/archive/$pkgver.tar.gz")
-sha512sums=('43c2679f33ecec9b78d9969329d361cff4fd569b431e8451d849a42882ba4913598bfc7e11561fc54799e6e36e6e75a0299da955232435fb3e56745b2fcb57bc')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/boto/boto/archive/$pkgver.tar.gz"
+         boto-python-3.8.patch)
+sha512sums=('43c2679f33ecec9b78d9969329d361cff4fd569b431e8451d849a42882ba4913598bfc7e11561fc54799e6e36e6e75a0299da955232435fb3e56745b2fcb57bc'
+            '3e32db201adb637d3b6041f9e7be65889f1306042cbed36e4884207cbf772dc8f7691be9a505ec79f111b99c8313e0d42436c1f9a2dfa095de6cc77a7fe4bc6d')
 
 prepare() {
+  (cd boto-$pkgver
+   patch -p1 -i ../boto-python-3.8.patch # Fix escaping with python 3.8
+  )
+
   cp -a boto-$pkgver{,-py2}
 
   cd boto-$pkgver-py2

Added: boto-python-3.8.patch
===================================================================
--- boto-python-3.8.patch	                        (rev 0)
+++ boto-python-3.8.patch	2019-11-01 08:57:53 UTC (rev 521762)
@@ -0,0 +1,58 @@
+diff --git a/boto/ecs/item.py b/boto/ecs/item.py
+index 79177a31..a9504e9d 100644
+--- a/boto/ecs/item.py
++++ b/boto/ecs/item.py
+@@ -21,7 +21,11 @@
+ 
+ 
+ import xml.sax
+-import cgi
++try:
++    from html import escape as html_escape
++except ImportError:
++    # Python 2
++    from cgi import escape as html_escape
+ from boto.compat import six, StringIO
+ 
+ class ResponseGroup(xml.sax.ContentHandler):
+@@ -67,7 +71,7 @@ class ResponseGroup(xml.sax.ContentHandler):
+         return None
+ 
+     def endElement(self, name, value, connection):
+-        self._xml.write("%s</%s>" % (cgi.escape(value).replace("&amp;", "&"), name))
++        self._xml.write("%s</%s>" % (html_escape(value).replace("&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..d2e8dfb3 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=hashlib.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=hashlib.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=hashlib.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=hashlib.md5).hexdigest())
+ 
+ 
+ class TestPythonizeName(unittest.TestCase):