Hob: fix '!= None' and '== None' in the code

This patch is to fix the following:

if foo != None -----> if foo
if foo == None -----> if not foo

(From Poky rev: d771343b1726f166ed8d75543ba68bd2a20aee7b)

(Bitbake rev: 23c140a4d00293d922cbd34b6b837493cac2e93a)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Shane Wang 2012-03-16 15:17:37 +08:00 committed by Richard Purdie
parent 9ecdbc377c
commit 491c87d167
6 changed files with 16 additions and 16 deletions

View File

@ -119,7 +119,7 @@ class HobHandler(gobject.GObject):
self.generating = False
def run_next_command(self, initcmd=None):
if initcmd != None:
if initcmd:
self.initcmd = initcmd
if self.commands_async:
@ -127,7 +127,7 @@ class HobHandler(gobject.GObject):
next_command = self.commands_async.pop(0)
else:
self.clear_busy()
if self.initcmd != None:
if self.initcmd:
self.emit("command-succeeded", self.initcmd)
return

View File

@ -713,7 +713,7 @@ class RecipeListModel(gtk.ListStore):
return None
def set_selected_image(self, img):
if img == None:
if not img:
return
path = self.find_path_for_item(img)
self.include_item(item_path=path,

View File

@ -34,7 +34,7 @@ class HobPage (gtk.VBox):
self.builder = builder
self.builder_width, self.builder_height = self.builder.size_request()
if title == None:
if not title:
self.title = "HOB -- Image Creator"
else:
self.title = title
@ -62,7 +62,7 @@ class HobPage (gtk.VBox):
label.set_markup("<span font_desc=\'14\'>%s</span>" % self.title)
hbox.pack_start(label, expand=False, fill=False, padding=20)
if widget != None:
if widget:
# add the widget in the event box
hbox.pack_end(widget, expand=False, fill=False, padding=padding)
eventbox.add(hbox)

View File

@ -366,7 +366,7 @@ class HobTabBar(gtk.DrawingArea):
child["x"] = self.tab_x + i * self.tab_width
child["y"] = self.tab_y
if self.blank_rectangle != None:
if self.blank_rectangle:
self.resize_blank_rectangle()
def resize_blank_rectangle(self):
@ -553,7 +553,7 @@ class HobTabBar(gtk.DrawingArea):
self.queue_draw()
def set_blank_size(self, x, y, w, h):
if self.blank_rectangle == None or self.blank_rectangle.x != x or self.blank_rectangle.width != w:
if not self.blank_rectangle or self.blank_rectangle.x != x or self.blank_rectangle.width != w:
self.emit("blank-area-changed", x, y, w, h)
return gtk.gdk.Rectangle(x, y, w, h)
@ -640,7 +640,7 @@ class HobNotebook(gtk.VBox):
if not notebook:
return
title = notebook.get_tab_label_text(notebook_child)
if title == None:
if not title:
return
for child in self.tabbar.children:
if child["title"] == title:

View File

@ -64,9 +64,9 @@ class ImageDetailsPage (HobPage):
self.hbox.set_border_width(15)
self.add(self.hbox)
if widget != None:
if widget:
row = 1
elif varlist != None and vallist != None:
elif varlist and vallist:
# pack the icon and the text on the left
row = len(varlist)
self.table = gtk.Table(row, 20, True)
@ -75,18 +75,18 @@ class ImageDetailsPage (HobPage):
colid = 0
self.line_widgets = {}
if icon != None:
if icon:
self.table.attach(icon, colid, colid + 2, 0, 1)
colid = colid + 2
if widget != None:
if widget:
self.table.attach(widget, colid, 20, 0, 1)
elif varlist != None and vallist != None:
elif varlist and vallist:
for line in range(0, row):
self.line_widgets[varlist[line]] = self.text2label(varlist[line], vallist[line])
self.table.attach(self.line_widgets[varlist[line]], colid, 20, line, line + 1)
# pack the button on the right
if button != None:
if button:
self.hbox.pack_end(button, expand=False, fill=False)
def update_line_widgets(self, variable, value):

View File

@ -43,7 +43,7 @@ class RunningBuildModel (gtk.TreeStore):
def config_model_filter(self, model, it):
msg = model.get(it, self.COL_MESSAGE)[0]
if msg == None or type(msg) != str:
if not msg or type(msg) != str:
return False
if msg.startswith("\nOE Build Configuration:\n"):
return True
@ -51,7 +51,7 @@ class RunningBuildModel (gtk.TreeStore):
def failure_model_filter(self, model, it):
color = model.get(it, self.COL_COLOR)[0]
if color == None:
if not color:
return False
if color == HobColors.ERROR:
return True