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

d/patches: Refreshed.

Browse source 
Signed-off-by: Alexander Gerasiov <gerasiov@yandex-team.ru>
This commit is contained in:
Alexander Gerasiov 2018-07-11 09:31:06 +03:00
parent 544e43a50a
commit 689e370140
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,9 +13,11 @@ fix path
botocore/utils.py | 2 +-
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
index c26ebc0..f1083af 100644
--- a/botocore/awsrequest.py
+++ b/botocore/awsrequest.py
@@ -23,15 +23,15 @@ from botocore.compat import HTTPHeaders,
@@ -23,15 +23,15 @@ from botocore.compat import HTTPHeaders, HTTPResponse, urlunsplit, urlsplit,\
urlparse
from botocore.exceptions import UnseekableStreamError
from botocore.utils import percent_encode_sequence
@ -37,6 +39,8 @@ fix path
HTTPSConnectionPool
diff --git a/botocore/compat.py b/botocore/compat.py
index edf4df4..86d8d3d 100644
--- a/botocore/compat.py
+++ b/botocore/compat.py
@@ -21,15 +21,15 @@ import logging
@ -58,6 +62,8 @@ fix path
class HTTPHeaders(http_client.HTTPMessage):
pass
diff --git a/botocore/endpoint.py b/botocore/endpoint.py
index ec33517..60497b9 100644
--- a/botocore/endpoint.py
+++ b/botocore/endpoint.py
@@ -17,11 +17,11 @@ import logging
@ -86,7 +92,7 @@ fix path
pyopenssl.extract_from_urllib3()
except ImportError:
pass
@@ -54,7 +54,7 @@ def convert_to_response_dict(http_respon
@@ -54,7 +54,7 @@ def convert_to_response_dict(http_response, operation_model):
This converts the requests library's HTTP response object to
a dictionary.
@ -95,6 +101,8 @@ fix path
:param http_response: The HTTP response from an AWS service request.
:rtype: dict
diff --git a/botocore/exceptions.py b/botocore/exceptions.py
index b5eb012..23bad58 100644
--- a/botocore/exceptions.py
+++ b/botocore/exceptions.py
@@ -12,7 +12,7 @@
@ -106,6 +114,8 @@ fix path
class BotoCoreError(Exception):
diff --git a/botocore/retryhandler.py b/botocore/retryhandler.py
index 09b59e5..58913ec 100644
--- a/botocore/retryhandler.py
+++ b/botocore/retryhandler.py
@@ -17,8 +17,8 @@ import functools
@ -119,6 +129,8 @@ fix path
from botocore.exceptions import ChecksumError, EndpointConnectionError
diff --git a/botocore/stub.py b/botocore/stub.py
index 312a6ce..7a23aa7 100644
--- a/botocore/stub.py
+++ b/botocore/stub.py
@@ -17,7 +17,7 @@ from pprint import pformat
@ -130,9 +142,11 @@ fix path
class _ANY(object):
diff --git a/botocore/utils.py b/botocore/utils.py
index 0de8e57..bb1914b 100644
--- a/botocore/utils.py
+++ b/botocore/utils.py
@@ -28,7 +28,7 @@ from botocore.exceptions import InvalidE
@@ -29,7 +29,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound
from botocore.exceptions import InvalidDNSNameError, ClientError
from botocore.exceptions import MetadataRetrievalError
from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit

16
debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch vendored
View file

@ -28,7 +28,7 @@ index 23a7f34..96cedf0 100644
diff --git a/tests/integration/test_s3.py b/tests/integration/test_s3.py
index 796bbe1..f34b1fd 100644
index 1f07ef0..84962ed 100644
--- a/tests/integration/test_s3.py
+++ b/tests/integration/test_s3.py
@@ -25,13 +25,13 @@ from contextlib import closing
@ -48,7 +48,7 @@ index 796bbe1..f34b1fd 100644
from botocore.config import Config
from botocore.exceptions import ClientError
@@ -816,7 +816,7 @@ class TestS3SigV4Client(BaseS3ClientTest):
@@ -823,7 +823,7 @@ class TestS3SigV4Client(BaseS3ClientTest):
raise ConnectionError("Simulated ConnectionError raised.")
else:
return original_send(self, *args, **kwargs)
@ -58,7 +58,7 @@ index 796bbe1..f34b1fd 100644
response = self.client.put_object(Bucket=self.bucket_name,
Key='foo.txt', Body=body)
diff --git a/tests/integration/test_smoke.py b/tests/integration/test_smoke.py
index 8730a44..d433632 100644
index 76bcded..85ef5d0 100644
--- a/tests/integration/test_smoke.py
+++ b/tests/integration/test_smoke.py
@@ -19,8 +19,8 @@ from nose.tools import assert_equal, assert_true
@ -82,7 +82,7 @@ index 8730a44..d433632 100644
try:
response = operation(**kwargs)
diff --git a/tests/unit/auth/test_signers.py b/tests/unit/auth/test_signers.py
index 0037a49..938f99b 100644
index d3dfab9..8f7b28f 100644
--- a/tests/unit/auth/test_signers.py
+++ b/tests/unit/auth/test_signers.py
@@ -24,7 +24,7 @@ import botocore.auth
@ -108,7 +108,7 @@ index d37aa24..e43d627 100644
conn._tunnel()
self.assertTrue(mock_tunnel.called)
diff --git a/tests/unit/test_endpoint.py b/tests/unit/test_endpoint.py
index d69fc69..e8e6cd0 100644
index fff84b0..2f266a4 100644
--- a/tests/unit/test_endpoint.py
+++ b/tests/unit/test_endpoint.py
@@ -14,7 +14,7 @@
@ -121,7 +121,7 @@ index d69fc69..e8e6cd0 100644
from botocore.compat import six
from botocore.awsrequest import AWSRequest
diff --git a/tests/unit/test_response.py b/tests/unit/test_response.py
index 7b2eb25..35d07c8 100644
index 39daf58..2b8787d 100644
--- a/tests/unit/test_response.py
+++ b/tests/unit/test_response.py
@@ -20,7 +20,7 @@ import botocore
@ -149,10 +149,10 @@ index 3f31a69..a6f05b8 100644
from botocore import retryhandler
from botocore.exceptions import ChecksumError
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index c1cc1b9..7585823 100644
index 054aee4..5842674 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -27,7 +27,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound
@@ -25,7 +25,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound
from botocore.exceptions import ClientError
from botocore.exceptions import InvalidDNSNameError, MetadataRetrievalError
from botocore.model import ServiceModel