Updated all old-style inheritance calls.

Nozbe · Dec 23, 2013 · 39a997f · 39a997f
1 parent 45e1884
commit 39a997f
Show file tree

Hide file tree

Showing 98 changed files with 372 additions and 357 deletions.
diff --git a/boto/auth.py b/boto/auth.py
@@ -109,7 +109,7 @@ class AnonAuthHandler(AuthHandler, HmacKeys):
     capability = ['anon']
 
     def __init__(self, host, config, provider):
-        AuthHandler.__init__(self, host, config, provider)
+        super(AnonAuthHandler, self).__init__(host, config, provider)
 
     def add_auth(self, http_request, **kwargs):
         pass

diff --git a/boto/beanstalk/layer1.py b/boto/beanstalk/layer1.py
@@ -45,7 +45,7 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
             region = RegionInfo(self, self.DefaultRegionName,
                                 self.DefaultRegionEndpoint)
         self.region = region
-        AWSQueryConnection.__init__(self, aws_access_key_id,
+        super(Layer1, self).__init__(aws_access_key_id,
                                     aws_secret_access_key,
                                     is_secure, port, proxy, proxy_port,
                                     proxy_user, proxy_pass,
@@ -1116,7 +1116,7 @@ def update_environment(self, environment_id=None, environment_name=None,
         :type tier_version: string
         :type tier_version: The version of the tier.  Valid values
             currently are "1.0". Defaults to "1.0".
-        
+
         :raises: InsufficientPrivilegesException
         """
         params = {}

diff --git a/boto/cloudformation/connection.py b/boto/cloudformation/connection.py
@@ -57,7 +57,7 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
             region = RegionInfo(self, self.DefaultRegionName,
                 self.DefaultRegionEndpoint, CloudFormationConnection)
         self.region = region
-        AWSQueryConnection.__init__(self, aws_access_key_id,
+        super(CloudFormationConnection, self).__init__(aws_access_key_id,
                                     aws_secret_access_key,
                                     is_secure, port, proxy, proxy_port,
                                     proxy_user, proxy_pass,

diff --git a/boto/cloudfront/__init__.py b/boto/cloudfront/__init__.py
@@ -44,7 +44,7 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
                  port=None, proxy=None, proxy_port=None,
                  host=DefaultHost, debug=0, security_token=None,
                  validate_certs=True):
-        AWSAuthConnection.__init__(self, host,
+        super(CloudFrontConnection, self).__init__(host,
                                    aws_access_key_id, aws_secret_access_key,
                                    True, port, proxy, proxy_port, debug=debug,
                                    security_token=security_token,

diff --git a/boto/cloudfront/distribution.py b/boto/cloudfront/distribution.py
@@ -176,7 +176,7 @@ class StreamingDistributionConfig(DistributionConfig):
     def __init__(self, connection=None, origin='', enabled=False,
                  caller_reference='', cnames=None, comment='',
                  trusted_signers=None, logging=None):
-        DistributionConfig.__init__(self, connection=connection,
+        super(StreamingDistributionConfig, self).__init__(connection=connection,
                                     origin=origin, enabled=enabled,
                                     caller_reference=caller_reference,
                                     cnames=cnames, comment=comment,
@@ -684,16 +684,17 @@ class StreamingDistribution(Distribution):
 
     def __init__(self, connection=None, config=None, domain_name='',
                  id='', last_modified_time=None, status=''):
-        Distribution.__init__(self, connection, config, domain_name,
-                              id, last_modified_time, status)
+        super(StreamingDistribution, self).__init__(connection, config,
+                              domain_name, id, last_modified_time, status)
         self._object_class = StreamingObject
 
     def startElement(self, name, attrs, connection):
         if name == 'StreamingDistributionConfig':
             self.config = StreamingDistributionConfig()
             return self.config
         else:
-            return Distribution.startElement(self, name, attrs, connection)
+            return super(StreamingDistribution, self).startElement(name, attrs,
+                connection)
 
     def update(self, enabled=None, cnames=None, comment=None):
         """

diff --git a/boto/cloudfront/object.py b/boto/cloudfront/object.py
@@ -14,7 +14,7 @@
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
@@ -24,7 +24,7 @@
 class Object(Key):
 
     def __init__(self, bucket, name=None):
-        Key.__init__(self, bucket, name=name)
+        super(Object, self).__init__(bucket, name=name)
         self.distribution = bucket.distribution
 
     def __repr__(self):
@@ -43,6 +43,6 @@ def url(self, scheme='http'):
 class StreamingObject(Object):
 
     def url(self, scheme='rtmp'):
-        return Object.url(self, scheme)
+        return super(StreamingObject, self).url(scheme)
+
 
-
diff --git a/boto/cloudtrail/layer1.py b/boto/cloudtrail/layer1.py
@@ -90,7 +90,7 @@ def __init__(self, **kwargs):
         if 'host' not in kwargs:
             kwargs['host'] = region.endpoint
 
-        AWSQueryConnection.__init__(self, **kwargs)
+        super(CloudTrailConnection, self).__init__(**kwargs)
         self.region = region
 
     def _required_auth_capability(self):

diff --git a/boto/connection.py b/boto/connection.py
@@ -888,7 +888,7 @@ def _mexe(self, request, sender=None, override_num_retries=None,
                 # not include the port.
                 if 's3' not in self._required_auth_capability():
                     self.set_host_header(request)
-                    
+
                 if callable(sender):
                     response = sender(connection, request.method, request.path,
                                       request.body, request.headers)
@@ -1034,7 +1034,7 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
                  proxy_user=None, proxy_pass=None, host=None, debug=0,
                  https_connection_factory=None, path='/', security_token=None,
                  validate_certs=True):
-        AWSAuthConnection.__init__(self, host, aws_access_key_id,
+        super(AWSQueryConnection, self).__init__(host, aws_access_key_id,
                                    aws_secret_access_key,
                                    is_secure, port, proxy,
                                    proxy_port, proxy_user, proxy_pass,

diff --git a/boto/contrib/ymlmessage.py b/boto/contrib/ymlmessage.py
@@ -14,7 +14,7 @@
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
@@ -43,7 +43,7 @@ class YAMLMessage(Message):
 
     def __init__(self, queue=None, body='', xml_attrs=None):
         self.data = None
-        Message.__init__(self, queue, body)
+        super(YAMLMessage, self).__init__(queue, body)
 
     def set_body(self, body):
         self.data = yaml.load(body)

diff --git a/boto/datapipeline/layer1.py b/boto/datapipeline/layer1.py
@@ -90,7 +90,7 @@ def __init__(self, **kwargs):
             region = RegionInfo(self, self.DefaultRegionName,
                                 self.DefaultRegionEndpoint)
         kwargs['host'] = region.endpoint
-        AWSQueryConnection.__init__(self, **kwargs)
+        super(DataPipelineConnection, self).__init__(**kwargs)
         self.region = region
 
     def _required_auth_capability(self):

diff --git a/boto/directconnect/layer1.py b/boto/directconnect/layer1.py
@@ -79,7 +79,7 @@ def __init__(self, **kwargs):
         if 'host' not in kwargs:
             kwargs['host'] = region.endpoint
 
-        AWSQueryConnection.__init__(self, **kwargs)
+        super(DirectConnectConnection, self).__init__(**kwargs)
         self.region = region
 
     def _required_auth_capability(self):

diff --git a/boto/dynamodb/layer1.py b/boto/dynamodb/layer1.py
@@ -84,7 +84,7 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
                     break
 
         self.region = region
-        AWSAuthConnection.__init__(self, self.region.endpoint,
+        super(Layer1, self).__init__(self.region.endpoint,
                                    aws_access_key_id,
                                    aws_secret_access_key,
                                    is_secure, port, proxy, proxy_port,

diff --git a/boto/dynamodb2/layer1.py b/boto/dynamodb2/layer1.py
@@ -75,7 +75,7 @@ def __init__(self, **kwargs):
         if 'host' not in kwargs:
             kwargs['host'] = region.endpoint
 
-        AWSQueryConnection.__init__(self, **kwargs)
+        super(DynamoDBConnection, self).__init__(**kwargs)
         self.region = region
         self._validate_checksums = boto.config.getbool(
             'DynamoDB', 'validate_checksums', validate_checksums)

diff --git a/boto/ec2/address.py b/boto/ec2/address.py
@@ -37,7 +37,7 @@ class Address(EC2Object):
     """
 
     def __init__(self, connection=None, public_ip=None, instance_id=None):
-        EC2Object.__init__(self, connection)
+        super(Address, self).__init__(connection)
         self.connection = connection
         self.public_ip = public_ip
         self.instance_id = instance_id

diff --git a/boto/ec2/autoscale/__init__.py b/boto/ec2/autoscale/__init__.py
@@ -114,7 +114,7 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
                                 self.DefaultRegionEndpoint,
                                 AutoScaleConnection)
         self.region = region
-        AWSQueryConnection.__init__(self, aws_access_key_id,
+        super(AutoScaleConnection, self).__init__(aws_access_key_id,
                                     aws_secret_access_key,
                                     is_secure, port, proxy, proxy_port,
                                     proxy_user, proxy_pass,

diff --git a/boto/ec2/bundleinstance.py b/boto/ec2/bundleinstance.py
@@ -14,21 +14,21 @@
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
 """
-Represents an EC2 Bundle Task 
+Represents an EC2 Bundle Task
 """
 
 from boto.ec2.ec2object import EC2Object
 
 class BundleInstanceTask(EC2Object):
-    
+
     def __init__(self, connection=None):
-        EC2Object.__init__(self, connection)
+        super(BundleInstanceTask, self).__init__(connection)
         self.id = None
         self.instance_id = None
         self.progress = None
@@ -38,7 +38,7 @@ def __init__(self, connection=None):
         self.prefix = None
         self.upload_policy = None
         self.upload_policy_signature = None
-        self.update_time = None 
+        self.update_time = None
         self.code = None
         self.message = None
 

diff --git a/boto/ec2/cloudwatch/__init__.py b/boto/ec2/cloudwatch/__init__.py
@@ -107,7 +107,7 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
         if self.region.name == 'eu-west-1':
             validate_certs = False
 
-        AWSQueryConnection.__init__(self, aws_access_key_id,
+        super(CloudWatchConnection, self).__init__(aws_access_key_id,
                                     aws_secret_access_key,
                                     is_secure, port, proxy, proxy_port,
                                     proxy_user, proxy_pass,

diff --git a/boto/ec2/connection.py b/boto/ec2/connection.py
@@ -91,7 +91,7 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
             region = RegionInfo(self, self.DefaultRegionName,
                                 self.DefaultRegionEndpoint)
         self.region = region
-        AWSQueryConnection.__init__(self, aws_access_key_id,
+        super(EC2Connection, self).__init__(aws_access_key_id,
                                     aws_secret_access_key,
                                     is_secure, port, proxy, proxy_port,
                                     proxy_user, proxy_pass,

diff --git a/boto/ec2/ec2object.py b/boto/ec2/ec2object.py
@@ -53,7 +53,7 @@ class TaggedEC2Object(EC2Object):
     """
 
     def __init__(self, connection=None):
-        EC2Object.__init__(self, connection)
+        super(TaggedEC2Object, self).__init__(connection)
         self.tags = TagSet()
 
     def startElement(self, name, attrs, connection):

diff --git a/boto/ec2/elb/__init__.py b/boto/ec2/elb/__init__.py
@@ -102,7 +102,7 @@ def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
             region = RegionInfo(self, self.DefaultRegionName,
                                 self.DefaultRegionEndpoint)
         self.region = region
-        AWSQueryConnection.__init__(self, aws_access_key_id,
+        super(ELBConnection, self).__init__(aws_access_key_id,
                                     aws_secret_access_key,
                                     is_secure, port, proxy, proxy_port,
                                     proxy_user, proxy_pass,

diff --git a/boto/ec2/image.py b/boto/ec2/image.py
@@ -47,7 +47,7 @@ class Image(TaggedEC2Object):
     """
 
     def __init__(self, connection=None):
-        TaggedEC2Object.__init__(self, connection)
+        super(Image, self).__init__(connection)
         self.id = None
         self.location = None
         self.state = None
@@ -75,7 +75,7 @@ def __repr__(self):
         return 'Image:%s' % self.id
 
     def startElement(self, name, attrs, connection):
-        retval = TaggedEC2Object.startElement(self, name, attrs, connection)
+        retval = super(Image, self).startElement(name, attrs, connection)
         if retval is not None:
             return retval
         if name == 'blockDeviceMapping':

diff --git a/boto/ec2/instance.py b/boto/ec2/instance.py
@@ -122,7 +122,7 @@ class Reservation(EC2Object):
                      Reservation.
     """
     def __init__(self, connection=None):
-        EC2Object.__init__(self, connection)
+        super(Reservation, self).__init__(connection)
         self.id = None
         self.owner_id = None
         self.groups = []
@@ -211,7 +211,7 @@ class Instance(TaggedEC2Object):
     """
 
     def __init__(self, connection=None):
-        TaggedEC2Object.__init__(self, connection)
+        super(Instance, self).__init__(connection)
         self.id = None
         self.dns_name = None
         self.public_dns_name = None
@@ -288,7 +288,7 @@ def placement_tenancy(self):
         return self._placement.tenancy
 
     def startElement(self, name, attrs, connection):
-        retval = TaggedEC2Object.startElement(self, name, attrs, connection)
+        retval = super(Instance, self).startElement(name, attrs, connection)
         if retval is not None:
             return retval
         if name == 'monitoring':

diff --git a/boto/ec2/keypair.py b/boto/ec2/keypair.py
@@ -30,7 +30,7 @@
 class KeyPair(EC2Object):
 
     def __init__(self, connection=None):
-        EC2Object.__init__(self, connection)
+        super(KeyPair, self).__init__(connection)
         self.name = None
         self.fingerprint = None
         self.material = None

diff --git a/boto/ec2/launchspecification.py b/boto/ec2/launchspecification.py
@@ -44,7 +44,7 @@ def endElement(self, name, value, connection):
 class LaunchSpecification(EC2Object):
 
     def __init__(self, connection=None):
-        EC2Object.__init__(self, connection)
+        super(LaunchSpecification, self).__init__(connection)
         self.key_name = None
         self.instance_type = None
         self.image_id = None

diff --git a/boto/ec2/networkinterface.py b/boto/ec2/networkinterface.py
@@ -99,7 +99,7 @@ class NetworkInterface(TaggedEC2Object):
     """
 
     def __init__(self, connection=None):
-        TaggedEC2Object.__init__(self, connection)
+        super(NetworkInterface, self).__init__(connection)
         self.id = None
         self.subnet_id = None
         self.vpc_id = None
@@ -119,7 +119,8 @@ def __repr__(self):
         return 'NetworkInterface:%s' % self.id
 
     def startElement(self, name, attrs, connection):
-        retval = TaggedEC2Object.startElement(self, name, attrs, connection)
+        retval = super(NetworkInterface, self).startElement(name, attrs,
+            connection)
         if retval is not None:
             return retval
         if name == 'groupSet':

diff --git a/boto/ec2/placementgroup.py b/boto/ec2/placementgroup.py
@@ -27,7 +27,7 @@
 class PlacementGroup(EC2Object):
 
     def __init__(self, connection=None, name=None, strategy=None, state=None):
-        EC2Object.__init__(self, connection)
+        super(PlacementGroup, self).__init__(connection)
         self.name = name
         self.strategy = strategy
         self.state = state

diff --git a/boto/ec2/regioninfo.py b/boto/ec2/regioninfo.py
@@ -16,7 +16,7 @@
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
@@ -27,8 +27,8 @@ class EC2RegionInfo(RegionInfo):
     """
     Represents an EC2 Region
     """
-    
+
     def __init__(self, connection=None, name=None, endpoint=None):
         from boto.ec2.connection import EC2Connection
-        RegionInfo.__init__(self, connection, name, endpoint,
+        super(EC2RegionInfo, self).__init__(connection, name, endpoint,
                             EC2Connection)