[Python-modules-commits] [python-botocore] 10/13: merge patched into master
Takaki Taniguchi
takaki at moszumanska.debian.org
Tue Oct 11 01:18:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
takaki pushed a commit to branch master
in repository python-botocore.
commit 2f5fe39d2634607773aae4a87f706431d05bb61c
Merge: ba1d192 d362c7b
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date: Tue Oct 11 10:03:55 2016 +0900
merge patched into master
botocore/endpoint.py | 2 +-
botocore/stub.py | 2 +-
debian/.git-dpm | 4 +--
.../0001-Don-t-use-duplicated-modules.patch | 31 +++++++++++++++++++---
...002-Don-t-use-duplicated-modules-in-tests.patch | 18 +++++++++++--
tests/unit/test_utils.py | 2 +-
6 files changed, 48 insertions(+), 11 deletions(-)
diff --cc debian/.git-dpm
index c31bbdb,0000000..f33c279
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 5c5e1a92b3d77902c86018008cf6a2e022eddd38
- 5c5e1a92b3d77902c86018008cf6a2e022eddd38
++d362c7b19b96d362c91e754220245d197343943b
++d362c7b19b96d362c91e754220245d197343943b
+af927425f0e0e7f91a231c785a0e888e66971644
+af927425f0e0e7f91a231c785a0e888e66971644
+python-botocore_1.4.60.orig.tar.gz
+9574e0532c4aac2774aa0e9425eb2c30b5b256d7
+2563963
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Don-t-use-duplicated-modules.patch
index 53fbc5f,0000000..3d82fbf
mode 100644,000000..100644
--- a/debian/patches/0001-Don-t-use-duplicated-modules.patch
+++ b/debian/patches/0001-Don-t-use-duplicated-modules.patch
@@@ -1,128 -1,0 +1,151 @@@
- From 58b7b506aa3d8f265d18cfa7211d3fa42712403c Mon Sep 17 00:00:00 2001
++From 9c646b991cffe67a2de513866b915439e08d907a Mon Sep 17 00:00:00 2001
+From: TANIGUCHI Takaki <takaki at asis.media-as.org>
+Date: Tue, 24 Nov 2015 20:40:16 +0900
+Subject: Don't use duplicated modules
+
+fix path
+---
+ botocore/awsrequest.py | 12 ++++++------
+ botocore/compat.py | 4 ++--
- botocore/endpoint.py | 12 ++++++------
++ botocore/endpoint.py | 14 +++++++-------
+ botocore/exceptions.py | 2 +-
+ botocore/retryhandler.py | 4 ++--
++ botocore/stub.py | 2 +-
+ botocore/utils.py | 2 +-
- 6 files changed, 18 insertions(+), 18 deletions(-)
++ 7 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
+index a667bb5..1329c8a 100644
+--- a/botocore/awsrequest.py
++++ b/botocore/awsrequest.py
+@@ -22,15 +22,15 @@ from botocore.compat import six
+ from botocore.compat import HTTPHeaders, HTTPResponse, urlunsplit, urlsplit
+ from botocore.exceptions import UnseekableStreamError
+ from botocore.utils import percent_encode_sequence
+-from botocore.vendored.requests import models
+-from botocore.vendored.requests.sessions import REDIRECT_STATI
+-from botocore.vendored.requests.packages.urllib3.connection import \
++from requests import models
++from requests.sessions import REDIRECT_STATI
++from urllib3.connection import \
+ VerifiedHTTPSConnection
+-from botocore.vendored.requests.packages.urllib3.connection import \
++from urllib3.connection import \
+ HTTPConnection
+-from botocore.vendored.requests.packages.urllib3.connectionpool import \
++from urllib3.connectionpool import \
+ HTTPConnectionPool
+-from botocore.vendored.requests.packages.urllib3.connectionpool import \
++from urllib3.connectionpool import \
+ HTTPSConnectionPool
+
+
+diff --git a/botocore/compat.py b/botocore/compat.py
+index dbd5113..b5bcaa0 100644
+--- a/botocore/compat.py
++++ b/botocore/compat.py
+@@ -19,9 +19,9 @@ import warnings
+ import hashlib
+ import logging
+
+-from botocore.vendored import six
++import six
+ from botocore.exceptions import MD5UnavailableError
+-from botocore.vendored.requests.packages.urllib3 import exceptions
++from urllib3 import exceptions
+
+ logger = logging.getLogger(__name__)
+
+diff --git a/botocore/endpoint.py b/botocore/endpoint.py
- index 228d43d..990a4b9 100644
++index 228d43d..1fa1eef 100644
+--- a/botocore/endpoint.py
++++ b/botocore/endpoint.py
+@@ -17,11 +17,11 @@ import logging
+ import time
+ import threading
+
+-from botocore.vendored.requests.adapters import HTTPAdapter
+-from botocore.vendored.requests.sessions import Session
+-from botocore.vendored.requests.utils import get_environ_proxies
+-from botocore.vendored.requests.exceptions import ConnectionError
+-from botocore.vendored import six
++from requests.adapters import HTTPAdapter
++from requests.sessions import Session
++from requests.utils import get_environ_proxies
++from requests.exceptions import ConnectionError
++import six
+
+ from botocore.awsrequest import create_request_object
+ from botocore.exceptions import UnknownEndpointError
++@@ -40,7 +40,7 @@ MAX_POOL_CONNECTIONS = 10
++ filter_ssl_warnings()
++
++ try:
++- from botocore.vendored.requests.packages.urllib3.contrib import pyopenssl
+++ from urllib3.contrib import pyopenssl
++ pyopenssl.extract_from_urllib3()
++ except ImportError:
++ pass
+@@ -52,7 +52,7 @@ def convert_to_response_dict(http_response, operation_model):
+ This converts the requests library's HTTP response object to
+ a dictionary.
+
+- :type http_response: botocore.vendored.requests.model.Response
++ :type http_response: requests.model.Response
+ :param http_response: The HTTP response from an AWS service request.
+
+ :rtype: dict
+diff --git a/botocore/exceptions.py b/botocore/exceptions.py
+index f0fd172..3ac7d3b 100644
+--- a/botocore/exceptions.py
++++ b/botocore/exceptions.py
+@@ -12,7 +12,7 @@
+ # ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ from __future__ import unicode_literals
+-from botocore.vendored.requests.exceptions import ConnectionError
++from requests.exceptions import ConnectionError
+
+
+ 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
+ import logging
+ from binascii import crc32
+
+-from botocore.vendored.requests import ConnectionError, Timeout
+-from botocore.vendored.requests.packages.urllib3.exceptions import ClosedPoolError
++from requests import ConnectionError, Timeout
++from urllib3.exceptions import ClosedPoolError
+
+ from botocore.exceptions import ChecksumError, EndpointConnectionError
+
++diff --git a/botocore/stub.py b/botocore/stub.py
++index 9413ba8..ca657b6 100644
++--- a/botocore/stub.py
+++++ b/botocore/stub.py
++@@ -17,7 +17,7 @@ from pprint import pformat
++ from botocore.validate import validate_parameters
++ from botocore.exceptions import ParamValidationError, \
++ StubResponseError, StubAssertionError
++-from botocore.vendored.requests.models import Response
+++from requests.models import Response
++
++
++ ANY = object()
+diff --git a/botocore/utils.py b/botocore/utils.py
+index 6218b8a..4339acd 100644
+--- a/botocore/utils.py
++++ b/botocore/utils.py
+@@ -28,7 +28,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
+-from botocore.vendored import requests
++import requests
+ from botocore.compat import OrderedDict
+
+
diff --cc debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch
index 8a2638c,0000000..90eea06
mode 100644,000000..100644
--- a/debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch
+++ b/debian/patches/0002-Don-t-use-duplicated-modules-in-tests.patch
@@@ -1,164 -1,0 +1,178 @@@
- From 5c5e1a92b3d77902c86018008cf6a2e022eddd38 Mon Sep 17 00:00:00 2001
++From d362c7b19b96d362c91e754220245d197343943b Mon Sep 17 00:00:00 2001
+From: TANIGUCHI Takaki <takaki at asis.media-as.org>
+Date: Tue, 24 Nov 2015 21:34:20 +0900
+Subject: Don't use duplicated modules (in tests)
+
+---
+ tests/integration/test_glacier.py | 2 +-
+ tests/integration/test_s3.py | 8 ++++----
+ tests/integration/test_smoke.py | 6 +++---
+ tests/unit/auth/test_signers.py | 2 +-
+ tests/unit/response_parsing/test_response_parsing.py | 2 +-
+ tests/unit/test_awsrequest.py | 2 +-
+ tests/unit/test_endpoint.py | 2 +-
+ tests/unit/test_response.py | 2 +-
+ tests/unit/test_retryhandler.py | 4 ++--
- 9 files changed, 15 insertions(+), 15 deletions(-)
++ tests/unit/test_utils.py | 2 +-
++ 10 files changed, 16 insertions(+), 16 deletions(-)
+
+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
+@@ -13,7 +13,7 @@
+ from tests import unittest
+
+ from botocore.exceptions import ClientError
+-from botocore.vendored import six
++import six
+ import botocore.session
+
+
+diff --git a/tests/integration/test_s3.py b/tests/integration/test_s3.py
+index 83e2cc2..89994a4 100644
+--- a/tests/integration/test_s3.py
++++ b/tests/integration/test_s3.py
+@@ -24,13 +24,13 @@ from contextlib import closing
+
+ from nose.plugins.attrib import attr
+
+-from botocore.vendored.requests import adapters
+-from botocore.vendored.requests.exceptions import ConnectionError
++from requests import adapters
++from requests.exceptions import ConnectionError
+ from botocore.compat import six, zip_longest
+ 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
+
+@@ -777,7 +777,7 @@ class TestS3SigV4Client(BaseS3ClientTest):
+ raise ConnectionError("Simulated ConnectionError raised.")
+ else:
+ return original_send(self, *args, **kwargs)
+- with mock.patch('botocore.vendored.requests.adapters.HTTPAdapter.send',
++ with mock.patch('requests.adapters.HTTPAdapter.send',
+ mock_http_adapter_send):
+ 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 1a475ed..b8b30e5 100644
+--- a/tests/integration/test_smoke.py
++++ b/tests/integration/test_smoke.py
+@@ -19,8 +19,8 @@ from nose.tools import assert_equals, assert_true
+ from botocore import xform_name
+ import botocore.session
+ from botocore.client import ClientError
+-from botocore.vendored.requests import adapters
+-from botocore.vendored.requests.exceptions import ConnectionError
++from requests import adapters
++from requests.exceptions import ConnectionError
+
+
+ # Mapping of service -> api calls to try.
+@@ -292,7 +292,7 @@ def _make_client_call_with_errors(client, operation_name, kwargs):
+ raise ConnectionError("Simulated ConnectionError raised.")
+ else:
+ return original_send(self, *args, **kwargs)
+- with mock.patch('botocore.vendored.requests.adapters.HTTPAdapter.send',
++ with mock.patch('requests.adapters.HTTPAdapter.send',
+ mock_http_adapter_send):
+ try:
+ response = operation(**kwargs)
+diff --git a/tests/unit/auth/test_signers.py b/tests/unit/auth/test_signers.py
+index f084576..aa140d3 100644
+--- a/tests/unit/auth/test_signers.py
++++ b/tests/unit/auth/test_signers.py
+@@ -25,7 +25,7 @@ import botocore.auth
+ import botocore.credentials
+ from botocore.compat import HTTPHeaders, urlsplit, parse_qs, six
+ from botocore.awsrequest import AWSRequest
+-from botocore.vendored.requests.models import Request
++from requests.models import Request
+
+
+ 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 97249d6..afa6474 100644
+--- a/tests/unit/response_parsing/test_response_parsing.py
++++ b/tests/unit/response_parsing/test_response_parsing.py
+@@ -20,7 +20,7 @@ import difflib
+ from tests import unittest, create_session
+
+ from mock import Mock
+-from botocore.vendored.requests.structures import CaseInsensitiveDict
++from requests.structures import CaseInsensitiveDict
+
+ import botocore.session
+ from botocore import xform_name
+diff --git a/tests/unit/test_awsrequest.py b/tests/unit/test_awsrequest.py
+index d37aa24..e43d627 100644
+--- a/tests/unit/test_awsrequest.py
++++ b/tests/unit/test_awsrequest.py
+@@ -418,7 +418,7 @@ class TestAWSHTTPConnection(unittest.TestCase):
+ conn.sock = s
+ # Test that the standard library method was used by patching out
+ # the ``_tunnel`` method and seeing if the std lib method was called.
+- with patch('botocore.vendored.requests.packages.urllib3.connection.'
++ with patch('requests.packages.urllib3.connection.'
+ 'HTTPConnection._tunnel') as mock_tunnel:
+ conn._tunnel()
+ self.assertTrue(mock_tunnel.called)
+diff --git a/tests/unit/test_endpoint.py b/tests/unit/test_endpoint.py
+index b7f9cbf..038a3b7 100644
+--- a/tests/unit/test_endpoint.py
++++ b/tests/unit/test_endpoint.py
+@@ -15,7 +15,7 @@ from tests import unittest
+
+ from mock import Mock, patch, sentinel
+ from nose.tools import assert_equals
+-from botocore.vendored.requests import ConnectionError
++from requests import ConnectionError
+
+ 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
+--- a/tests/unit/test_response.py
++++ b/tests/unit/test_response.py
+@@ -20,7 +20,7 @@ import botocore
+ from botocore import response
+ from botocore.compat import six
+ from botocore.exceptions import IncompleteReadError
+-from botocore.vendored.requests.models import Response, Request
++from requests.models import Response, Request
+
+ XMLBODY1 = (b'<?xml version="1.0" encoding="UTF-8"?><Error>'
+ b'<Code>AccessDenied</Code>'
+diff --git a/tests/unit/test_retryhandler.py b/tests/unit/test_retryhandler.py
+index 3f31a69..a6f05b8 100644
+--- a/tests/unit/test_retryhandler.py
++++ b/tests/unit/test_retryhandler.py
+@@ -16,8 +16,8 @@
+ from tests import unittest
+
+ import mock
+-from botocore.vendored.requests import ConnectionError, Timeout
+-from botocore.vendored.requests.packages.urllib3.exceptions import ClosedPoolError
++from requests import ConnectionError, Timeout
++from urllib3.exceptions import ClosedPoolError
+
+ from botocore import retryhandler
+ from botocore.exceptions import ChecksumError
++diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
++index 5d5cd85..2feee5e 100644
++--- a/tests/unit/test_utils.py
+++++ b/tests/unit/test_utils.py
++@@ -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
++-from botocore.vendored import requests
+++import requests
++ from botocore.utils import remove_dot_segments
++ from botocore.utils import normalize_url_path
++ from botocore.utils import validate_jmespath_for_set
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-botocore.git
More information about the Python-modules-commits
mailing list