Fix several PEP-8 issues

As found by pep8 version 1.2.

Change-Id: I5d40294416db0410fa7d9c82ea8efe8efadd0f58

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)
 

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

nova/consoleauth/manager.py

@@ -71,7 +71,7 @@ class ConsoleAuthManager(manager.Manager):
 
     def check_token(self, context, token):
         token_str = self.mc.get(token)
-        token_valid = (token_str != None)
+        token_valid = (token_str is not None)
         LOG.audit(_("Checking Token: %(token)s, %(token_valid)s)"), locals())
         if token_valid:
             return jsonutils.loads(token_str)

nova/db/sqlalchemy/api.py

@@ -611,13 +611,13 @@ def compute_node_utilization_set(context, host, free_ram_mb=None,
             raise exception.NotFound(_("No ComputeNode for %(host)s") %
                                      locals())
 
-        if free_ram_mb != None:
+        if free_ram_mb is not None:
             compute_node.free_ram_mb = free_ram_mb
-        if free_disk_gb != None:
+        if free_disk_gb is not None:
             compute_node.free_disk_gb = free_disk_gb
-        if work != None:
+        if work is not None:
             compute_node.current_workload = work
-        if vms != None:
+        if vms is not None:
             compute_node.running_vms = vms
 
     return compute_node

nova/network/l3.py

@@ -85,7 +85,7 @@ class LinuxNetL3(L3Driver):
         self.initialized = True
 
     def is_initialized(self):
-        return self.initialized == True
+        return self.initialized
 
     def initialize_network(self, cidr):
         linux_net.add_snat_rule(cidr)

nova/tests/api/openstack/compute/contrib/test_aggregates.py

@@ -52,7 +52,7 @@ class AggregateTestCase(test.TestCase):
 
     def test_index(self):
         def stub_list_aggregates(context):
-            if context == None:
+            if context is None:
                 raise Exception()
             return AGGREGATE_LIST
         self.stubs.Set(self.controller.api, 'get_aggregate_list',

nova/tests/api/test_validator.py

@@ -26,7 +26,7 @@ class ValidatorTestCase(test.TestCase):
 
     def test_validate(self):
         fixture = {
-            'foo': lambda val: val == True
+            'foo': lambda val: val is True
         }
 
         self.assertTrue(

nova/tests/network/test_quantum.py

@@ -492,7 +492,7 @@ class QuantumManagerTestCase(QuantumNovaTestCase):
         net = db.network_get_by_uuid(ctx.elevated(), net_id)
         self.assertTrue(net is not None)
         self.assertEquals(net['uuid'], net_id)
-        self.assertTrue(net['host'] != None)
+        self.assertTrue(net['host'] is not None)
 
 
 class QuantumNovaMACGenerationTestCase(QuantumNovaTestCase):

nova/tests/test_imagecache.py

@@ -429,7 +429,7 @@ class ImageCacheManagerTestCase(test.TestCase):
             image_cache_manager = imagecache.ImageCacheManager()
             res = image_cache_manager._verify_checksum(
                 img, fname, create_if_missing=True)
-            self.assertTrue(res == None)
+            self.assertTrue(res is None)
 
     def test_verify_checksum_invalid(self):
         img = {'container_format': 'ami', 'id': '42'}

nova/tests/test_metadata.py

@@ -66,7 +66,7 @@ def return_non_existing_address(*args, **kwarg):
 
 def fake_InstanceMetadata(stubs, inst_data, address=None, sgroups=None):
 
-    if sgroups == None:
+    if sgroups is None:
         sgroups = [{'name': 'default'}]
 
     def sg_get(*args, **kwargs):
@@ -84,7 +84,7 @@ def fake_request(stubs, mdinst, relpath, address="127.0.0.1",
 
     app = handler.MetadataRequestHandler()
 
-    if fake_get_metadata == None:
+    if fake_get_metadata is None:
         fake_get_metadata = get_metadata
 
     if stubs:
@@ -93,7 +93,7 @@ def fake_request(stubs, mdinst, relpath, address="127.0.0.1",
     request = webob.Request.blank(relpath)
     request.remote_addr = address
 
-    if headers != None:
+    if headers is not None:
         request.headers.update(headers)
 
     response = request.get_response(app)

tools/test-requires

@@ -5,6 +5,6 @@ coverage
 mox==0.5.3
 nose
 openstack.nose_plugin>=0.7
-pep8==1.1
+pep8==1.2
 sphinx>=1.1.2
 MySQL-python