diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-01-24 22:59:13 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-01-24 22:59:13 +0000 |
commit | f9012e39ee5582192db9289d34df3adaddda2ad1 (patch) | |
tree | d0c2debadde670b604fdd5cd2ec2cf42c249a769 /contrib | |
parent | 0364b173f9c2638b99619c29ada704a483626e4b (diff) | |
parent | 4845fc2720a0ab3ff4f15fc8f3f00573b617ce5b (diff) | |
download | nova-f9012e39ee5582192db9289d34df3adaddda2ad1.tar.gz nova-f9012e39ee5582192db9289d34df3adaddda2ad1.tar.xz nova-f9012e39ee5582192db9289d34df3adaddda2ad1.zip |
Merge "Fix hacking N302 import only modules"
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/boto_v6/ec2/connection.py | 4 | ||||
-rw-r--r-- | contrib/boto_v6/ec2/instance.py | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/contrib/boto_v6/ec2/connection.py b/contrib/boto_v6/ec2/connection.py index 940608ffd..4cec65ad8 100644 --- a/contrib/boto_v6/ec2/connection.py +++ b/contrib/boto_v6/ec2/connection.py @@ -6,7 +6,7 @@ Created on 2010/12/20 import base64 import boto import boto.ec2 -from boto.ec2.securitygroup import SecurityGroup +import boto.ec2.securitygroup as securitygroup from boto_v6.ec2.instance import ReservationV6 @@ -114,7 +114,7 @@ class EC2ConnectionV6(boto.ec2.EC2Connection): if security_groups: l = [] for group in security_groups: - if isinstance(group, SecurityGroup): + if isinstance(group, securitygroup.SecurityGroup): l.append(group.name) else: l.append(group) diff --git a/contrib/boto_v6/ec2/instance.py b/contrib/boto_v6/ec2/instance.py index 74adccc00..b5689959f 100644 --- a/contrib/boto_v6/ec2/instance.py +++ b/contrib/boto_v6/ec2/instance.py @@ -3,31 +3,29 @@ Created on 2010/12/20 @author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp> ''' -from boto.ec2.instance import Group -from boto.ec2.instance import Instance -from boto.ec2.instance import Reservation +import boto.ec2.instance from boto.resultset import ResultSet -class ReservationV6(Reservation): +class ReservationV6(boto.ec2.instance.Reservation): def startElement(self, name, attrs, connection): if name == 'instancesSet': self.instances = ResultSet([('item', InstanceV6)]) return self.instances elif name == 'groupSet': - self.groups = ResultSet([('item', Group)]) + self.groups = ResultSet([('item', boto.ec2.instance.Group)]) return self.groups else: return None -class InstanceV6(Instance): +class InstanceV6(boto.ec2.instance.Instance): def __init__(self, connection=None): - Instance.__init__(self, connection) + boto.ec2.instance.Instance.__init__(self, connection) self.dns_name_v6 = None def endElement(self, name, value, connection): - Instance.endElement(self, name, value, connection) + boto.ec2.instance.Instance.endElement(self, name, value, connection) if name == 'dnsNameV6': self.dns_name_v6 = value |