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

debian/patches/*: Refresh patches.

Browse source
This commit is contained in:
TANIGUCHI Takaki 2018-11-28 18:46:11 +09:00
parent 706a998100
commit cfe6c03e79
1 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,11 +17,11 @@ Subject: Don't use duplicated modules
tests/unit/test_http_session.py | 2 +-
12 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/botocore/compat.py b/botocore/compat.py
index 47e1c81..86d8d3d 100644
--- a/botocore/compat.py
+++ b/botocore/compat.py
@@ -21,7 +21,7 @@ import logging
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
@@ -21,7 +21,7 @@
import shlex
from math import floor
@ -30,7 +30,7 @@ index 47e1c81..86d8d3d 100644
from botocore.exceptions import MD5UnavailableError
from urllib3 import exceptions
@@ -29,7 +29,7 @@ logger = logging.getLogger(__name__)
@@ -29,7 +29,7 @@
if six.PY3:
@ -39,11 +39,11 @@ index 47e1c81..86d8d3d 100644
class HTTPHeaders(http_client.HTTPMessage):
pass
diff --git a/botocore/endpoint.py b/botocore/endpoint.py
index efa6be0..6b0599b 100644
--- a/botocore/endpoint.py
+++ b/botocore/endpoint.py
@@ -17,7 +17,7 @@ import logging
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
@@ -17,7 +17,7 @@
import time
import threading
@ -52,10 +52,10 @@ index efa6be0..6b0599b 100644
from botocore.awsrequest import create_request_object
from botocore.exceptions import HTTPClientError
diff --git a/botocore/exceptions.py b/botocore/exceptions.py
index 36f5867..129ff4d 100644
--- a/botocore/exceptions.py
+++ b/botocore/exceptions.py
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
@@ -12,8 +12,8 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
@ -66,12 +66,12 @@ index 36f5867..129ff4d 100644
+from requests.packages import urllib3
class BotoCoreError(Exception):
diff --git a/botocore/httpsession.py b/botocore/httpsession.py
index 28ad866..9fe081c 100644
--- a/botocore/httpsession.py
+++ b/botocore/httpsession.py
@@ -18,8 +18,8 @@ except ImportError:
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 @@
from urllib3.util.ssl_ import SSLContext
import botocore.awsrequest
@ -82,11 +82,11 @@ index 28ad866..9fe081c 100644
from botocore.compat import filter_ssl_warnings, urlparse
from botocore.exceptions import (
ConnectionClosedError, EndpointConnectionError, HTTPClientError,
diff --git a/botocore/utils.py b/botocore/utils.py
index 74b4107..1557ded 100644
--- a/botocore/utils.py
+++ b/botocore/utils.py
@@ -31,7 +31,7 @@ import botocore.awsrequest
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
@@ -31,7 +31,7 @@
import botocore.httpsession
from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit
from botocore.compat import OrderedDict, six, urlparse
@ -95,11 +95,11 @@ index 74b4107..1557ded 100644
from botocore.exceptions import (
InvalidExpressionError, ConfigNotFound, InvalidDNSNameError, ClientError,
MetadataRetrievalError, EndpointConnectionError, ReadTimeoutError,
diff --git a/tests/functional/test_six_threading.py b/tests/functional/test_six_threading.py
index 5ef9bc3..268304a 100644
--- a/tests/functional/test_six_threading.py
+++ b/tests/functional/test_six_threading.py
@@ -6,7 +6,7 @@ import sys
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
@@ -6,7 +6,7 @@
import threading
import time
@ -108,7 +108,7 @@ index 5ef9bc3..268304a 100644
_original_setattr = six.moves.__class__.__setattr__
@@ -51,7 +51,7 @@ class _ExampleThread(threading.Thread):
@@ -51,7 +51,7 @@
def test_six_thread_safety():
_reload_six()
@ -117,11 +117,11 @@ index 5ef9bc3..268304a 100644
wraps=_wrapped_setattr):
threads = []
for i in range(2):
diff --git a/tests/integration/test_client_http.py b/tests/integration/test_client_http.py
index e5c96f7..5b39e22 100644
--- a/tests/integration/test_client_http.py
+++ b/tests/integration/test_client_http.py
@@ -7,12 +7,12 @@ from contextlib import contextmanager
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
@@ -7,12 +7,12 @@
import botocore.session
from botocore.config import Config
@ -136,10 +136,10 @@ index e5c96f7..5b39e22 100644
class TestClientHTTPBehavior(unittest.TestCase):
diff --git a/tests/integration/test_glacier.py b/tests/integration/test_glacier.py
index 23a7f34..96cedf0 100644
--- a/tests/integration/test_glacier.py
+++ b/tests/integration/test_glacier.py
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
@@ -13,7 +13,7 @@
from tests import unittest
@ -149,11 +149,11 @@ index 23a7f34..96cedf0 100644
import botocore.session
diff --git a/tests/integration/test_s3.py b/tests/integration/test_s3.py
index 1a007aa..e5e5ae3 100644
--- a/tests/integration/test_s3.py
+++ b/tests/integration/test_s3.py
@@ -31,7 +31,7 @@ from botocore.compat import six, zip_longest
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
@ -162,10 +162,10 @@ index 1a007aa..e5e5ae3 100644
from botocore.config import Config
from botocore.exceptions import ClientError
diff --git a/tests/unit/test_endpoint.py b/tests/unit/test_endpoint.py
index 0cc8ab1..ffcce97 100644
--- a/tests/unit/test_endpoint.py
+++ b/tests/unit/test_endpoint.py
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
@ -175,10 +175,10 @@ index 0cc8ab1..ffcce97 100644
from botocore.compat import six
from botocore.awsrequest import AWSRequest
diff --git a/tests/unit/test_http_client_exception_mapping.py b/tests/unit/test_http_client_exception_mapping.py
index 9eee38c..7dc759a 100644
--- a/tests/unit/test_http_client_exception_mapping.py
+++ b/tests/unit/test_http_client_exception_mapping.py
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
@@ -1,8 +1,8 @@
from nose.tools import assert_raises
@ -190,11 +190,11 @@ index 9eee38c..7dc759a 100644
EXCEPTION_MAPPING = [
(botocore_exceptions.ReadTimeoutError, requests_exceptions.ReadTimeout),
diff --git a/tests/unit/test_http_session.py b/tests/unit/test_http_session.py
index 5568a68..5492c73 100644
--- a/tests/unit/test_http_session.py
+++ b/tests/unit/test_http_session.py
@@ -3,7 +3,7 @@ from tests import unittest
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
@@ -5,7 +5,7 @@
from nose.tools import raises
from urllib3.exceptions import NewConnectionError, ProtocolError