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

Refresh patch 0001-Don-t-use-duplicated-modules.patch

Browse source
This commit is contained in:
Noah Meyerhans 2020-03-16 19:54:14 -07:00
parent 1a88af5c6b
commit c07cc7f1b9
2 changed files with 38 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
python-botocore (1.15.21+repack-1) unstable; urgency=medium
* New upstream version 1.15.21+repack
* Refresh patch 0001-Don-t-use-duplicated-modules.patch
-- Noah Meyerhans <noahm@debian.org> Mon, 16 Mar 2020 17:17:57 -0700
python-botocore (1.14.14+repack-1) unstable; urgency=medium
* New upstream version 1.14.14+repack

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

@ -19,18 +19,18 @@ Subject: Don't use duplicated modules
Index: python-botocore/botocore/compat.py
===================================================================
--- python-botocore.orig/botocore/compat.py 2019-11-18 17:47:52.402159581 +0900
+++ python-botocore/botocore/compat.py 2019-11-18 17:47:52.390159701 +0900
@@ -21,7 +21,7 @@
--- python-botocore.orig/botocore/compat.py
+++ python-botocore/botocore/compat.py
@@ -21,7 +21,7 @@ import logging
import shlex
from math import floor
-from botocore.vendored import six
+import six
from botocore.exceptions import MD5UnavailableError
from dateutil.tz import tzlocal
from urllib3 import exceptions
@@ -29,7 +29,7 @@
@@ -30,7 +30,7 @@ logger = logging.getLogger(__name__)
if six.PY3:
@ -41,9 +41,9 @@ Index: python-botocore/botocore/compat.py
pass
Index: python-botocore/botocore/endpoint.py
===================================================================
--- python-botocore.orig/botocore/endpoint.py 2019-11-18 17:47:52.402159581 +0900
+++ python-botocore/botocore/endpoint.py 2019-11-18 17:47:52.390159701 +0900
@@ -17,7 +17,7 @@
--- python-botocore.orig/botocore/endpoint.py
+++ python-botocore/botocore/endpoint.py
@@ -17,7 +17,7 @@ import logging
import time
import threading
@ -54,8 +54,8 @@ Index: python-botocore/botocore/endpoint.py
from botocore.exceptions import HTTPClientError
Index: python-botocore/botocore/exceptions.py
===================================================================
--- python-botocore.orig/botocore/exceptions.py 2019-11-18 17:47:52.402159581 +0900
+++ python-botocore/botocore/exceptions.py 2019-11-18 17:47:52.390159701 +0900
--- python-botocore.orig/botocore/exceptions.py
+++ python-botocore/botocore/exceptions.py
@@ -12,8 +12,8 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
@ -69,9 +69,9 @@ Index: python-botocore/botocore/exceptions.py
def _exception_from_packed_args(exception_cls, args=None, kwargs=None):
Index: python-botocore/botocore/httpsession.py
===================================================================
--- python-botocore.orig/botocore/httpsession.py 2019-11-18 17:47:52.402159581 +0900
+++ python-botocore/botocore/httpsession.py 2019-11-18 17:47:52.390159701 +0900
@@ -19,8 +19,8 @@
--- python-botocore.orig/botocore/httpsession.py
+++ python-botocore/botocore/httpsession.py
@@ -19,8 +19,8 @@ except ImportError:
from urllib3.util.ssl_ import SSLContext
import botocore.awsrequest
@ -84,12 +84,12 @@ Index: python-botocore/botocore/httpsession.py
ConnectionClosedError, EndpointConnectionError, HTTPClientError,
Index: python-botocore/botocore/utils.py
===================================================================
--- python-botocore.orig/botocore/utils.py 2019-11-18 17:47:52.402159581 +0900
+++ python-botocore/botocore/utils.py 2019-11-18 17:47:52.394159661 +0900
@@ -31,7 +31,7 @@
--- 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
from botocore.compat import OrderedDict, six, urlparse, get_tzinfo_options
-from botocore.vendored.six.moves.urllib.request import getproxies, proxy_bypass
+from six.moves.urllib.request import getproxies, proxy_bypass
from botocore.exceptions import (
@ -97,9 +97,9 @@ Index: python-botocore/botocore/utils.py
MetadataRetrievalError, EndpointConnectionError, ReadTimeoutError,
Index: python-botocore/tests/functional/test_six_threading.py
===================================================================
--- python-botocore.orig/tests/functional/test_six_threading.py 2019-11-18 17:47:52.402159581 +0900
+++ python-botocore/tests/functional/test_six_threading.py 2019-11-18 17:47:52.394159661 +0900
@@ -6,7 +6,7 @@
--- python-botocore.orig/tests/functional/test_six_threading.py
+++ python-botocore/tests/functional/test_six_threading.py
@@ -6,7 +6,7 @@ import sys
import threading
import time
@ -108,7 +108,7 @@ Index: python-botocore/tests/functional/test_six_threading.py
_original_setattr = six.moves.__class__.__setattr__
@@ -51,7 +51,7 @@
@@ -48,7 +48,7 @@ class _ExampleThread(threading.Thread):
def test_six_thread_safety():
_reload_six()
@ -119,9 +119,9 @@ Index: python-botocore/tests/functional/test_six_threading.py
for i in range(2):
Index: python-botocore/tests/integration/test_client_http.py
===================================================================
--- python-botocore.orig/tests/integration/test_client_http.py 2019-11-18 17:47:52.402159581 +0900
+++ python-botocore/tests/integration/test_client_http.py 2019-11-18 17:47:52.394159661 +0900
@@ -7,12 +7,12 @@
--- python-botocore.orig/tests/integration/test_client_http.py
+++ python-botocore/tests/integration/test_client_http.py
@@ -7,12 +7,12 @@ from contextlib import contextmanager
import botocore.session
from botocore.config import Config
@ -138,8 +138,8 @@ Index: python-botocore/tests/integration/test_client_http.py
class TestClientHTTPBehavior(unittest.TestCase):
Index: python-botocore/tests/integration/test_glacier.py
===================================================================
--- python-botocore.orig/tests/integration/test_glacier.py 2019-11-18 17:47:52.402159581 +0900
+++ python-botocore/tests/integration/test_glacier.py 2019-11-18 17:47:52.394159661 +0900
--- python-botocore.orig/tests/integration/test_glacier.py
+++ python-botocore/tests/integration/test_glacier.py
@@ -13,7 +13,7 @@
from tests import unittest
@ -151,8 +151,8 @@ Index: python-botocore/tests/integration/test_glacier.py
Index: python-botocore/tests/unit/test_http_client_exception_mapping.py
===================================================================
--- python-botocore.orig/tests/unit/test_http_client_exception_mapping.py 2019-11-18 17:47:52.402159581 +0900
+++ python-botocore/tests/unit/test_http_client_exception_mapping.py 2019-11-18 17:47:52.398159621 +0900
--- python-botocore.orig/tests/unit/test_http_client_exception_mapping.py
+++ python-botocore/tests/unit/test_http_client_exception_mapping.py
@@ -1,8 +1,8 @@
from nose.tools import assert_raises
@ -166,9 +166,9 @@ Index: python-botocore/tests/unit/test_http_client_exception_mapping.py
(botocore_exceptions.ReadTimeoutError, requests_exceptions.ReadTimeout),
Index: python-botocore/tests/unit/test_http_session.py
===================================================================
--- python-botocore.orig/tests/unit/test_http_session.py 2019-11-18 17:47:52.402159581 +0900
+++ python-botocore/tests/unit/test_http_session.py 2019-11-18 17:47:52.398159621 +0900
@@ -5,7 +5,7 @@
--- python-botocore.orig/tests/unit/test_http_session.py
+++ python-botocore/tests/unit/test_http_session.py
@@ -5,7 +5,7 @@ from tests import unittest
from nose.tools import raises
from urllib3.exceptions import NewConnectionError, ProtocolError