From c009172f77549e385b9d79f15f181581c55e9909 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 11 May 2009 22:59:35 +0100 Subject: bitbake-dev: Sync with upstream Signed-off-by: Richard Purdie --- bitbake-dev/lib/bb/ui/crumbs/buildmanager.py | 2 -- bitbake-dev/lib/bb/ui/crumbs/runningbuild.py | 1 - bitbake-dev/lib/bb/ui/depexp.py | 1 + bitbake-dev/lib/bb/ui/goggle.py | 3 +-- bitbake-dev/lib/bb/ui/knotty.py | 3 --- bitbake-dev/lib/bb/ui/ncurses.py | 5 +++-- bitbake-dev/lib/bb/ui/puccho.py | 1 - bitbake-dev/lib/bb/ui/uievent.py | 20 ++++++++++---------- 8 files changed, 15 insertions(+), 21 deletions(-) (limited to 'bitbake-dev/lib/bb/ui') diff --git a/bitbake-dev/lib/bb/ui/crumbs/buildmanager.py b/bitbake-dev/lib/bb/ui/crumbs/buildmanager.py index 572cc4c7c..f89e8eefd 100644 --- a/bitbake-dev/lib/bb/ui/crumbs/buildmanager.py +++ b/bitbake-dev/lib/bb/ui/crumbs/buildmanager.py @@ -20,9 +20,7 @@ import gtk import gobject -import gtk.glade import threading -import urllib2 import os import datetime import time diff --git a/bitbake-dev/lib/bb/ui/crumbs/runningbuild.py b/bitbake-dev/lib/bb/ui/crumbs/runningbuild.py index 54d56c245..34f65d239 100644 --- a/bitbake-dev/lib/bb/ui/crumbs/runningbuild.py +++ b/bitbake-dev/lib/bb/ui/crumbs/runningbuild.py @@ -20,7 +20,6 @@ import gtk import gobject -import gtk.glade class RunningBuildModel (gtk.TreeStore): (COL_TYPE, COL_PACKAGE, COL_TASK, COL_MESSAGE, COL_ICON, COL_ACTIVE) = (0, 1, 2, 3, 4, 5) diff --git a/bitbake-dev/lib/bb/ui/depexp.py b/bitbake-dev/lib/bb/ui/depexp.py index 9d92fa0a0..0c559c797 100644 --- a/bitbake-dev/lib/bb/ui/depexp.py +++ b/bitbake-dev/lib/bb/ui/depexp.py @@ -20,6 +20,7 @@ import gobject import gtk import threading +import xmlrpclib # Package Model (COL_PKG_NAME) = (0) diff --git a/bitbake-dev/lib/bb/ui/goggle.py b/bitbake-dev/lib/bb/ui/goggle.py index 0118a356f..94995d82d 100644 --- a/bitbake-dev/lib/bb/ui/goggle.py +++ b/bitbake-dev/lib/bb/ui/goggle.py @@ -20,8 +20,7 @@ import gobject import gtk -import threading -import bb.ui.uihelper +import xmlrpclib from bb.ui.crumbs.runningbuild import RunningBuildTreeView, RunningBuild def event_handle_idle_func (eventHandler, build): diff --git a/bitbake-dev/lib/bb/ui/knotty.py b/bitbake-dev/lib/bb/ui/knotty.py index a6595df3f..a334c2977 100644 --- a/bitbake-dev/lib/bb/ui/knotty.py +++ b/bitbake-dev/lib/bb/ui/knotty.py @@ -19,11 +19,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import os -import bb -from bb import cooker import sys -import time import itertools import xmlrpclib diff --git a/bitbake-dev/lib/bb/ui/ncurses.py b/bitbake-dev/lib/bb/ui/ncurses.py index 3cac26464..2cd7e8e6e 100644 --- a/bitbake-dev/lib/bb/ui/ncurses.py +++ b/bitbake-dev/lib/bb/ui/ncurses.py @@ -44,9 +44,9 @@ """ -import os, sys, curses, time, random, threading, itertools, time -from curses.textpad import Textbox +import os, sys, curses, itertools, time import bb +import xmlrpclib from bb import ui from bb.ui import uihelper @@ -180,6 +180,7 @@ class NCursesUI: def __init__( self, x, y, width, height ): NCursesUI.Window.__init__( self, x, y, width, height ) +# put that to the top again from curses.textpad import Textbox # self.textbox = Textbox( self.win ) # t = threading.Thread() # t.run = self.textbox.edit diff --git a/bitbake-dev/lib/bb/ui/puccho.py b/bitbake-dev/lib/bb/ui/puccho.py index a6a613f1c..dd34182c8 100644 --- a/bitbake-dev/lib/bb/ui/puccho.py +++ b/bitbake-dev/lib/bb/ui/puccho.py @@ -24,7 +24,6 @@ import gtk.glade import threading import urllib2 import os -import datetime from bb.ui.crumbs.buildmanager import BuildManager, BuildConfiguration from bb.ui.crumbs.buildmanager import BuildManagerTreeView diff --git a/bitbake-dev/lib/bb/ui/uievent.py b/bitbake-dev/lib/bb/ui/uievent.py index 9d724d7fc..23fdd0f96 100644 --- a/bitbake-dev/lib/bb/ui/uievent.py +++ b/bitbake-dev/lib/bb/ui/uievent.py @@ -24,7 +24,7 @@ server and queue them for the UI to process. This process must be used to avoid client/server deadlocks. """ -import sys, socket, threading +import socket, threading from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler class BBUIEventQueue: @@ -37,8 +37,8 @@ class BBUIEventQueue: self.BBServer = BBServer self.t = threading.Thread() - self.t.setDaemon(True) - self.t.run = self.startCallbackHandler + self.t.setDaemon(True) + self.t.run = self.startCallbackHandler self.t.start() def getEvent(self): @@ -72,7 +72,7 @@ class BBUIEventQueue: def startCallbackHandler(self): server = UIXMLRPCServer() - self.host, self.port = server.socket.getsockname() + self.host, self.port = server.socket.getsockname() server.register_function( self.system_quit, "event.quit" ) server.register_function( self.queue_event, "event.send" ) @@ -85,7 +85,7 @@ class BBUIEventQueue: server.handle_request() server.server_close() - def system_quit( self ): + def system_quit( self ): """ Shut down the callback thread """ @@ -97,11 +97,11 @@ class BBUIEventQueue: class UIXMLRPCServer (SimpleXMLRPCServer): - def __init__( self, interface = ("localhost", 0) ): + def __init__( self, interface = ("localhost", 0) ): self.quit = False - SimpleXMLRPCServer.__init__( self, - interface, - requestHandler=SimpleXMLRPCRequestHandler, + SimpleXMLRPCServer.__init__( self, + interface, + requestHandler=SimpleXMLRPCRequestHandler, logRequests=False, allow_none=True) def get_request(self): @@ -123,5 +123,5 @@ class UIXMLRPCServer (SimpleXMLRPCServer): if request is None: return SimpleXMLRPCServer.process_request(self, request, client_address) - + -- cgit v1.2.3