summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r--bitbake/lib/bb/ui/crumbs/buildmanager.py4
-rw-r--r--bitbake/lib/bb/ui/crumbs/runningbuild.py6
-rw-r--r--bitbake/lib/bb/ui/depexp.py2
-rw-r--r--bitbake/lib/bb/ui/goggle.py2
-rw-r--r--bitbake/lib/bb/ui/knotty.py2
-rw-r--r--bitbake/lib/bb/ui/ncurses.py2
-rw-r--r--bitbake/lib/bb/ui/puccho.py6
-rw-r--r--bitbake/lib/bb/ui/uievent.py2
8 files changed, 13 insertions, 13 deletions
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):
157 # format build-<year><month><day>-<ordinal> we can easily 157 # format build-<year><month><day>-<ordinal> we can easily
158 # pull it out. 158 # pull it out.
159 # TODO: Better to stat a file? 159 # TODO: Better to stat a file?
160 (_ , date, revision) = identifier.split ("-") 160 (_, date, revision) = identifier.split ("-")
161 print(date) 161 print(date)
162 162
163 year = int (date[0:4]) 163 year = int (date[0:4])
@@ -385,7 +385,7 @@ class BuildManager (gobject.GObject):
385 build_directory]) 385 build_directory])
386 server.runCommand(["buildTargets", [conf.image], "rootfs"]) 386 server.runCommand(["buildTargets", [conf.image], "rootfs"])
387 387
388 except Exception, e: 388 except Exception as e:
389 print(e) 389 print(e)
390 390
391class BuildManagerTreeView (gtk.TreeView): 391class 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):
63 # for the message. 63 # for the message.
64 if hasattr(event, 'pid'): 64 if hasattr(event, 'pid'):
65 pid = event.pid 65 pid = event.pid
66 if self.pids_to_task.has_key(pid): 66 if pid in self.pids_to_task:
67 (package, task) = self.pids_to_task[pid] 67 (package, task) = self.pids_to_task[pid]
68 parent = self.tasks_to_iter[(package, task)] 68 parent = self.tasks_to_iter[(package, task)]
69 69
@@ -93,12 +93,12 @@ class RunningBuild (gobject.GObject):
93 (package, task) = (event._package, event._task) 93 (package, task) = (event._package, event._task)
94 94
95 # Save out this PID. 95 # Save out this PID.
96 self.pids_to_task[pid] = (package,task) 96 self.pids_to_task[pid] = (package, task)
97 97
98 # Check if we already have this package in our model. If so then 98 # Check if we already have this package in our model. If so then
99 # that can be the parent for the task. Otherwise we create a new 99 # that can be the parent for the task. Otherwise we create a new
100 # top level for the package. 100 # top level for the package.
101 if (self.tasks_to_iter.has_key ((package, None))): 101 if ((package, None) in self.tasks_to_iter):
102 parent = self.tasks_to_iter[(package, None)] 102 parent = self.tasks_to_iter[(package, None)]
103 else: 103 else:
104 parent = self.model.append (None, (None, 104 parent = self.model.append (None, (None,
diff --git a/bitbake/lib/bb/ui/depexp.py b/bitbake/lib/bb/ui/depexp.py
index e386e34958..1cd58cac18 100644
--- a/bitbake/lib/bb/ui/depexp.py
+++ b/bitbake/lib/bb/ui/depexp.py
@@ -207,7 +207,7 @@ def init(server, eventHandler):
207 if ret != True: 207 if ret != True:
208 print("Couldn't run command! %s" % ret) 208 print("Couldn't run command! %s" % ret)
209 return 209 return
210 except xmlrpclib.Fault, x: 210 except xmlrpclib.Fault as x:
211 print("XMLRPC Fault getting commandline:\n %s" % x) 211 print("XMLRPC Fault getting commandline:\n %s" % x)
212 return 212 return
213 213
diff --git a/bitbake/lib/bb/ui/goggle.py b/bitbake/lib/bb/ui/goggle.py
index 7a3427f715..2cfa002f8a 100644
--- a/bitbake/lib/bb/ui/goggle.py
+++ b/bitbake/lib/bb/ui/goggle.py
@@ -62,7 +62,7 @@ def init (server, eventHandler):
62 if ret != True: 62 if ret != True:
63 print("Couldn't get default commandline! %s" % ret) 63 print("Couldn't get default commandline! %s" % ret)
64 return 1 64 return 1
65 except xmlrpclib.Fault, x: 65 except xmlrpclib.Fault as x:
66 print("XMLRPC Fault getting commandline:\n %s" % x) 66 print("XMLRPC Fault getting commandline:\n %s" % x)
67 return 1 67 return 1
68 68
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index dba9530ef6..b6ca15b4fb 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -46,7 +46,7 @@ def init(server, eventHandler):
46 if ret != True: 46 if ret != True:
47 print("Couldn't get default commandline! %s" % ret) 47 print("Couldn't get default commandline! %s" % ret)
48 return 1 48 return 1
49 except xmlrpclib.Fault, x: 49 except xmlrpclib.Fault as x:
50 print("XMLRPC Fault getting commandline:\n %s" % x) 50 print("XMLRPC Fault getting commandline:\n %s" % x)
51 return 1 51 return 1
52 52
diff --git a/bitbake/lib/bb/ui/ncurses.py b/bitbake/lib/bb/ui/ncurses.py
index 89e67900b2..e3bca2af83 100644
--- a/bitbake/lib/bb/ui/ncurses.py
+++ b/bitbake/lib/bb/ui/ncurses.py
@@ -234,7 +234,7 @@ class NCursesUI:
234 if ret != True: 234 if ret != True:
235 print("Couldn't get default commandlind! %s" % ret) 235 print("Couldn't get default commandlind! %s" % ret)
236 return 236 return
237 except xmlrpclib.Fault, x: 237 except xmlrpclib.Fault as x:
238 print("XMLRPC Fault getting commandline:\n %s" % x) 238 print("XMLRPC Fault getting commandline:\n %s" % x)
239 return 239 return
240 240
diff --git a/bitbake/lib/bb/ui/puccho.py b/bitbake/lib/bb/ui/puccho.py
index 7dffa5c3ba..2ac025303e 100644
--- a/bitbake/lib/bb/ui/puccho.py
+++ b/bitbake/lib/bb/ui/puccho.py
@@ -104,10 +104,10 @@ class MetaDataLoader(gobject.GObject):
104 gobject.idle_add (MetaDataLoader.emit_success_signal, 104 gobject.idle_add (MetaDataLoader.emit_success_signal,
105 self.loader) 105 self.loader)
106 106
107 except MetaDataLoader.LoaderThread.LoaderImportException, e: 107 except MetaDataLoader.LoaderThread.LoaderImportException as e:
108 gobject.idle_add (MetaDataLoader.emit_error_signal, self.loader, 108 gobject.idle_add (MetaDataLoader.emit_error_signal, self.loader,
109 "Repository metadata corrupt") 109 "Repository metadata corrupt")
110 except Exception, e: 110 except Exception as e:
111 gobject.idle_add (MetaDataLoader.emit_error_signal, self.loader, 111 gobject.idle_add (MetaDataLoader.emit_error_signal, self.loader,
112 "Unable to download repository metadata") 112 "Unable to download repository metadata")
113 print(e) 113 print(e)
@@ -211,7 +211,7 @@ class BuildSetupDialog (gtk.Dialog):
211 # Build 211 # Build
212 button = gtk.Button ("_Build", None, True) 212 button = gtk.Button ("_Build", None, True)
213 image = gtk.Image () 213 image = gtk.Image ()
214 image.set_from_stock (gtk.STOCK_EXECUTE,gtk.ICON_SIZE_BUTTON) 214 image.set_from_stock (gtk.STOCK_EXECUTE, gtk.ICON_SIZE_BUTTON)
215 button.set_image (image) 215 button.set_image (image)
216 self.add_action_widget (button, BuildSetupDialog.RESPONSE_BUILD) 216 self.add_action_widget (button, BuildSetupDialog.RESPONSE_BUILD)
217 button.show_all () 217 button.show_all ()
diff --git a/bitbake/lib/bb/ui/uievent.py b/bitbake/lib/bb/ui/uievent.py
index 5b3efffcba..f1e4d791ee 100644
--- a/bitbake/lib/bb/ui/uievent.py
+++ b/bitbake/lib/bb/ui/uievent.py
@@ -110,7 +110,7 @@ class UIXMLRPCServer (SimpleXMLRPCServer):
110 return (sock, addr) 110 return (sock, addr)
111 except socket.timeout: 111 except socket.timeout:
112 pass 112 pass
113 return (None,None) 113 return (None, None)
114 114
115 def close_request(self, request): 115 def close_request(self, request):
116 if request is None: 116 if request is None: