diff -Nru python-boto-2.49.0/boto/compat.py python-boto-2.49.0/boto/compat.py --- python-boto-2.49.0/boto/compat.py 2022-11-20 04:59:09.000000000 +0000 +++ python-boto-2.49.0/boto/compat.py 2018-07-11 20:41:07.000000000 +0000 @@ -46,16 +46,16 @@ # This is probably running on App Engine. expanduser = (lambda x: x) -import six +from boto.vendored import six -from six import BytesIO, StringIO -from six.moves import filter, http_client, map, _thread, \ +from boto.vendored.six import BytesIO, StringIO +from boto.vendored.six.moves import filter, http_client, map, _thread, \ urllib, zip -from six.moves.queue import Queue -from six.moves.urllib.parse import parse_qs, quote, unquote, \ +from boto.vendored.six.moves.queue import Queue +from boto.vendored.six.moves.urllib.parse import parse_qs, quote, unquote, \ urlparse, urlsplit -from six.moves.urllib.parse import unquote_plus -from six.moves.urllib.request import urlopen +from boto.vendored.six.moves.urllib.parse import unquote_plus +from boto.vendored.six.moves.urllib.request import urlopen if six.PY3: # StandardError was removed, so use the base exception type instead diff -Nru python-boto-2.49.0/debian/changelog python-boto-2.49.0/debian/changelog --- python-boto-2.49.0/debian/changelog 2022-11-20 04:59:09.000000000 +0000 +++ python-boto-2.49.0/debian/changelog 2022-11-20 04:32:04.000000000 +0000 @@ -1,28 +1,29 @@ -python-boto (2.49.0-2ubuntu1.16.04.sav1) xenial; urgency=medium +python-boto (2.49.0-3~16.04.sav0) xenial; urgency=medium - * Rebuild against ppa:savoury1/build-tools (backported debhelper 11.3.5) - * debian/compat: Remove and use new debhelper-compat BD in debian/control - * debian/control: Set debhelper-compat (= 10) BD and remove debhelper BD + * Backport to Xenial + * Revert "Removed Python 2 support" + * debian/control: Set debhelper-compat (= 10) BD (LP highest for Xenial) - -- Rob Savoury Wed, 08 Jan 2020 23:33:14 -0800 + -- Rob Savoury Sat, 19 Nov 2022 20:32:04 -0800 -python-boto (2.49.0-2ubuntu1.16.04.sav0) xenial; urgency=medium +python-boto (2.49.0-3) unstable; urgency=medium - * Backport to Xenial. - * debian/compat: Create file and set compat level 9 (Xenial). - * debian/control: Drop debhelper BD to 9 and Standards to 3.9.8 (Xenial). + [ Noah Meyerhans ] + * Update Maintainer to the Debian cloud team + * Convert to 3.0 (quilt) source package format + * Fix python syntax warning in upstream code + * Fix python 3.8 compatibility issue (Closes: #953970) + * Fix the use of a deprecated variable in debian/tests/unit + * Fix lintian warning runtime-test-file-uses-installed-python-versions - -- Rob Savoury Fri, 27 Sep 2019 20:21:15 -0700 + -- Thomas Goirand Sat, 16 May 2020 12:11:41 +0200 -python-boto (2.49.0-2ubuntu1) eoan; urgency=medium +python-boto (2.49.0-2.1) unstable; urgency=medium - * Merge with Debian unstable. Remaining changes: - - d/tests/unit: Fix autopkgtest error in test_timeout by using a - temporary HOME directory. - - d/tests/unit: Workaround unit test by unsetting *_proxy vars - before running dep8 unit test. See: LP #1698222. + * Non-maintainer upload. + * Removed Python 2 support (Closes: #937617). - -- Bryce Harrington Mon, 05 Aug 2019 20:53:54 -0700 + -- Thomas Goirand Wed, 25 Dec 2019 21:28:06 +0100 python-boto (2.49.0-2) unstable; urgency=medium @@ -36,29 +37,6 @@ -- Eric Evans Mon, 22 Jul 2019 14:56:38 -0500 -python-boto (2.44.0-1.1ubuntu1) disco; urgency=medium - - * Merge from Debian unstable. Remaining chnages: - * Workaround unit test by unsetting *_proxy vars before running dep8 unit - test. See: LP #1698222. - * d/tests/unit: Fix autopkgtest error in test_timeout. - - -- Dimitri John Ledkov Wed, 05 Dec 2018 00:35:47 +0000 - -python-boto (2.44.0-1ubuntu2) artful; urgency=medium - - * Workaround unit test by unsetting *_proxy vars before running dep8 unit - test. See: LP #1698222. - - -- David Britton Fri, 16 Jun 2017 10:00:33 -0600 - -python-boto (2.44.0-1ubuntu1) zesty; urgency=medium - - * Merge from Debian unstable. Remaining changes: - * d/tests/unit: Fix autopkgtest error in test_timeout. - - -- Jon Grimm Fri, 03 Feb 2017 13:15:39 -0600 - python-boto (2.44.0-1) unstable; urgency=medium * New upstream release. @@ -71,40 +49,18 @@ -- Eric Evans Tue, 08 Nov 2016 21:17:35 -0600 -python-boto (2.40.0-1ubuntu1) yakkety; urgency=low - - * Merge from Debian unstable. Remaining changes: - * d/tests/unit: Fix autopkgtest error in test_timeout. - - -- James Page Fri, 24 Jun 2016 14:40:43 +0100 - python-boto (2.40.0-1) unstable; urgency=medium * New upstream release. -- Eric Evans Sun, 22 May 2016 14:22:08 -0500 -python-boto (2.38.0-1ubuntu1) wily; urgency=low - - * Merge from Debian unstable. Remaining changes: - * d/tests/unit: Fix autopkgtest error in test_timeout. - * d/tests/unit: run tests/test.py with each python in 'pyversions -i' - - -- James Page Thu, 09 Jul 2015 16:11:38 +0100 - python-boto (2.38.0-1) unstable; urgency=medium * New upstream release. -- Eric Evans Sun, 14 Jun 2015 09:43:42 -0500 -python-boto (2.34.0-2ubuntu1) vivid; urgency=low - - * Merge from Debian unstable. Remaining changes: - * d/tests: Add autopkgtests - - -- Chuck Short Sun, 23 Nov 2014 20:11:53 -0500 - python-boto (2.34.0-2) unstable; urgency=medium * Upload to unstable. @@ -135,14 +91,6 @@ -- Thomas Goirand Fri, 12 Sep 2014 08:21:48 +0000 -python-boto (2.29.1-1ubuntu1) utopic; urgency=medium - - * Merge with debian. Remaining Ubuntu changes: - * d/tests/unit: Fix autopkgtest error in test_timeout. - * d/tests/unit: run tests/test.py with each python in 'pyversions -i' - - -- Scott Moser Fri, 25 Jul 2014 12:59:34 -0400 - python-boto (2.29.1-1) unstable; urgency=medium * New upstream release (Closes: #750571). @@ -162,23 +110,6 @@ -- Eric Evans Fri, 07 Feb 2014 20:32:57 -0600 -python-boto (2.20.1-2ubuntu2) trusty; urgency=medium - - * d/tests/unit: Fix autopkgtest error in test_timeout. - * Add patch to fix autopkgtest failure in test_trim_defaults. - Taken from upstream git repository commits 3ebb667b and eb4c6e37. - - -- Corey Bryant Wed, 26 Mar 2014 13:52:31 -0400 - -python-boto (2.20.1-2ubuntu1) trusty; urgency=medium - - * Add missing python-requests dependency, spotted by autopkgtest. - * Add python-requests test dependency, as the test does not actually depend - on python-boto (this test needs to be fixed to run against the installed - package). - - -- Martin Pitt Wed, 26 Feb 2014 15:51:00 +0100 - python-boto (2.20.1-2) experimental; urgency=low * Run unit tests with autopkgtest. diff -Nru python-boto-2.49.0/debian/control python-boto-2.49.0/debian/control --- python-boto-2.49.0/debian/control 2022-11-20 04:59:09.000000000 +0000 +++ python-boto-2.49.0/debian/control 2022-11-20 04:32:00.000000000 +0000 @@ -1,8 +1,9 @@ Source: python-boto Section: python Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Eric Evans +Maintainer: Debian Cloud Team +Uploaders: Thomas Goirand , + Noah Meyerhans Build-Depends: debhelper-compat (= 10), python-all (>= 2.6.6-3), python-setuptools, @@ -13,8 +14,8 @@ dh-python XS-Testsuite: autopkgtest Homepage: https://github.com/boto/boto -Vcs-Browser: https://salsa.debian.org/eevans/python-boto -Vcs-Git: https://salsa.debian.org/eevans/python-boto.git +Vcs-Browser: https://salsa.debian.org/cloud-team/python-boto +Vcs-Git: https://salsa.debian.org/cloud-team/python-boto.git Standards-Version: 4.4.0 Package: python-boto diff -Nru python-boto-2.49.0/debian/gbp.conf python-boto-2.49.0/debian/gbp.conf --- python-boto-2.49.0/debian/gbp.conf 2022-11-20 04:59:09.000000000 +0000 +++ python-boto-2.49.0/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -[DEFAULT] -upstream-branch = upstream -debian-branch = master - -[buildpackage] -pbuilder = True -pbuilder-options = --source-only-changes diff -Nru python-boto-2.49.0/debian/patches/bug-953970_python3.8-compat.patch python-boto-2.49.0/debian/patches/bug-953970_python3.8-compat.patch --- python-boto-2.49.0/debian/patches/bug-953970_python3.8-compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-boto-2.49.0/debian/patches/bug-953970_python3.8-compat.patch 2020-05-16 10:11:41.000000000 +0000 @@ -0,0 +1,53 @@ +Index: python-boto/tests/unit/utils/test_utils.py +=================================================================== +--- python-boto.orig/tests/unit/utils/test_utils.py ++++ python-boto/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='sha256') + + 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='sha256').hexdigest()) + + def test_constructor(self): +- hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg) ++ hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg, digestmod='sha256') + + 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='sha256').hexdigest()) + + + class TestPythonizeName(unittest.TestCase): +Index: python-boto/boto/ecs/item.py +=================================================================== +--- python-boto.orig/boto/ecs/item.py ++++ python-boto/boto/ecs/item.py +@@ -22,6 +22,7 @@ + + import xml.sax + import cgi ++from html import escape + from boto.compat import six, StringIO + + class ResponseGroup(xml.sax.ContentHandler): +@@ -67,7 +68,7 @@ class ResponseGroup(xml.sax.ContentHandl + return None + + def endElement(self, name, value, connection): +- self._xml.write("%s" % (cgi.escape(value).replace("&", "&"), name)) ++ self._xml.write("%s" % (escape(value).replace("&", "&"), name)) + if len(self._nodepath) == 0: + return + obj = None diff -Nru python-boto-2.49.0/debian/patches/fix-incorrect-identity-comparison.patch python-boto-2.49.0/debian/patches/fix-incorrect-identity-comparison.patch --- python-boto-2.49.0/debian/patches/fix-incorrect-identity-comparison.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-boto-2.49.0/debian/patches/fix-incorrect-identity-comparison.patch 2020-05-16 10:11:41.000000000 +0000 @@ -0,0 +1,13 @@ +Index: python-boto/boto/iam/connection.py +=================================================================== +--- python-boto.orig/boto/iam/connection.py ++++ python-boto/boto/iam/connection.py +@@ -1111,7 +1111,7 @@ class IAMConnection(AWSQueryConnection): + else: + + for tld, policy in DEFAULT_POLICY_DOCUMENTS.items(): +- if tld is 'default': ++ if tld == 'default': + # Skip the default. We'll fall back to it if we don't find + # anything. + continue diff -Nru python-boto-2.49.0/debian/patches/series python-boto-2.49.0/debian/patches/series --- python-boto-2.49.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ python-boto-2.49.0/debian/patches/series 2020-05-16 10:11:41.000000000 +0000 @@ -0,0 +1,3 @@ +fix-incorrect-identity-comparison.patch +Use-python-six-from-Debian-instead-of-vendored-copy.patch +bug-953970_python3.8-compat.patch diff -Nru python-boto-2.49.0/debian/patches/Use-python-six-from-Debian-instead-of-vendored-copy.patch python-boto-2.49.0/debian/patches/Use-python-six-from-Debian-instead-of-vendored-copy.patch --- python-boto-2.49.0/debian/patches/Use-python-six-from-Debian-instead-of-vendored-copy.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-boto-2.49.0/debian/patches/Use-python-six-from-Debian-instead-of-vendored-copy.patch 2020-05-16 10:11:41.000000000 +0000 @@ -0,0 +1,51 @@ +From: Eric Evans +Date: Sun, 22 May 2016 19:40:30 -0500 +Subject: [PATCH] Use python-six from Debian, instead of vendored copy +Forwarded: not-needed + +--- + boto/compat.py | 14 +++++++------- + setup.py | 2 +- + 2 files changed, 8 insertions(+), 8 deletions(-) + +Index: python-boto/boto/compat.py +=================================================================== +--- python-boto.orig/boto/compat.py ++++ python-boto/boto/compat.py +@@ -46,16 +46,16 @@ except (AttributeError, ImportError): + # This is probably running on App Engine. + expanduser = (lambda x: x) + +-from boto.vendored import six ++import six + +-from boto.vendored.six import BytesIO, StringIO +-from boto.vendored.six.moves import filter, http_client, map, _thread, \ ++from six import BytesIO, StringIO ++from six.moves import filter, http_client, map, _thread, \ + urllib, zip +-from boto.vendored.six.moves.queue import Queue +-from boto.vendored.six.moves.urllib.parse import parse_qs, quote, unquote, \ ++from six.moves.queue import Queue ++from six.moves.urllib.parse import parse_qs, quote, unquote, \ + urlparse, urlsplit +-from boto.vendored.six.moves.urllib.parse import unquote_plus +-from boto.vendored.six.moves.urllib.request import urlopen ++from six.moves.urllib.parse import unquote_plus ++from six.moves.urllib.request import urlopen + + if six.PY3: + # StandardError was removed, so use the base exception type instead +Index: python-boto/setup.py +=================================================================== +--- python-boto.orig/setup.py ++++ python-boto/setup.py +@@ -76,7 +76,7 @@ setup(name = "boto", + "boto.elastictranscoder", "boto.opsworks", "boto.redshift", + "boto.dynamodb2", "boto.support", "boto.cloudtrail", + "boto.directconnect", "boto.kinesis", "boto.rds2", +- "boto.cloudsearch2", "boto.logs", "boto.vendored", ++ "boto.cloudsearch2", "boto.logs", + "boto.route53.domains", "boto.cognito", + "boto.cognito.identity", "boto.cognito.sync", + "boto.cloudsearchdomain", "boto.kms", diff -Nru python-boto-2.49.0/debian/rules python-boto-2.49.0/debian/rules --- python-boto-2.49.0/debian/rules 2022-11-20 04:59:09.000000000 +0000 +++ python-boto-2.49.0/debian/rules 2022-11-20 04:24:09.000000000 +0000 @@ -6,11 +6,11 @@ clean: dh_testdir dh_testroot - + rm -f build-stamp install-stamp rm -rf build - find boto/ -name *.pyc | xargs rm -f - + find tests/ boto/ -name *.pyc | xargs rm -f + dh_clean build: build-arch build-indep @@ -27,7 +27,7 @@ dh_testdir dh_installdirs - # Python 2.x +# Python 2.x set -e ; for pyvers in $(PYTHONS); do \ python$$pyvers setup.py install --root $(CURDIR)/debian/python-boto \ --install-scripts usr/share/doc/python-boto/examples/ \ @@ -39,7 +39,7 @@ mv $$f.tmp $$f; \ done - # Python 3.x +# Python 3.x set -e ; for pyvers in $(PYTHON3S); do \ python$$pyvers setup.py install --root $(CURDIR)/debian/python3-boto \ --install-scripts usr/share/doc/python3-boto/examples/ \ diff -Nru python-boto-2.49.0/debian/source/format python-boto-2.49.0/debian/source/format --- python-boto-2.49.0/debian/source/format 2022-11-20 04:59:09.000000000 +0000 +++ python-boto-2.49.0/debian/source/format 2020-05-16 10:11:41.000000000 +0000 @@ -1 +1 @@ -1.0 +3.0 (quilt) diff -Nru python-boto-2.49.0/debian/tests/control python-boto-2.49.0/debian/tests/control --- python-boto-2.49.0/debian/tests/control 2022-11-20 04:59:09.000000000 +0000 +++ python-boto-2.49.0/debian/tests/control 2020-05-16 10:11:41.000000000 +0000 @@ -1,3 +1,3 @@ Tests: unit -Depends: python-boto, python-nose (>= 1.3.0), python-mock (>= 1.0.1), python-httpretty (>= 0.6.3) +Depends: python3-boto, python3-nose (>= 1.3.0), python3-mock (>= 1.0.1), python3-httpretty (>= 0.6.3), python3-all Restrictions: allow-stderr diff -Nru python-boto-2.49.0/debian/tests/unit python-boto-2.49.0/debian/tests/unit --- python-boto-2.49.0/debian/tests/unit 2022-11-20 04:59:09.000000000 +0000 +++ python-boto-2.49.0/debian/tests/unit 2020-05-16 10:11:41.000000000 +0000 @@ -1,26 +1,9 @@ #/bin/sh -set -ex - -#Create temporary home directory with .ssh/known_hosts file -#so that test_timeout will be able to work. -home_orig=$HOME -home_temp=$(mktemp -d) -mkdir -p "$home_temp/.ssh" -touch "$home_temp/.ssh/known_hosts" -export HOME=$home_temp -unset http_proxy -unset https_proxy -unset no_proxy - set -eu -cp -r tests "$ADTTMP/" -cd "$ADTTMP" +cp -r tests "$AUTOPKGTEST_TMP/" +cd "$AUTOPKGTEST_TMP" -for python in $(pyversions -i); do +for python in $(py3versions -s); do $python tests/test.py unit > /dev/null done - -#Restore original home directory and remove temp home dir -export HOME=$home_orig -rm -rf $home_temp