dprevot/python-botocore
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refresh patches

Browse source
This commit is contained in:
Noah Meyerhans 2021-09-22 14:05:08 -07:00
parent 03dc05195f
commit 279b5f5b74
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
debian/patches/0001-Don-t-use-duplicated-modules.patch vendored
View file

@ -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
@@ -20,8 +20,8 @@ except ImportError: @@ -21,8 +21,8 @@ except ImportError:
from urllib3.util.ssl_ import SSLContext from urllib3.util.ssl_ import SSLContext
import botocore.awsrequest import botocore.awsrequest
@ -86,9 +86,9 @@ 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
@@ -35,7 +35,7 @@ from botocore.compat import ( @@ -36,7 +36,7 @@ from botocore.compat import (
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 HAS_CRT
) )
-from botocore.vendored.six.moves.urllib.request import getproxies, proxy_bypass -from botocore.vendored.six.moves.urllib.request import getproxies, proxy_bypass
+from six.moves.urllib.request import getproxies, proxy_bypass +from six.moves.urllib.request import getproxies, proxy_bypass
@ -99,29 +99,29 @@ Index: python-botocore/tests/functional/test_six_threading.py
=================================================================== ===================================================================
--- python-botocore.orig/tests/functional/test_six_threading.py --- python-botocore.orig/tests/functional/test_six_threading.py
+++ python-botocore/tests/functional/test_six_threading.py +++ python-botocore/tests/functional/test_six_threading.py
@@ -6,7 +6,7 @@ import sys @@ -7,7 +7,7 @@ import time
import threading
import time from tests import mock
-from botocore.vendored import six -from botocore.vendored import six
+import six +import six
_original_setattr = six.moves.__class__.__setattr__ _original_setattr = six.moves.__class__.__setattr__
@@ -48,7 +48,7 @@ class _ExampleThread(threading.Thread): @@ -50,7 +50,7 @@ class _ExampleThread(threading.Thread):
def test_six_thread_safety(): def test_six_thread_safety():
_reload_six() _reload_six()
- with patch('botocore.vendored.six.moves.__class__.__setattr__', with mock.patch(
+ with patch('six.moves.__class__.__setattr__', - 'botocore.vendored.six.moves.__class__.__setattr__',
wraps=_wrapped_setattr): + 'six.moves.__class__.__setattr__',
wraps=_wrapped_setattr
):
threads = [] threads = []
for i in range(2):
Index: python-botocore/tests/integration/test_client_http.py Index: python-botocore/tests/integration/test_client_http.py
=================================================================== ===================================================================
--- python-botocore.orig/tests/integration/test_client_http.py --- python-botocore.orig/tests/integration/test_client_http.py
+++ python-botocore/tests/integration/test_client_http.py +++ python-botocore/tests/integration/test_client_http.py
@@ -7,12 +7,12 @@ from contextlib import contextmanager @@ -8,12 +8,12 @@ from contextlib import contextmanager
import botocore.session import botocore.session
from botocore.config import Config from botocore.config import Config
@ -129,7 +129,7 @@ Index: python-botocore/tests/integration/test_client_http.py
+from six.moves import BaseHTTPServer, socketserver +from six.moves import BaseHTTPServer, socketserver
from botocore.exceptions import ( from botocore.exceptions import (
ConnectTimeoutError, ReadTimeoutError, EndpointConnectionError, ConnectTimeoutError, ReadTimeoutError, EndpointConnectionError,
ConnectionClosedError, ConnectionClosedError, ClientError, ProxyConnectionError
) )
-from botocore.vendored.requests import exceptions as requests_exceptions -from botocore.vendored.requests import exceptions as requests_exceptions
+from requests import exceptions as requests_exceptions +from requests import exceptions as requests_exceptions
@ -168,7 +168,7 @@ Index: python-botocore/tests/unit/test_http_session.py
=================================================================== ===================================================================
--- python-botocore.orig/tests/unit/test_http_session.py --- python-botocore.orig/tests/unit/test_http_session.py
+++ python-botocore/tests/unit/test_http_session.py +++ python-botocore/tests/unit/test_http_session.py
@@ -5,7 +5,7 @@ from tests import unittest @@ -4,7 +4,7 @@ from tests import mock, unittest
from nose.tools import raises from nose.tools import raises
from urllib3.exceptions import NewConnectionError, ProtocolError from urllib3.exceptions import NewConnectionError, ProtocolError