diff options
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 | ||||
| -rw-r--r-- | nova/api/metadata/base.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 1bb505659..68f3b5b3d 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -334,7 +334,7 @@ class CloudController(object): key_pairs = [x for x in key_pairs if x['name'] in key_name] #If looking for non existent key pair - if key_name != None and key_pairs == []: + if key_name is not None and not key_pairs: msg = _('Could not find key pair(s): %s') % ','.join(key_name) raise exception.EC2APIError(msg) diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py index 379643954..3f7db817d 100644 --- a/nova/api/metadata/base.py +++ b/nova/api/metadata/base.py @@ -81,7 +81,7 @@ class InstanceMetadata(): self.mappings = _format_instance_mapping(ctxt, instance) - if instance.get('user_data', None) != None: + if instance.get('user_data', None) is not None: self.userdata_b64 = base64.b64decode(instance['user_data']) else: self.userdata_b64 = None @@ -133,7 +133,7 @@ class InstanceMetadata(): for key in self.ec2_ids: data['meta-data'][key] = self.ec2_ids[key] - if self.userdata_b64 != None: + if self.userdata_b64 is not None: data['user-data'] = self.userdata_b64 # public-keys should be in meta-data only if user specified one |