| 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;", "&"), 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..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): |
