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

refresh patch

Browse source
This commit is contained in:
TANIGUCHI Takaki 2016-11-10 11:32:45 +09:00
parent 214b7f7b52
commit 3b4db9780e
2 changed files with 87 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,11 +14,11 @@ fix path
botocore/utils.py | 2 +- botocore/utils.py | 2 +-
7 files changed, 20 insertions(+), 20 deletions(-) 7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py Index: python-botocore/botocore/awsrequest.py
index a667bb5..1329c8a 100644 ===================================================================
--- a/botocore/awsrequest.py --- python-botocore.orig/botocore/awsrequest.py 2016-11-10 11:30:23.478805141 +0900
+++ b/botocore/awsrequest.py +++ python-botocore/botocore/awsrequest.py 2016-11-10 11:30:23.466805008 +0900
@@ -22,15 +22,15 @@ from botocore.compat import six @@ -22,15 +22,15 @@
from botocore.compat import HTTPHeaders, HTTPResponse, urlunsplit, urlsplit from botocore.compat import HTTPHeaders, HTTPResponse, urlunsplit, urlsplit
from botocore.exceptions import UnseekableStreamError from botocore.exceptions import UnseekableStreamError
from botocore.utils import percent_encode_sequence from botocore.utils import percent_encode_sequence
@ -40,11 +40,11 @@ index a667bb5..1329c8a 100644
HTTPSConnectionPool HTTPSConnectionPool
diff --git a/botocore/compat.py b/botocore/compat.py Index: python-botocore/botocore/compat.py
index dbd5113..b5bcaa0 100644 ===================================================================
--- a/botocore/compat.py --- python-botocore.orig/botocore/compat.py 2016-11-10 11:30:23.478805141 +0900
+++ b/botocore/compat.py +++ python-botocore/botocore/compat.py 2016-11-10 11:30:23.466805008 +0900
@@ -19,9 +19,9 @@ import warnings @@ -19,9 +19,9 @@
import hashlib import hashlib
import logging import logging
@ -56,11 +56,11 @@ index dbd5113..b5bcaa0 100644
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
diff --git a/botocore/endpoint.py b/botocore/endpoint.py Index: python-botocore/botocore/endpoint.py
index 228d43d..1fa1eef 100644 ===================================================================
--- a/botocore/endpoint.py --- python-botocore.orig/botocore/endpoint.py 2016-11-10 11:30:23.478805141 +0900
+++ b/botocore/endpoint.py +++ python-botocore/botocore/endpoint.py 2016-11-10 11:30:23.466805008 +0900
@@ -17,11 +17,11 @@ import logging @@ -17,11 +17,11 @@
import time import time
import threading import threading
@ -77,7 +77,7 @@ index 228d43d..1fa1eef 100644
from botocore.awsrequest import create_request_object from botocore.awsrequest import create_request_object
from botocore.exceptions import UnknownEndpointError from botocore.exceptions import UnknownEndpointError
@@ -40,7 +40,7 @@ MAX_POOL_CONNECTIONS = 10 @@ -40,7 +40,7 @@
filter_ssl_warnings() filter_ssl_warnings()
try: try:
@ -86,7 +86,7 @@ index 228d43d..1fa1eef 100644
pyopenssl.extract_from_urllib3() pyopenssl.extract_from_urllib3()
except ImportError: except ImportError:
pass pass
@@ -52,7 +52,7 @@ def convert_to_response_dict(http_response, operation_model): @@ -52,7 +52,7 @@
This converts the requests library's HTTP response object to This converts the requests library's HTTP response object to
a dictionary. a dictionary.
@ -95,10 +95,10 @@ index 228d43d..1fa1eef 100644
:param http_response: The HTTP response from an AWS service request. :param http_response: The HTTP response from an AWS service request.
:rtype: dict :rtype: dict
diff --git a/botocore/exceptions.py b/botocore/exceptions.py Index: python-botocore/botocore/exceptions.py
index f0fd172..3ac7d3b 100644 ===================================================================
--- a/botocore/exceptions.py --- python-botocore.orig/botocore/exceptions.py 2016-11-10 11:30:23.478805141 +0900
+++ b/botocore/exceptions.py +++ python-botocore/botocore/exceptions.py 2016-11-10 11:30:23.466805008 +0900
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
# ANY KIND, either express or implied. See the License for the specific # ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License. # language governing permissions and limitations under the License.
@ -108,11 +108,11 @@ index f0fd172..3ac7d3b 100644
class BotoCoreError(Exception): class BotoCoreError(Exception):
diff --git a/botocore/retryhandler.py b/botocore/retryhandler.py Index: python-botocore/botocore/retryhandler.py
index 09b59e5..58913ec 100644 ===================================================================
--- a/botocore/retryhandler.py --- python-botocore.orig/botocore/retryhandler.py 2016-11-10 11:30:23.478805141 +0900
+++ b/botocore/retryhandler.py +++ python-botocore/botocore/retryhandler.py 2016-11-10 11:30:23.466805008 +0900
@@ -17,8 +17,8 @@ import functools @@ -17,8 +17,8 @@
import logging import logging
from binascii import crc32 from binascii import crc32
@ -123,11 +123,11 @@ index 09b59e5..58913ec 100644
from botocore.exceptions import ChecksumError, EndpointConnectionError from botocore.exceptions import ChecksumError, EndpointConnectionError
diff --git a/botocore/stub.py b/botocore/stub.py Index: python-botocore/botocore/stub.py
index 9413ba8..ca657b6 100644 ===================================================================
--- a/botocore/stub.py --- python-botocore.orig/botocore/stub.py 2016-11-10 11:30:23.478805141 +0900
+++ b/botocore/stub.py +++ python-botocore/botocore/stub.py 2016-11-10 11:30:23.466805008 +0900
@@ -17,7 +17,7 @@ from pprint import pformat @@ -17,7 +17,7 @@
from botocore.validate import validate_parameters from botocore.validate import validate_parameters
from botocore.exceptions import ParamValidationError, \ from botocore.exceptions import ParamValidationError, \
StubResponseError, StubAssertionError StubResponseError, StubAssertionError
@ -135,12 +135,12 @@ index 9413ba8..ca657b6 100644
+from requests.models import Response +from requests.models import Response
ANY = object() class _ANY(object):
diff --git a/botocore/utils.py b/botocore/utils.py Index: python-botocore/botocore/utils.py
index 6218b8a..4339acd 100644 ===================================================================
--- a/botocore/utils.py --- python-botocore.orig/botocore/utils.py 2016-11-10 11:30:23.478805141 +0900
+++ b/botocore/utils.py +++ python-botocore/botocore/utils.py 2016-11-10 11:30:23.466805008 +0900
@@ -28,7 +28,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound @@ -28,7 +28,7 @@
from botocore.exceptions import InvalidDNSNameError, ClientError from botocore.exceptions import InvalidDNSNameError, ClientError
from botocore.exceptions import MetadataRetrievalError from botocore.exceptions import MetadataRetrievalError
from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit

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

@ -16,10 +16,10 @@ Subject: Don't use duplicated modules (in tests)
tests/unit/test_utils.py | 2 +- tests/unit/test_utils.py | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-) 10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/tests/integration/test_glacier.py b/tests/integration/test_glacier.py Index: python-botocore/tests/integration/test_glacier.py
index 23a7f34..96cedf0 100644 ===================================================================
--- a/tests/integration/test_glacier.py --- python-botocore.orig/tests/integration/test_glacier.py 2016-11-10 11:30:36.074944538 +0900
+++ b/tests/integration/test_glacier.py +++ python-botocore/tests/integration/test_glacier.py 2016-11-10 11:30:36.066944449 +0900
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
from tests import unittest from tests import unittest
@ -29,11 +29,11 @@ index 23a7f34..96cedf0 100644
import botocore.session import botocore.session
diff --git a/tests/integration/test_s3.py b/tests/integration/test_s3.py Index: python-botocore/tests/integration/test_s3.py
index 83e2cc2..89994a4 100644 ===================================================================
--- a/tests/integration/test_s3.py --- python-botocore.orig/tests/integration/test_s3.py 2016-11-10 11:30:36.074944538 +0900
+++ b/tests/integration/test_s3.py +++ python-botocore/tests/integration/test_s3.py 2016-11-10 11:30:36.066944449 +0900
@@ -24,13 +24,13 @@ from contextlib import closing @@ -24,13 +24,13 @@
from nose.plugins.attrib import attr from nose.plugins.attrib import attr
@ -50,7 +50,7 @@ index 83e2cc2..89994a4 100644
from botocore.config import Config from botocore.config import Config
from botocore.exceptions import ClientError from botocore.exceptions import ClientError
@@ -777,7 +777,7 @@ class TestS3SigV4Client(BaseS3ClientTest): @@ -777,7 +777,7 @@
raise ConnectionError("Simulated ConnectionError raised.") raise ConnectionError("Simulated ConnectionError raised.")
else: else:
return original_send(self, *args, **kwargs) return original_send(self, *args, **kwargs)
@ -59,11 +59,11 @@ index 83e2cc2..89994a4 100644
mock_http_adapter_send): mock_http_adapter_send):
response = self.client.put_object(Bucket=self.bucket_name, response = self.client.put_object(Bucket=self.bucket_name,
Key='foo.txt', Body=body) Key='foo.txt', Body=body)
diff --git a/tests/integration/test_smoke.py b/tests/integration/test_smoke.py Index: python-botocore/tests/integration/test_smoke.py
index 1a475ed..b8b30e5 100644 ===================================================================
--- a/tests/integration/test_smoke.py --- python-botocore.orig/tests/integration/test_smoke.py 2016-11-10 11:30:36.074944538 +0900
+++ b/tests/integration/test_smoke.py +++ python-botocore/tests/integration/test_smoke.py 2016-11-10 11:30:36.066944449 +0900
@@ -19,8 +19,8 @@ from nose.tools import assert_equals, assert_true @@ -19,8 +19,8 @@
from botocore import xform_name from botocore import xform_name
import botocore.session import botocore.session
from botocore.client import ClientError from botocore.client import ClientError
@ -74,7 +74,7 @@ index 1a475ed..b8b30e5 100644
# Mapping of service -> api calls to try. # Mapping of service -> api calls to try.
@@ -292,7 +292,7 @@ def _make_client_call_with_errors(client, operation_name, kwargs): @@ -292,7 +292,7 @@
raise ConnectionError("Simulated ConnectionError raised.") raise ConnectionError("Simulated ConnectionError raised.")
else: else:
return original_send(self, *args, **kwargs) return original_send(self, *args, **kwargs)
@ -83,11 +83,11 @@ index 1a475ed..b8b30e5 100644
mock_http_adapter_send): mock_http_adapter_send):
try: try:
response = operation(**kwargs) response = operation(**kwargs)
diff --git a/tests/unit/auth/test_signers.py b/tests/unit/auth/test_signers.py Index: python-botocore/tests/unit/auth/test_signers.py
index f084576..aa140d3 100644 ===================================================================
--- a/tests/unit/auth/test_signers.py --- python-botocore.orig/tests/unit/auth/test_signers.py 2016-11-10 11:30:36.074944538 +0900
+++ b/tests/unit/auth/test_signers.py +++ python-botocore/tests/unit/auth/test_signers.py 2016-11-10 11:30:36.066944449 +0900
@@ -25,7 +25,7 @@ import botocore.auth @@ -25,7 +25,7 @@
import botocore.credentials import botocore.credentials
from botocore.compat import HTTPHeaders, urlsplit, parse_qs, six from botocore.compat import HTTPHeaders, urlsplit, parse_qs, six
from botocore.awsrequest import AWSRequest from botocore.awsrequest import AWSRequest
@ -96,11 +96,11 @@ index f084576..aa140d3 100644
class BaseTestWithFixedDate(unittest.TestCase): class BaseTestWithFixedDate(unittest.TestCase):
diff --git a/tests/unit/response_parsing/test_response_parsing.py b/tests/unit/response_parsing/test_response_parsing.py Index: python-botocore/tests/unit/response_parsing/test_response_parsing.py
index 97249d6..afa6474 100644 ===================================================================
--- a/tests/unit/response_parsing/test_response_parsing.py --- python-botocore.orig/tests/unit/response_parsing/test_response_parsing.py 2016-11-10 11:30:36.074944538 +0900
+++ b/tests/unit/response_parsing/test_response_parsing.py +++ python-botocore/tests/unit/response_parsing/test_response_parsing.py 2016-11-10 11:30:36.066944449 +0900
@@ -20,7 +20,7 @@ import difflib @@ -20,7 +20,7 @@
from tests import unittest, create_session from tests import unittest, create_session
from mock import Mock from mock import Mock
@ -109,11 +109,11 @@ index 97249d6..afa6474 100644
import botocore.session import botocore.session
from botocore import xform_name from botocore import xform_name
diff --git a/tests/unit/test_awsrequest.py b/tests/unit/test_awsrequest.py Index: python-botocore/tests/unit/test_awsrequest.py
index d37aa24..e43d627 100644 ===================================================================
--- a/tests/unit/test_awsrequest.py --- python-botocore.orig/tests/unit/test_awsrequest.py 2016-11-10 11:30:36.074944538 +0900
+++ b/tests/unit/test_awsrequest.py +++ python-botocore/tests/unit/test_awsrequest.py 2016-11-10 11:30:36.066944449 +0900
@@ -418,7 +418,7 @@ class TestAWSHTTPConnection(unittest.TestCase): @@ -418,7 +418,7 @@
conn.sock = s conn.sock = s
# Test that the standard library method was used by patching out # Test that the standard library method was used by patching out
# the ``_tunnel`` method and seeing if the std lib method was called. # the ``_tunnel`` method and seeing if the std lib method was called.
@ -122,11 +122,11 @@ index d37aa24..e43d627 100644
'HTTPConnection._tunnel') as mock_tunnel: 'HTTPConnection._tunnel') as mock_tunnel:
conn._tunnel() conn._tunnel()
self.assertTrue(mock_tunnel.called) self.assertTrue(mock_tunnel.called)
diff --git a/tests/unit/test_endpoint.py b/tests/unit/test_endpoint.py Index: python-botocore/tests/unit/test_endpoint.py
index b7f9cbf..038a3b7 100644 ===================================================================
--- a/tests/unit/test_endpoint.py --- python-botocore.orig/tests/unit/test_endpoint.py 2016-11-10 11:30:36.074944538 +0900
+++ b/tests/unit/test_endpoint.py +++ python-botocore/tests/unit/test_endpoint.py 2016-11-10 11:30:36.066944449 +0900
@@ -15,7 +15,7 @@ from tests import unittest @@ -15,7 +15,7 @@
from mock import Mock, patch, sentinel from mock import Mock, patch, sentinel
from nose.tools import assert_equals from nose.tools import assert_equals
@ -135,11 +135,11 @@ index b7f9cbf..038a3b7 100644
from botocore.compat import six from botocore.compat import six
from botocore.awsrequest import AWSRequest from botocore.awsrequest import AWSRequest
diff --git a/tests/unit/test_response.py b/tests/unit/test_response.py Index: python-botocore/tests/unit/test_response.py
index 7b2eb25..35d07c8 100644 ===================================================================
--- a/tests/unit/test_response.py --- python-botocore.orig/tests/unit/test_response.py 2016-11-10 11:30:36.074944538 +0900
+++ b/tests/unit/test_response.py +++ python-botocore/tests/unit/test_response.py 2016-11-10 11:30:36.066944449 +0900
@@ -20,7 +20,7 @@ import botocore @@ -20,7 +20,7 @@
from botocore import response from botocore import response
from botocore.compat import six from botocore.compat import six
from botocore.exceptions import IncompleteReadError from botocore.exceptions import IncompleteReadError
@ -148,10 +148,10 @@ index 7b2eb25..35d07c8 100644
XMLBODY1 = (b'<?xml version="1.0" encoding="UTF-8"?><Error>' XMLBODY1 = (b'<?xml version="1.0" encoding="UTF-8"?><Error>'
b'<Code>AccessDenied</Code>' b'<Code>AccessDenied</Code>'
diff --git a/tests/unit/test_retryhandler.py b/tests/unit/test_retryhandler.py Index: python-botocore/tests/unit/test_retryhandler.py
index 3f31a69..a6f05b8 100644 ===================================================================
--- a/tests/unit/test_retryhandler.py --- python-botocore.orig/tests/unit/test_retryhandler.py 2016-11-10 11:30:36.074944538 +0900
+++ b/tests/unit/test_retryhandler.py +++ python-botocore/tests/unit/test_retryhandler.py 2016-11-10 11:30:36.066944449 +0900
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
from tests import unittest from tests import unittest
@ -163,11 +163,11 @@ index 3f31a69..a6f05b8 100644
from botocore import retryhandler from botocore import retryhandler
from botocore.exceptions import ChecksumError from botocore.exceptions import ChecksumError
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py Index: python-botocore/tests/unit/test_utils.py
index 5d5cd85..2feee5e 100644 ===================================================================
--- a/tests/unit/test_utils.py --- python-botocore.orig/tests/unit/test_utils.py 2016-11-10 11:30:36.074944538 +0900
+++ b/tests/unit/test_utils.py +++ python-botocore/tests/unit/test_utils.py 2016-11-10 11:30:36.066944449 +0900
@@ -25,7 +25,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound @@ -25,7 +25,7 @@
from botocore.exceptions import ClientError from botocore.exceptions import ClientError
from botocore.exceptions import InvalidDNSNameError, MetadataRetrievalError from botocore.exceptions import InvalidDNSNameError, MetadataRetrievalError
from botocore.model import ServiceModel from botocore.model import ServiceModel