From 1180bab54e2879401f3586c91a48174191a1ee8b Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 11 Apr 2010 17:03:55 -0700 Subject: Apply some 2to3 transforms that don't cause issues in 2.6 (Bitbake rev: d39ab776e7ceaefc8361150151cf0892dcb70d9c) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/buildmanager.py | 4 ++-- bitbake/lib/bb/ui/crumbs/runningbuild.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'bitbake/lib/bb/ui/crumbs') diff --git a/bitbake/lib/bb/ui/crumbs/buildmanager.py b/bitbake/lib/bb/ui/crumbs/buildmanager.py index 37a62f189f..b5a4dae0de 100644 --- a/bitbake/lib/bb/ui/crumbs/buildmanager.py +++ b/bitbake/lib/bb/ui/crumbs/buildmanager.py @@ -157,7 +157,7 @@ class BuildResult(gobject.GObject): # format build-- we can easily # pull it out. # TODO: Better to stat a file? - (_ , date, revision) = identifier.split ("-") + (_, date, revision) = identifier.split ("-") print(date) year = int (date[0:4]) @@ -385,7 +385,7 @@ class BuildManager (gobject.GObject): build_directory]) server.runCommand(["buildTargets", [conf.image], "rootfs"]) - except Exception, e: + except Exception as e: print(e) class BuildManagerTreeView (gtk.TreeView): diff --git a/bitbake/lib/bb/ui/crumbs/runningbuild.py b/bitbake/lib/bb/ui/crumbs/runningbuild.py index 79e2c9060d..b4416ecbb3 100644 --- a/bitbake/lib/bb/ui/crumbs/runningbuild.py +++ b/bitbake/lib/bb/ui/crumbs/runningbuild.py @@ -63,7 +63,7 @@ class RunningBuild (gobject.GObject): # for the message. if hasattr(event, 'pid'): pid = event.pid - if self.pids_to_task.has_key(pid): + if pid in self.pids_to_task: (package, task) = self.pids_to_task[pid] parent = self.tasks_to_iter[(package, task)] @@ -93,12 +93,12 @@ class RunningBuild (gobject.GObject): (package, task) = (event._package, event._task) # Save out this PID. - self.pids_to_task[pid] = (package,task) + self.pids_to_task[pid] = (package, task) # Check if we already have this package in our model. If so then # that can be the parent for the task. Otherwise we create a new # top level for the package. - if (self.tasks_to_iter.has_key ((package, None))): + if ((package, None) in self.tasks_to_iter): parent = self.tasks_to_iter[(package, None)] else: parent = self.model.append (None, (None, -- cgit v1.2.3-54-g00ecf