[Python-modules-commits] [python-botocore] 02/06: Merge tag 'upstream/1.4.70'

[Takaki Taniguchi]

This is an automated email from the git hooks/post-receive script.

takaki pushed a commit to branch master
in repository python-botocore.

commit b4d8e95cf8d34ca2e670d2c9fbc88cb1bd549e88
Merge: 7869187 2519667
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Thu Nov 10 11:24:25 2016 +0900

    Merge tag 'upstream/1.4.70'
    
    Upstream version 1.4.70
    
    # gpg: Signature made 2016年11月10日 11時24分20秒 JST
    # gpg:                using RSA key CC149F6C28A5E257
    # gpg:                issuer "takaki at asis.media-as.org"
    # gpg: Good signature from "TANIGUCHI Takaki <takaki at media-as.org>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <takaki at asis.media-as.org>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <taniguchi.takaki at gmail.com>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <takaki at debian.org>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <takaki at debian.or.jp>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <takaki at takaki.media-as.org>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <takaki at nagoya-u.jp>" [ultimate]

 PKG-INFO                                           |   2 +-
 botocore.egg-info/PKG-INFO                         |   2 +-
 botocore.egg-info/SOURCES.txt                      |   3 +
 botocore/__init__.py                               |   2 +-
 .../data/autoscaling/2011-01-01/service-2.json     |  96 +--
 botocore/data/budgets/2016-10-20/service-2.json    | 777 +++++++++++++++++++++
 .../data/cloudformation/2010-05-15/service-2.json  | 136 +++-
 .../data/cloudformation/2010-05-15/waiters-2.json  |  12 +
 .../data/directconnect/2012-10-25/service-2.json   | 186 +++++
 botocore/data/ecr/2015-09-21/paginators-1.json     |  12 +
 botocore/data/ecs/2014-11-13/service-2.json        |  84 +--
 botocore/data/elbv2/2015-12-01/service-2.json      |  40 +-
 botocore/data/endpoints.json                       |  12 +
 botocore/data/ses/2010-12-01/service-2.json        | 570 ++++++++++++++-
 botocore/data/sms/2016-10-24/service-2.json        | 722 +++++++++++++++++++
 botocore/data/waf/2015-08-24/service-2.json        |  14 +-
 botocore/handlers.py                               |  18 +-
 botocore/stub.py                                   |  24 +-
 docs/source/conf.py                                |   2 +-
 tests/functional/test_cloudformation.py            |  27 +
 tests/functional/test_stub.py                      |  38 +
 21 files changed, 2639 insertions(+), 140 deletions(-)

diff --cc botocore/stub.py
index ca657b6,85f8f9e..5432d0b
--- a/botocore/stub.py
+++ b/botocore/stub.py
@@@ -17,10 -17,25 +17,25 @@@ from pprint import pforma
  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()
+ class _ANY(object):
+     """
+     A helper object that compares equal to everything. Copied from
+     unittest.mock
+     """
+ 
+     def __eq__(self, other):
+         return True
+ 
+     def __ne__(self, other):
+         return False
+ 
+     def __repr__(self):
+         return '<ANY>'
+ 
+ ANY = _ANY()
  
  
  class Stubber(object):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-botocore.git