Преглед изворни кода

HUE-6326 [aws] Update boto library to 2.46.1

Jenny Kim пре 8 година
родитељ
комит
061a7fb1fa
100 измењених фајлова са 135 додато и 111 уклоњено
  1. 0 16
      desktop/core/ext-py/boto-2.42.0/.gitignore
  2. 0 8
      desktop/core/ext-py/boto-2.42.0/HUE-BUILD.rst
  3. 0 0
      desktop/core/ext-py/boto-2.46.1/MANIFEST.in
  4. 3 3
      desktop/core/ext-py/boto-2.46.1/PKG-INFO
  5. 2 2
      desktop/core/ext-py/boto-2.46.1/README.rst
  6. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/asadmin
  7. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/bundle_image
  8. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/cfadmin
  9. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/cq
  10. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/cwutil
  11. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/dynamodb_dump
  12. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/dynamodb_load
  13. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/elbadmin
  14. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/fetch_file
  15. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/glacier
  16. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/instance_events
  17. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/kill_instance
  18. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/launch_instance
  19. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/list_instances
  20. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/lss3
  21. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/mturk
  22. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/pyami_sendmail
  23. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/route53
  24. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/s3put
  25. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/sdbadmin
  26. 0 0
      desktop/core/ext-py/boto-2.46.1/bin/taskadmin
  27. 1 1
      desktop/core/ext-py/boto-2.46.1/boto/__init__.py
  28. 68 13
      desktop/core/ext-py/boto-2.46.1/boto/auth.py
  29. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/auth_handler.py
  30. 4 4
      desktop/core/ext-py/boto-2.46.1/boto/awslambda/__init__.py
  31. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/awslambda/exceptions.py
  32. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/awslambda/layer1.py
  33. 6 6
      desktop/core/ext-py/boto-2.46.1/boto/beanstalk/__init__.py
  34. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/beanstalk/exception.py
  35. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/beanstalk/layer1.py
  36. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/beanstalk/response.py
  37. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/beanstalk/wrapper.py
  38. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cacerts/__init__.py
  39. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cacerts/cacerts.txt
  40. 3 4
      desktop/core/ext-py/boto-2.46.1/boto/cloudformation/__init__.py
  41. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudformation/connection.py
  42. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudformation/stack.py
  43. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudformation/template.py
  44. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudfront/__init__.py
  45. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudfront/distribution.py
  46. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudfront/exception.py
  47. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudfront/identity.py
  48. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudfront/invalidation.py
  49. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudfront/logging.py
  50. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudfront/object.py
  51. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudfront/origin.py
  52. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudfront/signers.py
  53. 4 4
      desktop/core/ext-py/boto-2.46.1/boto/cloudhsm/__init__.py
  54. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudhsm/exceptions.py
  55. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudhsm/layer1.py
  56. 6 9
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/__init__.py
  57. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/document.py
  58. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/domain.py
  59. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/layer1.py
  60. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/layer2.py
  61. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/optionstatus.py
  62. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/search.py
  63. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/sourceattribute.py
  64. 6 9
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/__init__.py
  65. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/document.py
  66. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/domain.py
  67. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/exceptions.py
  68. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/layer1.py
  69. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/layer2.py
  70. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/optionstatus.py
  71. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/search.py
  72. 4 4
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearchdomain/__init__.py
  73. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearchdomain/exceptions.py
  74. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudsearchdomain/layer1.py
  75. 4 4
      desktop/core/ext-py/boto-2.46.1/boto/cloudtrail/__init__.py
  76. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudtrail/exceptions.py
  77. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cloudtrail/layer1.py
  78. 4 4
      desktop/core/ext-py/boto-2.46.1/boto/codedeploy/__init__.py
  79. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/codedeploy/exceptions.py
  80. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/codedeploy/layer1.py
  81. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cognito/__init__.py
  82. 4 4
      desktop/core/ext-py/boto-2.46.1/boto/cognito/identity/__init__.py
  83. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cognito/identity/exceptions.py
  84. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cognito/identity/layer1.py
  85. 4 4
      desktop/core/ext-py/boto-2.46.1/boto/cognito/sync/__init__.py
  86. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cognito/sync/exceptions.py
  87. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/cognito/sync/layer1.py
  88. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/compat.py
  89. 4 4
      desktop/core/ext-py/boto-2.46.1/boto/configservice/__init__.py
  90. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/configservice/exceptions.py
  91. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/configservice/layer1.py
  92. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/connection.py
  93. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/contrib/__init__.py
  94. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/contrib/ymlmessage.py
  95. 4 4
      desktop/core/ext-py/boto-2.46.1/boto/datapipeline/__init__.py
  96. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/datapipeline/exceptions.py
  97. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/datapipeline/layer1.py
  98. 4 4
      desktop/core/ext-py/boto-2.46.1/boto/directconnect/__init__.py
  99. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/directconnect/exceptions.py
  100. 0 0
      desktop/core/ext-py/boto-2.46.1/boto/directconnect/layer1.py

+ 0 - 16
desktop/core/ext-py/boto-2.42.0/.gitignore

@@ -1,16 +0,0 @@
-*.pyc
-.*.swp
-*.log
-*~
-boto.egg-info
-build/
-dist/
-MANIFEST
-.DS_Store
-.idea
-.tox
-.coverage
-*flymake.py
-venv
-venv-2.5
-env-2.5

+ 0 - 8
desktop/core/ext-py/boto-2.42.0/HUE-BUILD.rst

@@ -1,8 +0,0 @@
-####
-Note
-####
-
-We manually exclude boto from the pruning (it contains some modules name 'logs') in
-Makefile.tarball
-
-So need to keep in mind when upgrading or removing this dependency.

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/MANIFEST.in → desktop/core/ext-py/boto-2.46.1/MANIFEST.in


+ 3 - 3
desktop/core/ext-py/boto-2.42.0/PKG-INFO → desktop/core/ext-py/boto-2.46.1/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: boto
-Version: 2.42.0
+Version: 2.46.1
 Summary: Amazon Web Services Library
 Home-page: https://github.com/boto/boto/
 Author: Mitch Garnaat
@@ -9,9 +9,9 @@ License: MIT
 Description: ####
         boto
         ####
-        boto 2.42.0
+        boto 2.46.1
         
-        Released: 19-Jul-2016
+        Released: 20-Feb-2017
         
         .. image:: https://travis-ci.org/boto/boto.svg?branch=develop
                 :target: https://travis-ci.org/boto/boto

+ 2 - 2
desktop/core/ext-py/boto-2.42.0/README.rst → desktop/core/ext-py/boto-2.46.1/README.rst

@@ -1,9 +1,9 @@
 ####
 boto
 ####
-boto 2.42.0
+boto 2.46.1
 
-Released: 19-Jul-2016
+Released: 20-Feb-2017
 
 .. image:: https://travis-ci.org/boto/boto.svg?branch=develop
         :target: https://travis-ci.org/boto/boto

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/asadmin → desktop/core/ext-py/boto-2.46.1/bin/asadmin


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/bundle_image → desktop/core/ext-py/boto-2.46.1/bin/bundle_image


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/cfadmin → desktop/core/ext-py/boto-2.46.1/bin/cfadmin


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/cq → desktop/core/ext-py/boto-2.46.1/bin/cq


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/cwutil → desktop/core/ext-py/boto-2.46.1/bin/cwutil


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/dynamodb_dump → desktop/core/ext-py/boto-2.46.1/bin/dynamodb_dump


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/dynamodb_load → desktop/core/ext-py/boto-2.46.1/bin/dynamodb_load


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/elbadmin → desktop/core/ext-py/boto-2.46.1/bin/elbadmin


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/fetch_file → desktop/core/ext-py/boto-2.46.1/bin/fetch_file


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/glacier → desktop/core/ext-py/boto-2.46.1/bin/glacier


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/instance_events → desktop/core/ext-py/boto-2.46.1/bin/instance_events


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/kill_instance → desktop/core/ext-py/boto-2.46.1/bin/kill_instance


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/launch_instance → desktop/core/ext-py/boto-2.46.1/bin/launch_instance


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/list_instances → desktop/core/ext-py/boto-2.46.1/bin/list_instances


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/lss3 → desktop/core/ext-py/boto-2.46.1/bin/lss3


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/mturk → desktop/core/ext-py/boto-2.46.1/bin/mturk


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/pyami_sendmail → desktop/core/ext-py/boto-2.46.1/bin/pyami_sendmail


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/route53 → desktop/core/ext-py/boto-2.46.1/bin/route53


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/s3put → desktop/core/ext-py/boto-2.46.1/bin/s3put


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/sdbadmin → desktop/core/ext-py/boto-2.46.1/bin/sdbadmin


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/bin/taskadmin → desktop/core/ext-py/boto-2.46.1/bin/taskadmin


+ 1 - 1
desktop/core/ext-py/boto-2.42.0/boto/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/__init__.py

@@ -38,7 +38,7 @@ import logging.config
 from boto.compat import urlparse
 from boto.exception import InvalidUriError
 
-__version__ = '2.42.0'
+__version__ = '2.46.1'
 Version = __version__  # for backware compatibility
 
 # http://bugs.python.org/issue7980

+ 68 - 13
desktop/core/ext-py/boto-2.42.0/boto/auth.py → desktop/core/ext-py/boto-2.46.1/boto/auth.py

@@ -39,7 +39,7 @@ import hmac
 import os
 import posixpath
 
-from boto.compat import urllib, encodebytes, parse_qs_safe
+from boto.compat import urllib, encodebytes, parse_qs_safe, urlparse
 from boto.auth_handler import AuthHandler
 from boto.exception import BotoClientError
 
@@ -51,8 +51,32 @@ except ImportError:
     sha256 = None
 
 
-# Region detection strings to determine if SigV4 should be used
-# by default.
+# Region detection strings to determine if SigV2 should be used
+# by default
+S3_AUTH_DETECT = [
+    '-ap-northeast-1',
+    '.ap-northeast-1',
+    '-ap-southeast-1',
+    '.ap-southeast-1',
+    '-ap-southeast-2',
+    '.ap-southeast-2',
+    '-eu-west-1',
+    '.eu-west-1',
+    '-external-1',
+    '.external-1',
+    '-sa-east-1',
+    '.sa-east-1',
+    '-us-east-1',
+    '.us-east-1',
+    '-us-gov-west-1',
+    '.us-gov-west-1',
+    '-us-west-1',
+    '.us-west-1',
+    '-us-west-2',
+    '.us-west-2'
+]
+
+
 SIGV4_DETECT = [
     '.cn-',
     # In eu-central and ap-northeast-2 we support both host styles for S3
@@ -61,7 +85,13 @@ SIGV4_DETECT = [
     '.ap-northeast-2',
     '-ap-northeast-2',
     '.ap-south-1',
-    '-ap-south-1'
+    '-ap-south-1',
+    '.us-east-2',
+    '-us-east-2',
+    '-ca-central',
+    '.ca-central',
+    '.eu-west-2',
+    '-eu-west-2',
 ]
 
 
@@ -1032,13 +1062,38 @@ def detect_potential_s3sigv4(func):
         if boto.config.get('s3', 'use-sigv4', False):
             return ['hmac-v4-s3']
 
-        if hasattr(self, 'host'):
-            # If you're making changes here, you should also check
-            # ``boto/iam/connection.py``, as several things there are also
-            # endpoint-related.
-            for test in SIGV4_DETECT:
-                if test in self.host:
-                    return ['hmac-v4-s3']
-
-        return func(self)
+        if not hasattr(self, 'host'):
+            return func(self)
+
+        # Keep the old explicit logic in case somebody was adding to the list.
+        for test in SIGV4_DETECT:
+            if test in self.host:
+                return ['hmac-v4-s3']
+
+        # Use default for non-aws hosts. Adding a url scheme is necessary if
+        # not present for urlparse to properly function.
+        host = self.host
+        if not self.host.startswith('http://') or \
+                self.host.startswith('https://'):
+            host = 'https://' + host
+        netloc = urlparse(host).netloc
+        if not (netloc.endswith('amazonaws.com') or
+                netloc.endswith('amazonaws.com.cn')):
+            return func(self)
+
+        # Use the default for the global endpoint
+        if netloc.endswith('s3.amazonaws.com'):
+            return func(self)
+
+        # Use the default for regions that support sigv4 and sigv2
+        if any(test in self.host for test in S3_AUTH_DETECT):
+            return func(self)
+
+        # Use anonymous if enabled.
+        if hasattr(self, 'anon') and self.anon:
+            return func(self)
+
+        # Default to sigv4 for aws hosts outside of regions that are known
+        # to support sigv2
+        return ['hmac-v4-s3']
     return _wrapper

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/auth_handler.py → desktop/core/ext-py/boto-2.46.1/boto/auth_handler.py


+ 4 - 4
desktop/core/ext-py/boto-2.42.0/boto/awslambda/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/awslambda/__init__.py

@@ -20,6 +20,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -34,7 +35,6 @@ def regions():
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.awslambda.layer1 import AWSLambdaConnection
+    return connect('awslambda', region_name,
+                   connection_cls=AWSLambdaConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/awslambda/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/awslambda/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/awslambda/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/awslambda/layer1.py


+ 6 - 6
desktop/core/ext-py/boto-2.42.0/boto/beanstalk/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/beanstalk/__init__.py

@@ -21,6 +21,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -30,15 +31,14 @@ def regions():
     :rtype: list
     :return: A list of :class:`boto.regioninfo.RegionInfo`
     """
-    import boto.beanstalk.layer1
+    from boto.beanstalk.layer1 import Layer1
     return get_regions(
         'elasticbeanstalk',
-        connection_cls=boto.beanstalk.layer1.Layer1
+        connection_cls=Layer1
     )
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.beanstalk.layer1 import Layer1
+    return connect('elasticbeanstalk', region_name, connection_cls=Layer1,
+                   **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/beanstalk/exception.py → desktop/core/ext-py/boto-2.46.1/boto/beanstalk/exception.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/beanstalk/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/beanstalk/layer1.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/beanstalk/response.py → desktop/core/ext-py/boto-2.46.1/boto/beanstalk/response.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/beanstalk/wrapper.py → desktop/core/ext-py/boto-2.46.1/boto/beanstalk/wrapper.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cacerts/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cacerts/__init__.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cacerts/cacerts.txt → desktop/core/ext-py/boto-2.46.1/boto/cacerts/cacerts.txt


+ 3 - 4
desktop/core/ext-py/boto-2.42.0/boto/cloudformation/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cloudformation/__init__.py

@@ -22,6 +22,7 @@
 
 from boto.cloudformation.connection import CloudFormationConnection
 from boto.regioninfo import RegionInfo, get_regions, load_regions
+from boto.regioninfo import connect
 
 RegionData = load_regions().get('cloudformation')
 
@@ -50,7 +51,5 @@ def connect_to_region(region_name, **kw_params):
     :return: A connection to the given region, or None if an invalid region
         name is given
     """
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    return connect('cloudformation', region_name,
+                   connection_cls=CloudFormationConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudformation/connection.py → desktop/core/ext-py/boto-2.46.1/boto/cloudformation/connection.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudformation/stack.py → desktop/core/ext-py/boto-2.46.1/boto/cloudformation/stack.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudformation/template.py → desktop/core/ext-py/boto-2.46.1/boto/cloudformation/template.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudfront/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cloudfront/__init__.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudfront/distribution.py → desktop/core/ext-py/boto-2.46.1/boto/cloudfront/distribution.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudfront/exception.py → desktop/core/ext-py/boto-2.46.1/boto/cloudfront/exception.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudfront/identity.py → desktop/core/ext-py/boto-2.46.1/boto/cloudfront/identity.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudfront/invalidation.py → desktop/core/ext-py/boto-2.46.1/boto/cloudfront/invalidation.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudfront/logging.py → desktop/core/ext-py/boto-2.46.1/boto/cloudfront/logging.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudfront/object.py → desktop/core/ext-py/boto-2.46.1/boto/cloudfront/object.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudfront/origin.py → desktop/core/ext-py/boto-2.46.1/boto/cloudfront/origin.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudfront/signers.py → desktop/core/ext-py/boto-2.46.1/boto/cloudfront/signers.py


+ 4 - 4
desktop/core/ext-py/boto-2.42.0/boto/cloudhsm/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cloudhsm/__init__.py

@@ -21,6 +21,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -35,7 +36,6 @@ def regions():
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.cloudhsm.layer1 import CloudHSMConnection
+    return connect('cloudhsm', region_name, connection_cls=CloudHSMConnection,
+                   **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudhsm/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/cloudhsm/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudhsm/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/cloudhsm/layer1.py


+ 6 - 9
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/__init__.py

@@ -22,6 +22,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -31,15 +32,11 @@ def regions():
     :rtype: list
     :return: A list of :class:`boto.regioninfo.RegionInfo`
     """
-    import boto.cloudsearch.layer1
-    return get_regions(
-        'cloudsearch',
-        connection_cls=boto.cloudsearch.layer1.Layer1
-    )
+    from boto.cloudsearch.layer1 import Layer1
+    return get_regions('cloudsearch',connection_cls=Layer1)
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.cloudsearch.layer1 import Layer1
+    return connect('cloudsearch', region_name, connection_cls=Layer1,
+                   **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch/document.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/document.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch/domain.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/domain.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/layer1.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch/layer2.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/layer2.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch/optionstatus.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/optionstatus.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch/search.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/search.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch/sourceattribute.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch/sourceattribute.py


+ 6 - 9
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch2/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/__init__.py

@@ -19,6 +19,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 from boto.regioninfo import get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -28,15 +29,11 @@ def regions():
     :rtype: list
     :return: A list of :class:`boto.regioninfo.RegionInfo`
     """
-    import boto.cloudsearch2.layer1
-    return get_regions(
-        'cloudsearch',
-        connection_cls=boto.cloudsearch2.layer1.CloudSearchConnection
-    )
+    from boto.cloudsearch2.layer1 import CloudSearchConnection
+    return get_regions('cloudsearch', connection_cls=CloudSearchConnection)
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.cloudsearch2.layer1 import CloudSearchConnection
+    return connect('cloudsearch', region_name,
+                   connection_cls=CloudSearchConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch2/document.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/document.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch2/domain.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/domain.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch2/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch2/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/layer1.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch2/layer2.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/layer2.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch2/optionstatus.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/optionstatus.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearch2/search.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearch2/search.py


+ 4 - 4
desktop/core/ext-py/boto-2.42.0/boto/cloudsearchdomain/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearchdomain/__init__.py

@@ -20,6 +20,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -35,7 +36,6 @@ def regions():
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.cloudsearchdomain.layer1 import CloudSearchDomainConnection
+    return connect('cloudsearchdomain', region_name,
+                   connection_cls=CloudSearchDomainConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearchdomain/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearchdomain/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudsearchdomain/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/cloudsearchdomain/layer1.py


+ 4 - 4
desktop/core/ext-py/boto-2.42.0/boto/cloudtrail/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cloudtrail/__init__.py

@@ -21,6 +21,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -35,7 +36,6 @@ def regions():
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.cloudtrail.layer1 import CloudTrailConnection
+    return connect('cloudtrail', region_name,
+                   connection_cls=CloudTrailConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudtrail/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/cloudtrail/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cloudtrail/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/cloudtrail/layer1.py


+ 4 - 4
desktop/core/ext-py/boto-2.42.0/boto/codedeploy/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/codedeploy/__init__.py

@@ -20,6 +20,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -34,7 +35,6 @@ def regions():
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.codedeploy.layer1 import CodeDeployConnection
+    return connect('codedeploy', region_name,
+                   connection_cls=CodeDeployConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/codedeploy/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/codedeploy/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/codedeploy/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/codedeploy/layer1.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cognito/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cognito/__init__.py


+ 4 - 4
desktop/core/ext-py/boto-2.42.0/boto/cognito/identity/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cognito/identity/__init__.py

@@ -21,6 +21,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -36,7 +37,6 @@ def regions():
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.cognito.identity.layer1 import CognitoIdentityConnection
+    return connect('cognito-identity', region_name,
+                   connection_cls=CognitoIdentityConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cognito/identity/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/cognito/identity/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cognito/identity/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/cognito/identity/layer1.py


+ 4 - 4
desktop/core/ext-py/boto-2.42.0/boto/cognito/sync/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/cognito/sync/__init__.py

@@ -21,6 +21,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -35,7 +36,6 @@ def regions():
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.cognito.sync.layer1 import CognitoSyncConnection
+    return connect('cognito-sync', region_name,
+                   connection_cls=CognitoSyncConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cognito/sync/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/cognito/sync/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/cognito/sync/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/cognito/sync/layer1.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/compat.py → desktop/core/ext-py/boto-2.46.1/boto/compat.py


+ 4 - 4
desktop/core/ext-py/boto-2.42.0/boto/configservice/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/configservice/__init__.py

@@ -21,6 +21,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -35,7 +36,6 @@ def regions():
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.configservice.layer1 import ConfigServiceConnection
+    return connect('configservice', region_name,
+                   connection_cls=ConfigServiceConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/configservice/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/configservice/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/configservice/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/configservice/layer1.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/connection.py → desktop/core/ext-py/boto-2.46.1/boto/connection.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/contrib/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/contrib/__init__.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/contrib/ymlmessage.py → desktop/core/ext-py/boto-2.46.1/boto/contrib/ymlmessage.py


+ 4 - 4
desktop/core/ext-py/boto-2.42.0/boto/datapipeline/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/datapipeline/__init__.py

@@ -21,6 +21,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -35,7 +36,6 @@ def regions():
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.datapipeline.layer1 import DataPipelineConnection
+    return connect('datapipeline', region_name,
+                   connection_cls=DataPipelineConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/datapipeline/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/datapipeline/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/datapipeline/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/datapipeline/layer1.py


+ 4 - 4
desktop/core/ext-py/boto-2.42.0/boto/directconnect/__init__.py → desktop/core/ext-py/boto-2.46.1/boto/directconnect/__init__.py

@@ -21,6 +21,7 @@
 # IN THE SOFTWARE.
 #
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 def regions():
@@ -35,7 +36,6 @@ def regions():
 
 
 def connect_to_region(region_name, **kw_params):
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    from boto.directconnect.layer1 import DirectConnectConnection
+    return connect('directconnect', region_name,
+                   connection_cls=DirectConnectConnection, **kw_params)

+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/directconnect/exceptions.py → desktop/core/ext-py/boto-2.46.1/boto/directconnect/exceptions.py


+ 0 - 0
desktop/core/ext-py/boto-2.42.0/boto/directconnect/layer1.py → desktop/core/ext-py/boto-2.46.1/boto/directconnect/layer1.py


Неке датотеке нису приказане због велике количине промена