From f63427183d78540e8d90832d75b400e4ca450957 Mon Sep 17 00:00:00 2001 From: Noah Meyerhans Date: Thu, 18 Jun 2020 12:25:35 -0700 Subject: [PATCH] Refresh patch 0001-Don-t-use-duplicated-modules.patch --- debian/patches/0001-Don-t-use-duplicated-modules.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/0001-Don-t-use-duplicated-modules.patch b/debian/patches/0001-Don-t-use-duplicated-modules.patch index cbb3bbb2..38aa3b5b 100644 --- a/debian/patches/0001-Don-t-use-duplicated-modules.patch +++ b/debian/patches/0001-Don-t-use-duplicated-modules.patch @@ -86,10 +86,10 @@ Index: python-botocore/botocore/utils.py =================================================================== --- python-botocore.orig/botocore/utils.py +++ python-botocore/botocore/utils.py -@@ -31,7 +31,7 @@ import botocore.awsrequest - import botocore.httpsession - from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit - from botocore.compat import OrderedDict, six, urlparse, get_tzinfo_options +@@ -34,7 +34,7 @@ from botocore.compat import ( + json, quote, zip_longest, urlsplit, urlunsplit, OrderedDict, + six, urlparse, get_tzinfo_options, get_md5, MD5_AVAILABLE + ) -from botocore.vendored.six.moves.urllib.request import getproxies, proxy_bypass +from six.moves.urllib.request import getproxies, proxy_bypass from botocore.exceptions import (