Refresh patches

This commit is contained in:
Noah Meyerhans 2021-08-18 09:12:48 -07:00
parent 26039dfaa0
commit 4c4b47c361
2 changed files with 9 additions and 15 deletions

View file

@ -21,8 +21,8 @@ Index: python-botocore/botocore/compat.py
=================================================================== ===================================================================
--- python-botocore.orig/botocore/compat.py --- python-botocore.orig/botocore/compat.py
+++ python-botocore/botocore/compat.py +++ python-botocore/botocore/compat.py
@@ -21,7 +21,7 @@ import logging @@ -22,7 +22,7 @@ import shlex
import shlex import os
from math import floor from math import floor
-from botocore.vendored import six -from botocore.vendored import six
@ -30,7 +30,7 @@ Index: python-botocore/botocore/compat.py
from botocore.exceptions import MD5UnavailableError from botocore.exceptions import MD5UnavailableError
from dateutil.tz import tzlocal from dateutil.tz import tzlocal
from urllib3 import exceptions from urllib3 import exceptions
@@ -30,7 +30,7 @@ logger = logging.getLogger(__name__) @@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)
if six.PY3: if six.PY3:
@ -71,7 +71,7 @@ Index: python-botocore/botocore/httpsession.py
=================================================================== ===================================================================
--- python-botocore.orig/botocore/httpsession.py --- python-botocore.orig/botocore/httpsession.py
+++ python-botocore/botocore/httpsession.py +++ python-botocore/botocore/httpsession.py
@@ -19,8 +19,8 @@ except ImportError: @@ -20,8 +20,8 @@ except ImportError:
from urllib3.util.ssl_ import SSLContext from urllib3.util.ssl_ import SSLContext
import botocore.awsrequest import botocore.awsrequest
@ -86,7 +86,7 @@ Index: python-botocore/botocore/utils.py
=================================================================== ===================================================================
--- python-botocore.orig/botocore/utils.py --- python-botocore.orig/botocore/utils.py
+++ python-botocore/botocore/utils.py +++ python-botocore/botocore/utils.py
@@ -34,7 +34,7 @@ from botocore.compat import ( @@ -35,7 +35,7 @@ from botocore.compat import (
json, quote, zip_longest, urlsplit, urlunsplit, OrderedDict, json, quote, zip_longest, urlsplit, urlunsplit, OrderedDict,
six, urlparse, get_tzinfo_options, get_md5, MD5_AVAILABLE six, urlparse, get_tzinfo_options, get_md5, MD5_AVAILABLE
) )

View file

@ -17,7 +17,7 @@ Index: python-botocore/docs/source/_templates/layout.html
=================================================================== ===================================================================
--- python-botocore.orig/docs/source/_templates/layout.html --- python-botocore.orig/docs/source/_templates/layout.html
+++ python-botocore/docs/source/_templates/layout.html +++ python-botocore/docs/source/_templates/layout.html
@@ -10,16 +10,9 @@ @@ -10,13 +10,6 @@
<div class="footer"> <div class="footer">
@ -28,12 +28,6 @@ Index: python-botocore/docs/source/_templates/layout.html
-}); -});
- shortbread.checkForCookieConsent(); - shortbread.checkForCookieConsent();
- </script> - </script>
- <a href="http://aws.amazon.com/privacy">Privacy</a> | <a href="http://aws.amazon.com/terms">Site Terms</a> | <a <a href="http://aws.amazon.com/privacy">Privacy</a> | <a href="http://aws.amazon.com/terms">Site Terms</a> | <a
- href="#" onclick="shortbread.customizeCookies();">Cookie preferences</a> | href="#" onclick="shortbread.customizeCookies();">Cookie preferences</a> |
- &copy; Copyright {{ copyright }} <a href="http://sphinx.pocoo.org/">Sphinx</a>. &copy; Copyright {{ copyright }} <a href="https://www.sphinx-doc.org/">Sphinx</a>.
+ <a href="http://aws.amazon.com/privacy">Privacy</a>
+ | <a href="http://aws.amazon.com/terms">Site Terms</a>
+ | &copy; Copyright {{ copyright }} <a href="http://sphinx.pocoo.org/">Sphinx</a>.
</div>
{%- endblock %}