[Python-modules-commits] [python-botocore] 04/13: merge patched into master
Takaki Taniguchi
takaki at moszumanska.debian.org
Tue Oct 11 01:18:25 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 65e8affaf4330e98d4609810075102af53fe7fb8
Merge: fc8b11e 5c5e1a9
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date: Tue Oct 11 09:30:26 2016 +0900
merge patched into master
PKG-INFO | 7 +-
README.rst | 5 +-
botocore.egg-info/PKG-INFO | 7 +-
botocore.egg-info/SOURCES.txt | 58 +-
botocore/__init__.py | 2 +-
botocore/args.py | 194 +
botocore/auth.py | 56 +-
botocore/awsrequest.py | 13 +-
botocore/client.py | 606 ++-
botocore/compat.py | 48 +
botocore/config.py | 352 +-
botocore/{config.py => configloader.py} | 3 +-
botocore/credentials.py | 246 +-
botocore/data/_endpoints.json | 226 -
botocore/data/_retry.json | 30 +
botocore/data/acm/2015-12-08/paginators-1.json | 11 +
botocore/data/acm/2015-12-08/service-2.json | 411 +-
botocore/data/apigateway/2015-07-09/service-2.json | 4398 +++++++++---------
.../2016-02-06/paginators-1.json | 22 +
.../2016-02-06/service-2.json | 766 ++++
.../data/autoscaling/2011-01-01/service-2.json | 656 ++-
.../data/cloudformation/2010-05-15/service-2.json | 709 ++-
.../data/cloudformation/2010-05-15/waiters-2.json | 235 +
botocore/data/cloudfront/2016-01-28/service-2.json | 24 +-
.../data/cloudfront/2016-08-01/paginators-1.json | 32 +
.../{2016-01-28 => 2016-08-01}/service-2.json | 537 ++-
botocore/data/cloudfront/2016-08-01/waiters-2.json | 47 +
.../data/cloudfront/2016-08-20/paginators-1.json | 32 +
.../{2016-01-28 => 2016-08-20}/service-2.json | 590 ++-
botocore/data/cloudfront/2016-08-20/waiters-2.json | 47 +
.../data/cloudfront/2016-09-07/paginators-1.json | 32 +
.../{2016-01-28 => 2016-09-07}/service-2.json | 608 ++-
botocore/data/cloudfront/2016-09-07/waiters-2.json | 47 +
botocore/data/cloudhsm/2014-05-30/service-2.json | 642 ++-
.../cloudsearchdomain/2013-01-01/service-2.json | 190 +-
botocore/data/cloudtrail/2013-11-01/service-2.json | 171 +-
botocore/data/cloudwatch/2010-08-01/service-2.json | 607 +--
.../data/codecommit/2015-04-13/paginators-1.json | 14 +
botocore/data/codecommit/2015-04-13/service-2.json | 1248 ++---
botocore/data/codedeploy/2014-10-06/service-2.json | 2176 ++++-----
botocore/data/codedeploy/2014-10-06/waiters-2.json | 30 +
.../data/codepipeline/2015-07-09/service-2.json | 1238 +++--
.../cognito-identity/2014-06-30/service-2.json | 1111 ++---
.../data/cognito-idp/2016-04-18/service-2.json | 4341 ++++++++++++++++++
botocore/data/config/2014-11-12/service-2.json | 217 +-
.../data/devicefarm/2015-06-23/paginators-1.json | 59 +
botocore/data/devicefarm/2015-06-23/service-2.json | 836 +++-
.../data/directconnect/2012-10-25/service-2.json | 133 +-
botocore/data/discovery/2015-11-01/service-2.json | 761 ++++
botocore/data/dms/2016-01-01/service-2.json | 2427 ++++++++++
botocore/data/ds/2015-04-16/service-2.json | 888 +++-
botocore/data/dynamodb/2012-08-10/service-2.json | 784 ++--
.../data/dynamodbstreams/2012-08-10/service-2.json | 204 +-
botocore/data/ec2/2015-10-01/paginators-1.json | 6 +
botocore/data/ec2/2015-10-01/service-2.json | 1597 +++++--
botocore/data/ec2/2015-10-01/waiters-2.json | 128 +-
.../{2015-10-01 => 2016-04-01}/paginators-1.json | 6 +
.../ec2/{2015-10-01 => 2016-04-01}/service-2.json | 2539 ++++++++---
.../ec2/{2015-10-01 => 2016-04-01}/waiters-2.json | 146 +-
botocore/data/ec2/2016-09-15/examples-1.json | 3740 +++++++++++++++
.../{2015-10-01 => 2016-09-15}/paginators-1.json | 6 +
.../ec2/{2015-10-01 => 2016-09-15}/service-2.json | 2803 +++++++++---
.../ec2/{2015-10-01 => 2016-09-15}/waiters-2.json | 138 +-
botocore/data/ecr/2015-09-21/paginators-1.json | 10 +
botocore/data/ecr/2015-09-21/service-2.json | 53 +-
botocore/data/ecs/2014-11-13/service-2.json | 206 +-
botocore/data/efs/2015-02-01/service-2.json | 653 +--
.../data/elasticache/2015-02-02/service-2.json | 2880 +++---------
.../elasticbeanstalk/2010-12-01/examples-1.json | 1109 +++++
.../elasticbeanstalk/2010-12-01/service-2.json | 445 +-
.../elastictranscoder/2012-09-25/service-2.json | 1030 +----
botocore/data/elb/2012-06-01/service-2.json | 1258 ++---
botocore/data/elbv2/2015-12-01/paginators-1.json | 22 +
botocore/data/elbv2/2015-12-01/service-2.json | 2470 ++++++++++
botocore/data/emr/2009-03-31/service-2.json | 539 ++-
botocore/data/emr/2009-03-31/waiters-2.json | 19 +
botocore/data/endpoints.json | 1422 ++++++
botocore/data/es/2015-01-01/service-2.json | 476 +-
botocore/data/events/2015-10-07/service-2.json | 997 ++++
botocore/data/firehose/2015-08-04/service-2.json | 578 ++-
botocore/data/gamelift/2015-10-01/service-2.json | 3706 +++++++++++++++
botocore/data/iam/2010-05-08/paginators-1.json | 121 +-
botocore/data/iam/2010-05-08/service-2.json | 858 ++--
botocore/data/inspector/2016-02-16/service-2.json | 2782 ++++++++++++
botocore/data/iot/2015-05-28/service-2.json | 2711 +++++++++--
botocore/data/kinesis/2013-12-02/paginators-1.json | 3 +-
botocore/data/kinesis/2013-12-02/service-2.json | 676 ++-
.../kinesisanalytics/2015-08-14/service-2.json | 1595 +++++++
botocore/data/kms/2014-11-01/service-2.json | 2420 +++-------
botocore/data/lambda/2015-03-31/service-2.json | 1471 +++---
botocore/data/logs/2014-03-28/service-2.json | 143 +-
.../data/machinelearning/2014-12-12/service-2.json | 594 ++-
.../2015-07-01/service-2.json | 188 +-
.../meteringmarketplace/2016-01-14/service-2.json | 151 +
botocore/data/opsworks/2013-02-18/service-2.json | 288 +-
botocore/data/opsworks/2013-02-18/waiters-2.json | 295 ++
botocore/data/rds/2014-10-31/paginators-1.json | 6 +
botocore/data/rds/2014-10-31/service-2.json | 2145 ++++++---
botocore/data/redshift/2012-12-01/service-2.json | 4783 ++++++--------------
botocore/data/route53/2013-04-01/service-2.json | 993 ++--
.../data/route53domains/2014-05-15/service-2.json | 895 ++--
botocore/data/s3/2006-03-01/paginators-1.json | 10 +
botocore/data/s3/2006-03-01/service-2.json | 325 +-
.../data/servicecatalog/2015-12-10/service-2.json | 1238 +++++
botocore/data/ses/2010-12-01/service-2.json | 1008 ++---
botocore/data/snowball/2016-06-30/service-2.json | 860 ++++
botocore/data/sns/2010-03-31/service-2.json | 1542 ++-----
botocore/data/sqs/2012-11-05/service-2.json | 508 +--
botocore/data/ssm/2014-11-06/service-2.json | 1073 ++++-
.../data/storagegateway/2013-06-30/service-2.json | 1739 +++----
botocore/data/sts/2011-06-15/service-2.json | 130 +-
botocore/data/support/2013-04-15/service-2.json | 460 +-
botocore/data/waf/2015-08-24/service-2.json | 474 +-
botocore/data/workspaces/2015-04-08/service-2.json | 621 ++-
botocore/docs/bcdoc/docstringparser.py | 189 +-
botocore/docs/bcdoc/style.py | 19 +-
botocore/docs/bcdoc/textwriter.py | 78 +-
botocore/docs/example.py | 6 +-
botocore/docs/method.py | 14 +-
botocore/docs/params.py | 26 +-
botocore/docs/shape.py | 28 +-
botocore/docs/sharedexample.py | 2 +-
botocore/endpoint.py | 107 +-
botocore/exceptions.py | 88 +-
botocore/handlers.py | 227 +-
botocore/hooks.py | 41 +-
botocore/loaders.py | 9 +-
botocore/model.py | 14 +-
botocore/paginate.py | 95 +-
botocore/parsers.py | 69 +-
botocore/regions.py | 240 +-
botocore/response.py | 14 +-
botocore/retryhandler.py | 6 +-
botocore/serialize.py | 11 +-
botocore/session.py | 102 +-
botocore/signers.py | 214 +-
botocore/stub.py | 364 ++
botocore/translate.py | 479 +-
botocore/utils.py | 334 +-
botocore/validate.py | 25 +-
botocore/waiter.py | 25 +-
debian/.git-dpm | 6 +-
.../0001-Don-t-use-duplicated-modules.patch | 47 +-
...002-Don-t-use-duplicated-modules-in-tests.patch | 32 +-
docs/source/conf.py | 4 +-
docs/source/reference/config.rst | 11 +
docs/source/reference/stubber.rst | 11 +
requirements.txt | 2 +-
tests/__init__.py | 78 +-
tests/functional/docs/test_alias.py | 36 +
tests/functional/test_alias.py | 84 +
tests/functional/test_apigateway.py | 42 +
tests/functional/test_credentials.py | 97 +
tests/functional/test_iot_data.py | 14 +-
tests/functional/test_paginate.py | 60 +
tests/functional/test_paginator_config.py | 155 +
tests/functional/test_regions.py | 500 ++
tests/functional/test_s3.py | 436 +-
tests/functional/test_session.py | 14 +
tests/functional/test_stub.py | 234 +
tests/functional/test_waiter_config.py | 59 +-
tests/integration/test_apigateway.py | 11 +-
tests/integration/test_client.py | 15 +-
tests/integration/test_credentials.py | 2 +
tests/integration/test_ec2.py | 16 +-
tests/integration/test_rds.py | 3 +-
tests/integration/test_route53.py | 23 +-
tests/integration/test_s3.py | 121 +-
tests/integration/test_smoke.py | 20 +-
tests/integration/test_sts.py | 2 +
tests/integration/test_waiters.py | 17 +-
tests/unit/__init__.py | 28 +
tests/unit/auth/test_signers.py | 82 +
tests/unit/docs/__init__.py | 6 +-
tests/unit/docs/bcdoc/test_docstringparser.py | 212 +
tests/unit/docs/bcdoc/test_style.py | 38 +
tests/unit/docs/test_method.py | 18 +
tests/unit/docs/test_sharedexample.py | 13 +
tests/unit/protocols/input/rest-json.json | 50 +
tests/unit/protocols/input/rest-xml.json | 130 +-
tests/unit/protocols/output/query.json | 3 +-
tests/unit/protocols/output/rest-json.json | 20 +
.../unit/response_parsing/test_response_parsing.py | 1 +
tests/unit/test_args.py | 126 +
tests/unit/test_awsrequest.py | 17 +-
tests/unit/test_client.py | 773 +++-
tests/unit/test_compat.py | 50 +-
.../unit/{test_config.py => test_configloader.py} | 4 +-
tests/unit/test_credentials.py | 301 +-
tests/unit/test_endpoint.py | 137 +-
tests/unit/test_exceptions.py | 42 +
tests/unit/test_handlers.py | 456 +-
tests/unit/test_loaders.py | 16 +
tests/unit/test_model.py | 77 +-
tests/unit/test_paginate.py | 224 +-
tests/unit/test_parsers.py | 587 ++-
tests/unit/test_regions.py | 649 +--
tests/unit/test_response.py | 31 +-
tests/unit/test_retryhandler.py | 6 +-
tests/unit/test_s3_addressing.py | 21 +-
tests/unit/test_serialize.py | 182 +-
tests/unit/test_session.py | 181 +-
tests/unit/test_signers.py | 439 +-
tests/unit/test_stub.py | 186 +
tests/unit/test_translate.py | 1048 +----
tests/unit/test_utils.py | 468 +-
tests/unit/test_validate.py | 38 +-
tests/unit/test_waiters.py | 28 +
208 files changed, 70969 insertions(+), 31919 deletions(-)
diff --cc debian/.git-dpm
index 6bac320,0000000..c31bbdb
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
- c8132ea126fb557832d6a3a4f0c52275f00634b4
- c8132ea126fb557832d6a3a4f0c52275f00634b4
- b50932b9a1069998d6bf7db71500684489cffc30
++5c5e1a92b3d77902c86018008cf6a2e022eddd38
++5c5e1a92b3d77902c86018008cf6a2e022eddd38
++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 bcd90d3,0000000..53fbc5f
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,125 -1,0 +1,128 @@@
- From dea6f47712096194b7f3d07a81a92164ecd6ac5e Mon Sep 17 00:00:00 2001
++From 58b7b506aa3d8f265d18cfa7211d3fa42712403c 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 | 10 +++++-----
++ botocore/endpoint.py | 12 ++++++------
+ botocore/exceptions.py | 2 +-
+ botocore/retryhandler.py | 4 ++--
+ botocore/utils.py | 2 +-
- 6 files changed, 17 insertions(+), 17 deletions(-)
++ 6 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
- index 06d0871..6bd1ab4 100644
++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 0bc4f2d..f77763f 100644
++index dbd5113..b5bcaa0 100644
+--- a/botocore/compat.py
++++ b/botocore/compat.py
- @@ -17,8 +17,8 @@ import sys
- import inspect
- import warnings
++@@ -19,9 +19,9 @@ import warnings
++ import hashlib
++ import logging
+
+-from botocore.vendored import six
- -from botocore.vendored.requests.packages.urllib3 import exceptions
++import six
++ from botocore.exceptions import MD5UnavailableError
++-from botocore.vendored.requests.packages.urllib3 import exceptions
++from urllib3 import exceptions
+
++ logger = logging.getLogger(__name__)
+
- if six.PY3:
+diff --git a/botocore/endpoint.py b/botocore/endpoint.py
- index 623a4a4..b20ee03 100644
++index 228d43d..990a4b9 100644
+--- a/botocore/endpoint.py
++++ b/botocore/endpoint.py
- @@ -17,10 +17,10 @@ import logging
++@@ -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 BaseEndpointResolverError
- @@ -44,7 +44,7 @@ def convert_to_response_dict(http_response, operation_model):
++ from botocore.exceptions import UnknownEndpointError
++@@ -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 48cedc9..45f0c93 100644
++index f0fd172..3ac7d3b 100644
+--- a/botocore/exceptions.py
++++ b/botocore/exceptions.py
- @@ -11,7 +11,7 @@
- # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
++@@ -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 e7e2f1d..473ad15 100644
++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/utils.py b/botocore/utils.py
- index 61aa551..1894b6d 100644
++index 6218b8a..4339acd 100644
+--- a/botocore/utils.py
++++ b/botocore/utils.py
- @@ -24,7 +24,7 @@ from dateutil.tz import tzlocal, tzutc
- from botocore.exceptions import InvalidExpressionError, ConfigNotFound
- from botocore.exceptions import InvalidDNSNameError
++@@ -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 21b94a3,0000000..8a2638c
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,164 @@@
- From c8132ea126fb557832d6a3a4f0c52275f00634b4 Mon Sep 17 00:00:00 2001
++From 5c5e1a92b3d77902c86018008cf6a2e022eddd38 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(-)
+
+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 fdee6ba..e6a8a9d 100644
++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.client import Config
-
++ from botocore.config import Config
++ from botocore.exceptions import ClientError
+
- @@ -750,7 +750,7 @@ class TestS3SigV4Client(BaseS3ClientTest):
++@@ -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 40d90a6..fbd5dd8 100644
++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.
- @@ -274,7 +274,7 @@ def _make_client_call_with_errors(client, operation_name, kwargs):
++@@ -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 0aff078..678e9fc 100644
++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 f76d01b..68c8450 100644
++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 1860d44..54bb37d 100644
++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 aeababf..745da12 100644
++index b7f9cbf..038a3b7 100644
+--- a/tests/unit/test_endpoint.py
++++ b/tests/unit/test_endpoint.py
- @@ -14,7 +14,7 @@
- from tests import unittest
++@@ -15,7 +15,7 @@ from tests import unittest
+
- from mock import Mock, patch
++ 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 0d9375d..4cbc5c1 100644
++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 fa146b1..1d9dd5b 100644
++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
--
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