Change '== None' to 'is None'

This commit is contained in:
Jason Koelker
2011-04-18 21:21:51 +00:00
committed by Tarmac
5 changed files with 12 additions and 11 deletions

View File

@@ -27,6 +27,7 @@ Gabe Westmaas <gabe.westmaas@rackspace.com>
Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp> Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
Hisaki Ohara <hisaki.ohara@intel.com> Hisaki Ohara <hisaki.ohara@intel.com>
Ilya Alekseyev <ialekseev@griddynamics.com> Ilya Alekseyev <ialekseev@griddynamics.com>
Jason Koelker <jason@koelker.net>
Jay Pipes <jaypipes@gmail.com> Jay Pipes <jaypipes@gmail.com>
Jesse Andrews <anotherjesse@gmail.com> Jesse Andrews <anotherjesse@gmail.com>
Joe Heck <heckj@mac.com> Joe Heck <heckj@mac.com>

View File

@@ -449,7 +449,7 @@ class FixedIpCommands(object):
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
try: try:
if host == None: if host is None:
fixed_ips = db.fixed_ip_get_all(ctxt) fixed_ips = db.fixed_ip_get_all(ctxt)
else: else:
fixed_ips = db.fixed_ip_get_all_by_host(ctxt, host) fixed_ips = db.fixed_ip_get_all_by_host(ctxt, host)
@@ -499,7 +499,7 @@ class FloatingIpCommands(object):
"""Lists all floating ips (optionally by host) """Lists all floating ips (optionally by host)
arguments: [host]""" arguments: [host]"""
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
if host == None: if host is None:
floating_ips = db.floating_ip_get_all(ctxt) floating_ips = db.floating_ip_get_all(ctxt)
else: else:
floating_ips = db.floating_ip_get_all_by_host(ctxt, host) floating_ips = db.floating_ip_get_all_by_host(ctxt, host)
@@ -591,7 +591,7 @@ class VmCommands(object):
_('zone'), _('zone'),
_('index')) _('index'))
if host == None: if host is None:
instances = db.instance_get_all(context.get_admin_context()) instances = db.instance_get_all(context.get_admin_context())
else: else:
instances = db.instance_get_all_by_host( instances = db.instance_get_all_by_host(
@@ -864,7 +864,7 @@ class InstanceTypeCommands(object):
"""Lists all active or specific instance types / flavors """Lists all active or specific instance types / flavors
arguments: [name]""" arguments: [name]"""
try: try:
if name == None: if name is None:
inst_types = instance_types.get_all_types() inst_types = instance_types.get_all_types()
elif name == "--all": elif name == "--all":
inst_types = instance_types.get_all_types(True) inst_types = instance_types.get_all_types(True)

View File

@@ -268,7 +268,7 @@ class AuthManager(object):
LOG.debug(_('Looking up user: %r'), access_key) LOG.debug(_('Looking up user: %r'), access_key)
user = self.get_user_from_access_key(access_key) user = self.get_user_from_access_key(access_key)
LOG.debug('user: %r', user) LOG.debug('user: %r', user)
if user == None: if user is None:
LOG.audit(_("Failed authorization for access key %s"), access_key) LOG.audit(_("Failed authorization for access key %s"), access_key)
raise exception.NotFound(_('No user found for access key %s') raise exception.NotFound(_('No user found for access key %s')
% access_key) % access_key)
@@ -280,7 +280,7 @@ class AuthManager(object):
project_id = user.name project_id = user.name
project = self.get_project(project_id) project = self.get_project(project_id)
if project == None: if project is None:
pjid = project_id pjid = project_id
uname = user.name uname = user.name
LOG.audit(_("failed authorization: no project named %(pjid)s" LOG.audit(_("failed authorization: no project named %(pjid)s"
@@ -646,9 +646,9 @@ class AuthManager(object):
@rtype: User @rtype: User
@return: The new user. @return: The new user.
""" """
if access == None: if access is None:
access = str(uuid.uuid4()) access = str(uuid.uuid4())
if secret == None: if secret is None:
secret = str(uuid.uuid4()) secret = str(uuid.uuid4())
with self.driver() as drv: with self.driver() as drv:
user_dict = drv.create_user(name, access, secret, admin) user_dict = drv.create_user(name, access, secret, admin)

View File

@@ -106,7 +106,7 @@ logging.addLevelName(AUDIT, 'AUDIT')
def _dictify_context(context): def _dictify_context(context):
if context == None: if context is None:
return None return None
if not isinstance(context, dict) \ if not isinstance(context, dict) \
and getattr(context, 'to_dict', None): and getattr(context, 'to_dict', None):

View File

@@ -737,7 +737,7 @@ class SimpleDriverTestCase(test.TestCase):
ret = self.scheduler.driver._live_migration_src_check(self.context, ret = self.scheduler.driver._live_migration_src_check(self.context,
i_ref) i_ref)
self.assertTrue(ret == None) self.assertTrue(ret is None)
db.instance_destroy(self.context, instance_id) db.instance_destroy(self.context, instance_id)
db.service_destroy(self.context, s_ref['id']) db.service_destroy(self.context, s_ref['id'])
@@ -805,7 +805,7 @@ class SimpleDriverTestCase(test.TestCase):
ret = self.scheduler.driver._live_migration_dest_check(self.context, ret = self.scheduler.driver._live_migration_dest_check(self.context,
i_ref, i_ref,
'somewhere') 'somewhere')
self.assertTrue(ret == None) self.assertTrue(ret is None)
db.instance_destroy(self.context, instance_id) db.instance_destroy(self.context, instance_id)
db.service_destroy(self.context, s_ref['id']) db.service_destroy(self.context, s_ref['id'])