[Python-modules-commits] [python-botocore] 05/07: merge patched into master
Takaki Taniguchi
takaki at moszumanska.debian.org
Tue Feb 2 09:07:49 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 dde60556e65000b7e720243177f762caadfbb3ff
Merge: 31c83be c8132ea
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date: Tue Feb 2 17:56:14 2016 +0900
merge patched into master
PKG-INFO | 2 +-
botocore.egg-info/PKG-INFO | 2 +-
botocore.egg-info/SOURCES.txt | 21 +
botocore/__init__.py | 2 +-
botocore/client.py | 135 +-
botocore/compat.py | 2 +
botocore/credentials.py | 279 +-
botocore/data/_endpoints.json | 7 +-
botocore/data/_retry.json | 10 +-
botocore/data/acm/2015-12-08/service-2.json | 585 +++
.../data/autoscaling/2011-01-01/service-2.json | 1051 +----
.../data/cloudformation/2010-05-15/service-2.json | 257 +-
.../data/cloudfront/2015-09-17/paginators-1.json | 32 +
botocore/data/cloudfront/2015-09-17/service-2.json | 2928 ++++++++++++
botocore/data/cloudfront/2015-09-17/waiters-2.json | 47 +
.../data/cloudfront/2016-01-13/paginators-1.json | 32 +
botocore/data/cloudfront/2016-01-13/service-2.json | 3021 +++++++++++++
botocore/data/cloudfront/2016-01-13/waiters-2.json | 47 +
.../data/cloudfront/2016-01-28/paginators-1.json | 32 +
botocore/data/cloudfront/2016-01-28/service-2.json | 3022 +++++++++++++
botocore/data/cloudfront/2016-01-28/waiters-2.json | 47 +
botocore/data/cloudtrail/2013-11-01/service-2.json | 1311 +-----
botocore/data/config/2014-11-12/service-2.json | 608 +--
botocore/data/devicefarm/2015-06-23/service-2.json | 28 +-
.../data/directconnect/2012-10-25/service-2.json | 453 +-
botocore/data/ds/2015-04-16/service-2.json | 1151 +++--
botocore/data/ec2/2015-10-01/service-2.json | 1583 ++++++-
botocore/data/ecr/2015-09-21/service-2.json | 1251 ++++++
botocore/data/ecs/2014-11-13/service-2.json | 48 +-
botocore/data/emr/2009-03-31/service-2.json | 407 +-
botocore/data/events/2014-02-03/service-2.json | 997 +++++
botocore/data/iam/2010-05-08/service-2.json | 3958 ++---------------
botocore/data/iot-data/2015-05-28/service-2.json | 321 +-
botocore/data/iot/2015-05-28/service-2.json | 196 +-
botocore/data/kms/2014-11-01/paginators-1.json | 32 +
botocore/data/logs/2014-03-28/service-2.json | 707 +--
botocore/data/opsworks/2013-02-18/service-2.json | 1044 +----
botocore/data/rds/2014-10-31/service-2.json | 4660 ++++----------------
botocore/data/route53/2013-04-01/service-2.json | 2950 ++++++++-----
botocore/data/sqs/2012-11-05/examples-1.json | 44 +
botocore/data/ssm/2014-11-06/paginators-1.json | 28 +
botocore/data/ssm/2014-11-06/service-2.json | 1012 +----
botocore/data/sts/2011-06-15/service-2.json | 310 +-
botocore/data/waf/2015-08-24/service-2.json | 1341 +++---
botocore/docs/bcdoc/restdoc.py | 1 +
botocore/docs/client.py | 15 +-
botocore/docs/example.py | 2 +
botocore/docs/method.py | 8 +-
botocore/docs/params.py | 5 +-
botocore/docs/service.py | 14 +-
botocore/docs/shape.py | 4 +-
botocore/docs/sharedexample.py | 221 +
botocore/exceptions.py | 19 +
botocore/handlers.py | 136 +-
botocore/loaders.py | 28 +-
botocore/model.py | 18 +-
botocore/parsers.py | 9 +
botocore/response.py | 5 +
botocore/retryhandler.py | 2 +-
botocore/session.py | 38 +-
botocore/signers.py | 131 +-
botocore/utils.py | 21 +
botocore/validate.py | 2 +-
debian/.git-dpm | 6 +-
.../0001-Don-t-use-duplicated-modules.patch | 13 +-
...002-Don-t-use-duplicated-modules-in-tests.patch | 6 +-
docs/source/conf.py | 4 +-
docs/source/reference/response.rst | 11 +
docs/source/topics/events.rst | 2 +-
requirements.txt | 2 +-
tests/__init__.py | 2 -
tests/acceptance/features/environment.py | 12 +-
tests/acceptance/features/smoke/acm/acm.feature | 12 +
.../features/smoke/autoscaling/autoscaling.feature | 5 +-
.../smoke/cloudformation/cloudformation.feature | 5 +-
.../features/smoke/cloudfront/cloudfront.feature | 5 +-
.../features/smoke/cloudhsm/cloudhsm.feature | 5 +-
.../features/smoke/cloudsearch/cloudsearch.feature | 5 +-
.../features/smoke/cloudtrail/cloudtrail.feature | 5 +-
.../features/smoke/cloudwatch/cloudwatch.feature | 5 +-
.../smoke/cloudwatchlogs/cloudwatchlogs.feature | 5 +-
.../features/smoke/codecommit/codecommit.feature | 5 +-
.../features/smoke/codedeploy/codedeploy.feature | 5 +-
.../smoke/codepipeline/codepipeline.feature | 5 +-
.../smoke/cognitoidentity/cognitoidentity.feature | 5 +-
.../features/smoke/cognitosync/cognitosync.feature | 5 +-
.../smoke/configservice/configservice.feature | 5 +-
.../smoke/datapipeline/datapipeline.feature | 5 +-
.../features/smoke/devicefarm/devicefarm.feature | 5 +-
.../smoke/directconnect/directconnect.feature | 5 +-
.../features/smoke/dynamodb/dynamodb.feature | 5 +-
.../smoke/dynamodbstreams/dynamodbstreams.feature | 5 +-
tests/acceptance/features/smoke/ec2/ec2.feature | 5 +-
.../features/smoke/elasticache/elasticache.feature | 5 +-
.../elasticbeanstalk/elasticbeanstalk.feature | 5 +-
.../elasticloadbalancing.feature | 5 +-
.../elastictranscoder/elastictranscoder.feature | 5 +-
tests/acceptance/features/smoke/emr/emr.feature | 5 +-
tests/acceptance/features/smoke/es/es.feature | 5 +-
.../features/smoke/glacier/glacier.feature | 5 +-
tests/acceptance/features/smoke/iam/iam.feature | 5 +-
.../smoke/importexport/importexport.feature | 5 +-
.../features/smoke/kinesis/kinesis.feature | 5 +-
tests/acceptance/features/smoke/kms/kms.feature | 5 +-
.../features/smoke/lambda/lambda.feature | 5 +-
.../smoke/machinelearning/machinelearning.feature | 5 +-
.../features/smoke/opsworks/opsworks.feature | 5 +-
tests/acceptance/features/smoke/rds/rds.feature | 5 +-
.../features/smoke/redshift/redshift.feature | 5 +-
.../features/smoke/route53/route53.feature | 5 +-
.../smoke/route53domains/route53domains.feature | 5 +-
tests/acceptance/features/smoke/ses/ses.feature | 5 +-
tests/acceptance/features/smoke/sns/sns.feature | 5 +-
tests/acceptance/features/smoke/sqs/sqs.feature | 5 +-
tests/acceptance/features/smoke/ssm/ssm.feature | 5 +-
.../smoke/storagegateway/storagegateway.feature | 5 +-
tests/acceptance/features/smoke/sts/sts.feature | 5 +-
.../features/smoke/support/support.feature | 5 +-
tests/acceptance/features/smoke/swf/swf.feature | 5 +-
tests/acceptance/features/smoke/waf/waf.feature | 5 +-
.../features/smoke/workspaces/workspaces.feature | 5 +-
tests/acceptance/features/steps/base.py | 15 +-
tests/functional/docs/__init__.py | 8 +-
tests/functional/docs/test_s3.py | 15 +
tests/functional/docs/test_streaming_body.py | 36 +
tests/functional/test_loaders.py | 40 +
tests/integration/test_s3.py | 43 +
tests/unit/docs/__init__.py | 24 +
tests/unit/docs/test_method.py | 13 +
tests/unit/docs/test_service.py | 4 +
tests/unit/docs/test_sharedexample.py | 270 ++
tests/unit/protocols/output/rest-xml.json | 68 +
.../xml/responses/s3-get-bucket-acl.json | 5 +-
.../xml/responses/s3-get-bucket-logging.json | 5 +-
tests/unit/test_client.py | 107 +-
tests/unit/test_credentials.py | 342 +-
tests/unit/test_handlers.py | 134 +-
tests/unit/test_loaders.py | 19 +-
tests/unit/test_s3_addressing.py | 11 +-
tests/unit/test_session.py | 45 +-
tests/unit/test_signers.py | 81 +-
tests/unit/test_utils.py | 13 +
tests/unit/test_waiters.py | 4 +-
143 files changed, 22096 insertions(+), 16196 deletions(-)
diff --cc debian/.git-dpm
index 6e26be3,0000000..e5bbe4a
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
- ca6d1d26bed55fbd257fd85b3fa1800f6ef0d310
- ca6d1d26bed55fbd257fd85b3fa1800f6ef0d310
- ebf3d00fef28da220452ec33350007735889d7bf
++c8132ea126fb557832d6a3a4f0c52275f00634b4
++c8132ea126fb557832d6a3a4f0c52275f00634b4
++b50932b9a1069998d6bf7db71500684489cffc30
+b50932b9a1069998d6bf7db71500684489cffc30
+python-botocore_1.3.23.orig.tar.gz
+2c200b3ecd3a430dc13e25f29275db53000ce621
+1990394
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Don-t-use-duplicated-modules.patch
index 6f7491e,0000000..bcd90d3
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,124 -1,0 +1,125 @@@
- From 27b11cd3f127cf29074b225a65e74e2732d1422d Mon Sep 17 00:00:00 2001
++From dea6f47712096194b7f3d07a81a92164ecd6ac5e 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/exceptions.py | 2 +-
+ botocore/retryhandler.py | 4 ++--
+ botocore/utils.py | 2 +-
+ 6 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
+index 06d0871..6bd1ab4 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 343fc05..530f2e8 100644
++index 0bc4f2d..f77763f 100644
+--- a/botocore/compat.py
++++ b/botocore/compat.py
+@@ -17,8 +17,8 @@ import sys
+ import inspect
+ import warnings
+
+-from botocore.vendored import six
+-from botocore.vendored.requests.packages.urllib3 import exceptions
++import six
++from urllib3 import exceptions
+
+
+ if six.PY3:
+diff --git a/botocore/endpoint.py b/botocore/endpoint.py
+index 623a4a4..b20ee03 100644
+--- a/botocore/endpoint.py
++++ b/botocore/endpoint.py
+@@ -17,10 +17,10 @@ import logging
+ import time
+ import threading
+
+-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.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):
+ 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 3e93582..d970d4b 100644
++index 48cedc9..45f0c93 100644
+--- a/botocore/exceptions.py
++++ b/botocore/exceptions.py
+@@ -11,7 +11,7 @@
+ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ # ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+-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..dd417f9 100644
++index e7e2f1d..473ad15 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 requests.packages.urllib3.exceptions import ClosedPoolError
+++from urllib3.exceptions import ClosedPoolError
+
+ from botocore.exceptions import ChecksumError, EndpointConnectionError
+
+diff --git a/botocore/utils.py b/botocore/utils.py
- index 804a3bd..7d13af0 100644
++index 61aa551..1894b6d 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
+ 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 a4c1991,0000000..21b94a3
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 ca6d1d26bed55fbd257fd85b3fa1800f6ef0d310 Mon Sep 17 00:00:00 2001
++From c8132ea126fb557832d6a3a4f0c52275f00634b4 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 7df606f..3e0b56c 100644
++index fdee6ba..e6a8a9d 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
+
+
- @@ -707,7 +707,7 @@ class TestS3SigV4Client(BaseS3ClientTest):
++@@ -750,7 +750,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
+--- 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):
+ 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
+--- 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
+--- 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
+--- 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
+--- a/tests/unit/test_endpoint.py
++++ b/tests/unit/test_endpoint.py
+@@ -14,7 +14,7 @@
+ from tests import unittest
+
+ from mock import Mock, patch
+-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
+--- 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
+--- 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