From 107134d3e74fd77bf80e29942af5eed1885305fa Mon Sep 17 00:00:00 2001 From: TANIGUCHI Takaki Date: Mon, 18 Nov 2019 17:50:11 +0900 Subject: [PATCH] d/patches: refresh patches --- .../0001-Don-t-use-duplicated-modules.patch | 68 ++++++------------- 1 file changed, 21 insertions(+), 47 deletions(-) diff --git a/debian/patches/0001-Don-t-use-duplicated-modules.patch b/debian/patches/0001-Don-t-use-duplicated-modules.patch index 0bb4cb85..4cc42544 100644 --- a/debian/patches/0001-Don-t-use-duplicated-modules.patch +++ b/debian/patches/0001-Don-t-use-duplicated-modules.patch @@ -19,8 +19,8 @@ Subject: Don't use duplicated modules Index: python-botocore/botocore/compat.py =================================================================== ---- python-botocore.orig/botocore/compat.py 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/botocore/compat.py 2018-11-28 18:47:51.047053292 +0900 +--- 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 @@ import shlex from math import floor @@ -41,8 +41,8 @@ Index: python-botocore/botocore/compat.py pass Index: python-botocore/botocore/endpoint.py =================================================================== ---- python-botocore.orig/botocore/endpoint.py 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/botocore/endpoint.py 2018-11-28 18:47:51.047053292 +0900 +--- 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 @@ 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 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/botocore/exceptions.py 2018-11-28 18:47:51.051053254 +0900 +--- 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 @@ -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 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/botocore/httpsession.py 2018-11-28 18:47:51.051053254 +0900 -@@ -18,8 +18,8 @@ +--- 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 @@ from urllib3.util.ssl_ import SSLContext import botocore.awsrequest @@ -84,8 +84,8 @@ Index: python-botocore/botocore/httpsession.py ConnectionClosedError, EndpointConnectionError, HTTPClientError, Index: python-botocore/botocore/utils.py =================================================================== ---- python-botocore.orig/botocore/utils.py 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/botocore/utils.py 2018-11-28 18:47:51.051053254 +0900 +--- 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 @@ import botocore.httpsession from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit @@ -97,8 +97,8 @@ 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 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/tests/functional/test_six_threading.py 2018-11-28 18:47:51.051053254 +0900 +--- 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 @@ import threading import time @@ -119,8 +119,8 @@ 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 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/tests/integration/test_client_http.py 2018-11-28 18:47:51.051053254 +0900 +--- 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 @@ import botocore.session @@ -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 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/tests/integration/test_glacier.py 2018-11-28 18:47:51.051053254 +0900 +--- 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 @@ -13,7 +13,7 @@ from tests import unittest @@ -149,36 +149,10 @@ Index: python-botocore/tests/integration/test_glacier.py import botocore.session -Index: python-botocore/tests/integration/test_s3.py -=================================================================== ---- python-botocore.orig/tests/integration/test_s3.py 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/tests/integration/test_s3.py 2018-11-28 18:47:51.051053254 +0900 -@@ -31,7 +31,7 @@ - import botocore.session - import botocore.auth - import botocore.credentials --import botocore.vendored.requests as requests -+import requests - from botocore.config import Config - from botocore.exceptions import ClientError - -Index: python-botocore/tests/unit/test_endpoint.py -=================================================================== ---- python-botocore.orig/tests/unit/test_endpoint.py 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/tests/unit/test_endpoint.py 2018-11-28 18:47:51.051053254 +0900 -@@ -14,7 +14,7 @@ - from tests import unittest - - from mock import Mock, patch, sentinel --from botocore.vendored.requests import ConnectionError -+from requests import ConnectionError - - from botocore.compat import six - from botocore.awsrequest import AWSRequest Index: python-botocore/tests/unit/test_http_client_exception_mapping.py =================================================================== ---- python-botocore.orig/tests/unit/test_http_client_exception_mapping.py 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/tests/unit/test_http_client_exception_mapping.py 2018-11-28 18:47:51.051053254 +0900 +--- 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 @@ -1,8 +1,8 @@ from nose.tools import assert_raises @@ -192,8 +166,8 @@ 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 2018-11-28 18:47:51.059053177 +0900 -+++ python-botocore/tests/unit/test_http_session.py 2018-11-28 18:47:51.051053254 +0900 +--- 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 @@ from nose.tools import raises from urllib3.exceptions import NewConnectionError, ProtocolError