diff --git a/addons/DeferredHandler.py b/addons/DeferredHandler.py index 9210b4c6f..9262928bd 100644 --- a/addons/DeferredHandler.py +++ b/addons/DeferredHandler.py @@ -5,7 +5,9 @@ """ from pyjamas.Timer import Timer -from pyjamas import log +from pyjamas import logging + +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) global deferredHandlers deferredHandlers = [] diff --git a/addons/FlowPlayer.py b/addons/FlowPlayer.py index 664245ce2..862f42903 100644 --- a/addons/FlowPlayer.py +++ b/addons/FlowPlayer.py @@ -14,7 +14,9 @@ from pyjamas.Timer import Timer import urllib from __pyjamas__ import wnd -from pyjamas import log +from pyjamas import logging + +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) """ Global variables called by Flash External Interface @@ -196,7 +198,7 @@ def __createFlashVars(self, config): #config_string = config_string.replace('<', '<') #config_string = config_string.replace('>', '>') config_string = config_string.replace('\'', '\\\'') - #log.writebr(config_string) + #log.debug(config_string) return config_string def fireEvent(self, movieName, eventName, arguments): @@ -205,9 +207,9 @@ def fireEvent(self, movieName, eventName, arguments): Fire event """ - #log.writebr('FireEvent: %s/%s/%s' % (movieName, eventName, str(arguments))) + #log.debug('FireEvent: %s/%s/%s' % (movieName, eventName, str(arguments))) if eventName == 'testFireEvent': - log.writebr('fireEvent works') + log.debug('fireEvent works') return if eventName == 'onLoad' and arguments[0] == 'player': self.loadApi() @@ -251,7 +253,7 @@ def fireEvent(self, movieName, eventName, arguments): DeferredHandler.add(eventMethod, []) clip.fireEvent(eventName, arguments[2:]) else: - #log.writebr('[FP Event] %s / %s' % (eventName, arguments)) + #log.debug('[FP Event] %s / %s' % (eventName, arguments)) if hasattr(listener, eventName): eventMethod = getattr(listener, eventName) DeferredHandler.add(eventMethod, arguments) diff --git a/addons/RichTextEditor.py b/addons/RichTextEditor.py index aebbfefd5..40a94ba57 100644 --- a/addons/RichTextEditor.py +++ b/addons/RichTextEditor.py @@ -5,14 +5,15 @@ FCKeditor javascript. """ -from pyjamas import Window -from pyjamas import DOM -from pyjamas import log from BoundMethod import BoundMethod +from pyjamas import logging +from pyjamas import DOM +from pyjamas import Window from pyjamas.ui.Widget import Widget - from __pyjamas__ import JS +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) + def createFCK(name): JS(""" @@ -106,22 +107,22 @@ def onFCKLoaded(self, fck): self.pendingHTML = None def onSelectionChange(self, sender): - pass#log.writebr("onSelectionChange!") + pass#log.debug("onSelectionChange!") def onBlur(self, sender): - pass#log.writebr("onBlur!") + pass#log.debug("onBlur!") def onFocus(self, sender): - pass#log.writebr("onFocus!") + pass#log.debug("onFocus!") def onPaste(self, sender): - pass#log.writebr("onPaste!") + pass#log.debug("onPaste!") def onSave(self): """ Handle the save click and pass it onto the listeners. """ - log.writebr("onSave() in %s", Window.getLocation().getHref()) + log.debug("onSave() in %s", Window.getLocation().getHref()) for listener in self.saveListeners: if hasattr(listener, "onSave"): listener.onSave(self) diff --git a/doc/pyjs_site/public/faq/answers/i_want_to_throw_some_debug_output_onto_the_screen_how_do_i_best_do_that.html b/doc/pyjs_site/public/faq/answers/i_want_to_throw_some_debug_output_onto_the_screen_how_do_i_best_do_that.html index f6c412037..12a885459 100644 --- a/doc/pyjs_site/public/faq/answers/i_want_to_throw_some_debug_output_onto_the_screen_how_do_i_best_do_that.html +++ b/doc/pyjs_site/public/faq/answers/i_want_to_throw_some_debug_output_onto_the_screen_how_do_i_best_do_that.html @@ -10,13 +10,7 @@ from pyjamas import logging log = logging.getConsoleLogger() # other loggers: Alert, Append, Print ... ... -log.error("Hello, here is an error") - -

To make your life even easier there's also a convenience module that -provides an AppendLogger with simple text output already by default:

-
-from pyjamas import log
-log.info('Show this text and value %s now', value)
+log.error("Hello, here is an %s error", err_name)

For a good understanding of the logging module read the Python diff --git a/doc/pyjs_site/website.py b/doc/pyjs_site/website.py index b727eb804..8e9dbcc23 100644 --- a/doc/pyjs_site/website.py +++ b/doc/pyjs_site/website.py @@ -1,8 +1,8 @@ import pyjd # dummy in pyjs +from pyjamas import logging from pyjamas import DeferredCommand from pyjamas import History -from pyjamas import logging from pyjamas import Window from pyjamas.HTTPRequest import HTTPRequest from pyjamas.ui import Event @@ -22,8 +22,8 @@ from pyjamas.ui.VerticalPanel import VerticalPanel from PageLoader import PageListLoader, PageLoader -# global logger. Set level to DEBUG to see the log.debug() messages too! -log = logging.getPrintLogger('pyjs_site', logging.INFO) +# global logger. Set level higher than DEBUG to see less logging messages +log = logging.getConsoleLogger() #class PrettyTab(DecoratorPanel): class PrettyTab(Composite): @@ -87,6 +87,7 @@ def execute(self): def onWindowResized(self, width, height): tabwidth = "%dpx" % (width - 350) + log.info('New tab control width = %s foo.bar', tabwidth) #width = "%dpx" % (width-20) #self.header.setWidth(width) #self.dock.setCellWidth(self.header, width) @@ -96,13 +97,12 @@ def onWindowResized(self, width, height): self.dock.setCellWidth(self.fTabs, tabwidth) def createPage(self, title, purpose, text): - - log.debug("create page %s %s %s", title, purpose, text) + #log.debug("create page %s %s %s", title, purpose, text) if purpose == 'faq': self.faq_pages[title] = text log.debug("%d %d", len(self.faq_pages), len(self.faq_list)) - log.debug(self.faq_pages.keys()) - log.debug(self.faq_list) + #log.debug(self.faq_pages.keys()) + #log.debug(self.faq_list) if len(self.faq_pages) != len(self.faq_list): return faq = self.page_widgets['FAQ'] @@ -151,7 +151,7 @@ def createPage(self, title, purpose, text): History.addHistoryListener(self) initToken = History.getToken() - log.info("initial token: '%s'", initToken) + log.debug("initial token: '%s'", initToken) self.onHistoryChanged(initToken) self.fTabs.addTabListener(self) @@ -171,6 +171,7 @@ def onHistoryChanged(self, token): def onError(self, text, code): log.error("LOAD ERROR(%s): %s", str(code), text) + pass def loadPageList(self): HTTPRequest().asyncGet("sidebar.html", diff --git a/examples/asteroids/Space.py b/examples/asteroids/Space.py index cf6ab2fca..f2f287ebe 100644 --- a/examples/asteroids/Space.py +++ b/examples/asteroids/Space.py @@ -28,7 +28,7 @@ #from pyjamas.Canvas2D import Canvas, CanvasImage, ImageLoadListener from pyjamas.Timer import Timer from pyjamas import Window -from pyjamas import log +#from pyjamas import logging from pyjamas.ui import Event from pyjamas.ui import KeyboardListener from pyjamas.ui.KeyboardListener import KeyboardHandler @@ -40,6 +40,8 @@ import pygwt import random +#log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) + NUM_ASTEROIDS = 2 FPS = 30 ROTATE_SPEED_PER_SEC = math.pi diff --git a/examples/clickoverride/Override.py b/examples/clickoverride/Override.py index 39e0eaa55..b46933269 100644 --- a/examples/clickoverride/Override.py +++ b/examples/clickoverride/Override.py @@ -12,8 +12,9 @@ from pyjamas.ui.ClickListener import ClickHandler from pyjamas.ui.RootPanel import RootPanel from pyjamas.ui import Event -from pyjamas import log from pyjamas import DOM +from pyjamas import logging +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class Board(VerticalPanel, ClickHandler): def __init__(self): @@ -34,7 +35,7 @@ def __init__(self): self.setBorderWidth(1) def onClick(self, sender): - log.writebr('Text'+str(sender)) + log.debug('Text'+str(sender)) def _event_targets_title(self, event): target = DOM.eventGetTarget(event) @@ -55,7 +56,7 @@ def __init__(self, text): self.addClickListener(self) def onClick(self, sender): - log.writebr('Text'+str(sender)) + log.debug('Text'+str(sender)) if __name__ == "__main__": diff --git a/examples/flowpanel/public/images/pyjamas.png b/examples/flowpanel/public/images/pyjamas.png index ed9dcf7e1..22f4dccd7 100644 Binary files a/examples/flowpanel/public/images/pyjamas.png and b/examples/flowpanel/public/images/pyjamas.png differ diff --git a/examples/gwtcanvas/LogoDemo.py b/examples/gwtcanvas/LogoDemo.py index 4f6754e51..bd4da4a9f 100644 --- a/examples/gwtcanvas/LogoDemo.py +++ b/examples/gwtcanvas/LogoDemo.py @@ -26,7 +26,8 @@ from SimpleCanvasDemo import SimpleCanvasDemo -#from pyjamas import log +#from pyjamas import logging +#log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class LogoDemoControls(Composite): def __init__(self): @@ -83,14 +84,14 @@ def drawDemo(self): # Go ahead and animate if self.isImageLoaded(self.img): self.run = True - #log.writebr("already loaded") + #log.debug("already loaded") Timer(1, self) else: Window.alert("Refresh the page to reload the image.") def onImagesLoaded(self, imageHandles): - #log.writebr("loaded") + #log.debug("loaded") # Drawing code involving images goes here self.img = imageHandles[0] self.run = True @@ -113,8 +114,8 @@ def renderingLoop(self): # Draw starting at position 10, 10 # scaled up by a factor of 2 on the self.canvas (using 200x200 as the # destination dimensions). - #log.writebr(str(self.img)) - #log.writebr(DOM.getAttribute("src")) + #log.debug(str(self.img)) + #log.debug(DOM.getAttribute("src")) #self.canvas.drawImage(self.img, 84, 74, 100, 100, 10, 10, 200, 200) self.canvas.drawImage(self.img, 84, 74) @@ -128,7 +129,7 @@ def renderingLoop(self): self.canvas.restoreContext() - #log.writebr(str(self.rotation)) + #log.debug(str(self.rotation)) def onTimer(self, timer): if not self.run: diff --git a/examples/helloworldsplash/public/pyjamas.png b/examples/helloworldsplash/public/pyjamas.png index 5771b25c1..41ae2d90a 100644 Binary files a/examples/helloworldsplash/public/pyjamas.png and b/examples/helloworldsplash/public/pyjamas.png differ diff --git a/examples/jsimport/examplejs.py b/examples/jsimport/examplejs.py index 9ed51a41d..bf1eba090 100644 --- a/examples/jsimport/examplejs.py +++ b/examples/jsimport/examplejs.py @@ -8,7 +8,8 @@ # if you ABSOLUTELY MUST use javascript, here's how to do it. # -from pyjamas import log +from pyjamas import logging +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) # this simply tells the compiler that the two names are to be dropped # into the javascript global namespace @@ -24,11 +25,11 @@ def main(): global examplevar #examplevar is actually "out of modules", in a super scope - log.writebr(examplevar) + log.debug(examplevar) examplevar = 'Altered' - log.writebr(get_examplevar()) + log.debug(get_examplevar()) main() examplevar = "Realtered" -log.writebr(get_examplevar()) +log.debug(get_examplevar()) diff --git a/examples/kitchensink/KitchenSink.py b/examples/kitchensink/KitchenSink.py index 54545a568..5394d6618 100644 --- a/examples/kitchensink/KitchenSink.py +++ b/examples/kitchensink/KitchenSink.py @@ -1,5 +1,6 @@ import pyjd # this is dummy in pyjs +from pyjamas import logging from pyjamas.ui.Button import Button from pyjamas.ui.RootPanel import RootPanel from pyjamas.ui.HTML import HTML @@ -7,9 +8,9 @@ from pyjamas.ui import HasAlignment from pyjamas.ui.Hyperlink import Hyperlink from pyjamas.ui.VerticalPanel import VerticalPanel -from pyjamas import Window from pyjamas.ui.Sink import SinkList from pyjamas import History +from pyjamas import Window import Info import Buttons import Layouts @@ -23,7 +24,8 @@ import Frames import Tabs from Logger import Logger -from pyjamas import log + +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class KitchenSink: diff --git a/examples/libtest/BuiltinTest.py b/examples/libtest/BuiltinTest.py index 0329cb98c..e880c2fd8 100644 --- a/examples/libtest/BuiltinTest.py +++ b/examples/libtest/BuiltinTest.py @@ -27,7 +27,8 @@ def fget(self): return (self.r, self.g, self.b) return property(**locals()) -#from pyjamas import log +#from pyjamas import logging +#log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class C(object): @property diff --git a/examples/maparea/MapAreaDemo.py b/examples/maparea/MapAreaDemo.py index 2bff888ef..58ec6e737 100644 --- a/examples/maparea/MapAreaDemo.py +++ b/examples/maparea/MapAreaDemo.py @@ -1,6 +1,7 @@ import pyjd from pyjamas import DOM +from pyjamas import logging from pyjamas.ui.RootPanel import RootPanel from pyjamas.ui.HTML import HTML @@ -13,7 +14,7 @@ from pyjamas.ui.Image import Image from pyjamas.ui.ContextMenuPopupPanel import ContextMenuPopupPanel -from pyjamas import log +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class MapAreaDemo: @@ -105,7 +106,7 @@ def _mouseActionMessage(self, name, action, x=None, y=None): #msg = "%s %s (%d,%d)" % (name, action, x, y) # throws JS errors msg = name + ' ' + action + ' (' + str(x) + ', ' + str(y) + ')' self.msgarea1.setText(msg) - log.writebr(msg) + log.debug(msg) def onMouseMove(self, sender, x, y): self._mouseActionMessage(sender.areaname, "move", x, y) @@ -125,7 +126,7 @@ def onMouseLeave(self, sender): def onClick(self, sender): msg = "you clicked on baby katie's " + sender.areaname self.msgarea2.setText(msg) - log.writebr(msg) + log.debug(msg) if __name__ == '__main__': diff --git a/examples/misc/djangowanted/media/WebPage.py b/examples/misc/djangowanted/media/WebPage.py index 55e11ad38..e4a5096d6 100644 --- a/examples/misc/djangowanted/media/WebPage.py +++ b/examples/misc/djangowanted/media/WebPage.py @@ -8,16 +8,16 @@ from pyjamas.JSONService import JSONProxy -from pyjamas import Window -from pyjamas import History from pyjamas.django.Form import Form -from pyjamas import log +from pyjamas import Factory +from pyjamas import History +from pyjamas import Window +from pyjamas import logging +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) from WebPageEdit import WebPageEdit from HTMLLinkPanel import HTMLLinkPanel -from pyjamas import Factory - class WebApp: def onFormLoad(self): self.fetch = Button("Retrieve", self) @@ -34,7 +34,7 @@ def onFormLoad(self): RootPanel().add(self.fetch) def onRetrieveDone(self, form): - log.writebr("onRetrieveDone: %s" % repr(form)) + log.debug("onRetrieveDone: %s" % repr(form)) def onDescribeDone(self, form): form.add_widget("Submit", self.submit) @@ -43,26 +43,26 @@ def onClick(self, sender): if sender == self.fetch: key = self.search.getText() if not key: - log.writebr("Please enter id") + log.debug("Please enter id") return key = int(key) - log.writebr("id %d" % key) + log.debug("id %d" % key) #self.wanted.getItem(key, self) self.form.get(id=key) if sender == self.submit: v = self.form.getValue() - log.writebr("onClick %s" % repr(v)) + log.debug("onClick %s" % repr(v)) if v.get('id', None): self.form.update(v) else: self.form.save(v) def onErrors(self, form, response): - log.writebr("onErrors %s" % repr(response)) + log.debug("onErrors %s" % repr(response)) def onSaveDone(self, form, response): - log.writebr("onSave %s" % repr(response)) + log.debug("onSave %s" % repr(response)) def onModuleLoad(self): @@ -93,7 +93,7 @@ def createPage(self, ref, html, title): self.pages[ref] = htp def onHistoryChanged(self, token): - #log.writebr("onHistoryChanged %s" % token) + #log.debug("onHistoryChanged %s" % token) if self.pages.has_key(token): self.setPage(token) return @@ -113,7 +113,7 @@ def setPage(self, ref): def onRemoteResponse(self, response, request_info): #if (request_info.method == 'getItem'): # data = {'id': response['pk']} - # log.writebr(repr(response)) + # log.debug(repr(response)) # self.form.update_values(response) if (request_info.method == 'getPageByName' or diff --git a/examples/misc/djangoweb/media/WebPage.py b/examples/misc/djangoweb/media/WebPage.py index f673f6a22..9d46203ce 100644 --- a/examples/misc/djangoweb/media/WebPage.py +++ b/examples/misc/djangoweb/media/WebPage.py @@ -6,13 +6,13 @@ from pyjamas.JSONService import JSONProxy -from pyjamas import Window -from pyjamas import History -from pyjamas import log from pyjamas import DOM from pyjamas import Factory -from __pyjamas__ import doc +from pyjamas import History +from pyjamas import Window +from pyjamas import logging +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) from WebPageEdit import WebPageEdit from pyjamas.ui.HTMLLinkPanel import HTMLLinkPanel @@ -49,7 +49,7 @@ def createPage(self, ref, html, title): self.pages[ref] = htp def onHistoryChanged(self, token): - #log.writebr("onHistoryChanged %s" % token) + #log.debug("onHistoryChanged %s" % token) if self.pages.has_key(token): self.setPage(token) return diff --git a/examples/misc/flowplayer/fp.py b/examples/misc/flowplayer/fp.py index 02f17d874..0b6277bb6 100644 --- a/examples/misc/flowplayer/fp.py +++ b/examples/misc/flowplayer/fp.py @@ -2,7 +2,9 @@ from pyjamas.ui.RootPanel import RootPanel from pyjamas.ui.VerticalPanel import VerticalPanel from FlowPlayer import Player, Configuration, ControlsPlugin, ContentPlugin, Clip -from pyjamas import log +from pyjamas import logging + +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class FlowPlayerExample: @@ -46,7 +48,7 @@ def getPlayer(self): config.setPlaylist(playlist) # Create the Player Object with the initial configuration - #log.writebr('Loading Player') + #log.debug('Loading Player') player = Player(url, config) # Add Listener to the player @@ -134,7 +136,7 @@ def onLoadPlayer(self): This is a Player Event Fired if the Player is loaded """ - #log.writebr('Player loaded') + #log.debug('Player loaded') # Load a Content-Plugin at runtime into the player content = self.getContentBottom() self.player.loadPlugin(content) @@ -144,7 +146,7 @@ def onLoadPlugin(self, name): This is a Player Event Fired if a plugin is loaded """ - #log.writebr('Plugin %s loaded' % name) + #log.debug('Plugin %s loaded' % name) if name == 'contentBottom': # Animate the content on bottom, if it is loaded content = self.player.getPlugin('contentBottom') @@ -157,7 +159,7 @@ def onClipAdd(self, clip, index): This is a Player Event Fired if a clip is added to playlist """ - #log.writebr('Clip %s on index %s added' % (clip.url, index)) + #log.debug('Clip %s on index %s added' % (clip.url, index)) pass def onPlaylistReplace(self, clips): @@ -165,7 +167,7 @@ def onPlaylistReplace(self, clips): This is a Player Event Fired if the playlist is replaced """ - #log.writebr('Playlist is replaced') + #log.debug('Playlist is replaced') pass def onError(self, args): @@ -173,7 +175,7 @@ def onError(self, args): This is a Player Event Fired on an error """ - log.writebr('Error: %s' % str(args)) + log.debug('Error: %s' % str(args)) # Plugin events @@ -183,7 +185,7 @@ def onClickPlugin(self, plugin): This is a Plugin Event Fired if a plugin is clicked """ - #log.writebr('Plugin %s clicked' % plugin.name) + #log.debug('Plugin %s clicked' % plugin.name) plugin = self.player.getPlugin(plugin.name) if plugin.name == 'contentTop': # Fade out the top content and start playing @@ -195,7 +197,7 @@ def onClickPlugin(self, plugin): # Add one more clip at runtime to the playlist #clip = Clip('movies/movie5.flv') #clip.addListener(self) - #log.writebr('Add Clip') + #log.debug('Add Clip') #self.player.addClip(clip, 3) def onAnimatePlugin(self, plugin): @@ -203,7 +205,7 @@ def onAnimatePlugin(self, plugin): This is a Plugin Event Fired if a plugin is animated """ - #log.writebr('Plugin %s animated' % plugin.name) + #log.debug('Plugin %s animated' % plugin.name) pass # Clip events @@ -213,7 +215,7 @@ def onResume(self, clip): This is a Clip Event Fired if the player is resumed """ - #log.writebr('Clip %s resumed' % clip.url) + #log.debug('Clip %s resumed' % clip.url) # Get the contentTop plugin, and fade it out plugin = self.player.getPlugin('contentTop') plugin.fadeOut() @@ -223,7 +225,7 @@ def onPause(self, clip): This is a Clip Event Fired if the player is paused """ - #log.writebr('Clip %s paused' % clip.url) + #log.debug('Clip %s paused' % clip.url) # Get the contentTop plugin, set some Text # and fade it in plugin = self.player.getPlugin('contentTop') diff --git a/examples/misc/simplewiki/Wiki.py b/examples/misc/simplewiki/Wiki.py index 34cfdfa0c..697283443 100644 --- a/examples/misc/simplewiki/Wiki.py +++ b/examples/misc/simplewiki/Wiki.py @@ -7,12 +7,13 @@ from pyjamas.ui.Label import Label from pyjamas.ui.KeyboardListener import KeyboardHandler from pyjamas.JSONService import JSONProxy - -from pyjamas import log from pyjamas import History +from pyjamas import logging from markdown import makeHTML, makeWikiLinks +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) + class WikiBox(HTMLLinkPanel): def setHTML(self, text): @@ -57,8 +58,8 @@ def onRemoteResponse(self, response, request_info): self.t.setText(response['content']) def onRemoteError(self, code, message, request_info): - log.writebr('remote error! ' + str(message)) - log.writebr('remote error! ' + str(request_info)) + log.debug('remote error! ' + str(message)) + log.debug('remote error! ' + str(request_info)) def onKeyUp(self, sender, keycode, modifiers): if sender == self.t: diff --git a/examples/misc/swfupload/swfu.py b/examples/misc/swfupload/swfu.py index a604e8fd3..07edef25d 100644 --- a/examples/misc/swfupload/swfu.py +++ b/examples/misc/swfupload/swfu.py @@ -3,7 +3,9 @@ from pyjamas.ui.Label import Label from pyjamas.ui.Button import Button from SWFUpload import SWFUpload, Settings, SWFUploadInterface -from pyjamas import log +from pyjamas import logging + +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class SWFUploadExample(SWFUploadInterface): @@ -57,7 +59,7 @@ def getSettings(self): return settings def onStartUpload(self): - #log.writebr('Starting Upload') + #log.debug('Starting Upload') self.swfUpload.startUpload() """ @@ -65,43 +67,43 @@ def onStartUpload(self): """ def swfUploadLoaded(self): - #log.writebr('swfUploadLoaded') + #log.debug('swfUploadLoaded') pass def uploadProgress(self, file, bytesLoaded, totalBytes): self.progress.setText('%s - %s of %s uploaded' % (file.name, bytesLoaded, totalBytes)) def uploadError(self, file, errorCode, message): - log.writebr('uploadError: %s, %s' % (errorCode, message)) + log.debug('uploadError: %s, %s' % (errorCode, message)) def uploadSuccess(self, file, receivedResponse, serverData): self.fileids.remove(file.id) self.showQueue() def uploadComplete(self, file): - #log.writebr('uploadComplete: %s' % file.name) + #log.debug('uploadComplete: %s' % file.name) if len(self.fileids) > 0: self.swfUpload.startUpload() else: self.progress.setText('All files uploaded') def fileDialogStart(self): - #log.writebr('fileDialogStart') + #log.debug('fileDialogStart') pass def fileQueued(self, file): - #log.writebr('fileQueued: %s' % file.name) + #log.debug('fileQueued: %s' % file.name) self.fileids.append(file.id) def fileQueueError(self, file, errorCode, message): - log.writebr('fileQueueError: %s, %s' % (errorCode, message)) + log.debug('fileQueueError: %s, %s' % (errorCode, message)) def fileDialogComplete(self, sel, qu, tqu): - #log.writebr('fileDialogComplete: %s, %s, %s' % (sel, qu, tqu)) + #log.debug('fileDialogComplete: %s, %s, %s' % (sel, qu, tqu)) self.showQueue() def uploadStart(self, file): - #log.writebr('uploadStart') + #log.debug('uploadStart') # Do something before the upload starts, and return True to start the upload return True diff --git a/examples/raphael/events.py b/examples/raphael/events.py index 6feac3712..f0bd8cedf 100644 --- a/examples/raphael/events.py +++ b/examples/raphael/events.py @@ -1,4 +1,5 @@ import pyjd +from pyjamas.raphael.raphael import Raphael from pyjamas.ui.RootPanel import RootPanel from pyjamas.ui.TabPanel import TabPanel from pyjamas.ui.SimplePanel import SimplePanel @@ -7,8 +8,8 @@ from pyjamas.ui.HTML import HTML from pyjamas.ui import HasAlignment from pyjamas import DOM -from pyjamas import log -from pyjamas.raphael.raphael import Raphael +from pyjamas import logging +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class Events(VerticalPanel): def __init__(self,width=600,height=300): diff --git a/examples/raphael/graffle.py b/examples/raphael/graffle.py index 1584753d7..2822c28ee 100644 --- a/examples/raphael/graffle.py +++ b/examples/raphael/graffle.py @@ -7,9 +7,11 @@ from pyjamas.ui.Label import Label from pyjamas.ui.HTML import HTML from pyjamas.ui import HasAlignment -from pyjamas import DOM -from pyjamas import log from pyjamas.raphael.raphael import Raphael,DOCK_CONNECTION +from pyjamas import DOM +from pyjamas import logging + +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class Graffle(SimplePanel): diff --git a/examples/raphael/raphael_showcase.py b/examples/raphael/raphael_showcase.py index 1a2a13eb3..b7373d244 100644 --- a/examples/raphael/raphael_showcase.py +++ b/examples/raphael/raphael_showcase.py @@ -4,6 +4,7 @@ """ import pyjd +#from pyjamas.raphael.raphael import Raphael from pyjamas.ui.RootPanel import RootPanel from pyjamas.ui.TabPanel import TabPanel from pyjamas.ui.SimplePanel import SimplePanel @@ -12,8 +13,8 @@ from pyjamas.ui.HTML import HTML from pyjamas.ui import HasAlignment from pyjamas import DOM -from pyjamas import log -#from pyjamas.raphael.raphael import Raphael +from pyjamas import logging +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) import graffle import events diff --git a/examples/raphael/spinner.py b/examples/raphael/spinner.py index 6cc1356fb..0fb8b6048 100644 --- a/examples/raphael/spinner.py +++ b/examples/raphael/spinner.py @@ -7,7 +7,8 @@ from pyjamas import Window from pyjamas.raphael.raphael import Raphael -from pyjamas import log +from pyjamas import logging +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) import pyjd ############################################################################# diff --git a/examples/shell/Screen.py b/examples/shell/Screen.py index 0274dfbb4..b5005ad17 100644 --- a/examples/shell/Screen.py +++ b/examples/shell/Screen.py @@ -1,7 +1,9 @@ from Popups import DialogBoxModal from pyjamas.ui.AbsolutePanel import AbsolutePanel from pyjamas import Window -from pyjamas import log +from pyjamas import logging + +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class Application(DialogBoxModal): def __init__(self, screen, title, width, height): @@ -13,12 +15,12 @@ def __init__(self, screen, title, width, height): #self.setHeight(height) def onMouseDown(self, sender, x, y): - #log.writebr("down %d %d" % (x, y)) + #log.debug("down %d %d" % (x, y)) DialogBoxModal.onMouseDown(self, sender, x, y) self.dragged = False def onMouseMove(self, sender, x, y): - #log.writebr("move %d %d" % (x, y)) + #log.debug("move %d %d" % (x, y)) if self.dragStartX != x or self.dragStartY != y: if not self.dragged: self.screen.raise_app(self) @@ -26,7 +28,7 @@ def onMouseMove(self, sender, x, y): DialogBoxModal.onMouseMove(self, sender, x, y) def onMouseUp(self, sender, x, y): - #log.writebr("up %d %d" % (x, y)) + #log.debug("up %d %d" % (x, y)) DialogBoxModal.onMouseUp(self, sender, x, y) if not self.dragged: self.screen.raise_or_lower(self) diff --git a/examples/shell/textconsole.py b/examples/shell/textconsole.py index 1f5ed429b..277d8065d 100644 --- a/examples/shell/textconsole.py +++ b/examples/shell/textconsole.py @@ -1,9 +1,11 @@ from pyjamas.ui.AbsolutePanel import AbsolutePanel from pyjamas.ui.Label import Label from pyjamas import DOM -from pyjamas import log +from pyjamas import logging import math +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) + class TextWindow(AbsolutePanel): def __init__(self, cols, rows, width, height): @@ -45,7 +47,7 @@ def setWidth(self, width): ratio = self.fontsize / self.fontheight DOM.setStyleAttribute(self.getElement(), 'fontSizeAdjust', str(ratio)) - #log.writebr(str(ratio)) + #log.debug(str(ratio)) def setHeight(self, height): @@ -53,7 +55,7 @@ def setHeight(self, height): AbsolutePanel.setHeight(self, "%dpx" % (self.rows*self.fontheight)) DOM.setStyleAttribute(self.getElement(), 'fontSize', "%dpx" % self.fontheight) - #log.writebr(str(self.fontheight)) + #log.debug(str(self.fontheight)) def setText(self, x, y, string): diff --git a/library/pyjamas/Canvas/GWTCanvasImplDefault.py b/library/pyjamas/Canvas/GWTCanvasImplDefault.py index 3ac51a611..df01fe884 100644 --- a/library/pyjamas/Canvas/GWTCanvasImplDefault.py +++ b/library/pyjamas/Canvas/GWTCanvasImplDefault.py @@ -14,15 +14,13 @@ * the License. """ - - - from pyjamas import DOM -from pyjamas import log +#from pyjamas import logging from pyjamas.ui.Widget import Widget - from pyjamas.Canvas.Color import Color +#log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) + def cvt(s): return s diff --git a/library/pyjamas/Factory.py b/library/pyjamas/Factory.py index a46a26a8a..ccfb3cfa8 100644 --- a/library/pyjamas/Factory.py +++ b/library/pyjamas/Factory.py @@ -6,8 +6,9 @@ # * pyjamas.ui namespace is used for widgets in library/pyjamas/ui #from __pyjamas__ import doc -from pyjamas import log from pyjamas import DOM +from pyjamas import logging +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) factory = {} diff --git a/library/pyjamas/chart/GChartWidgets.py b/library/pyjamas/chart/GChartWidgets.py index 8755bf64e..068b7cb72 100644 --- a/library/pyjamas/chart/GChartWidgets.py +++ b/library/pyjamas/chart/GChartWidgets.py @@ -17,13 +17,11 @@ * """ - import math from pyjamas import DOM from pyjamas import Window - from pyjamas.ui import Event from pyjamas.ui.AbsolutePanel import AbsolutePanel from pyjamas.ui.Composite import Composite @@ -47,7 +45,8 @@ from pyjamas.chart import GChartUtil from pyjamas.chart import Double -from pyjamas import log +#from pyjamas import logging +#log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) """ * This class' sole purpose is to work around a FF 2 @@ -2042,7 +2041,7 @@ def onBrowserEvent(self, event): # remember last "tracked" mouse location """ if "click" == eventId: - log.writebr("CLICK: event.getClientX()=" + str(DOM.eventGetClientX(event)) + + log.debug("CLICK: event.getClientX()=" + str(DOM.eventGetClientX(event)) + " event.getClientY()=" + str(DOM.eventGetClientY(event)) + " event.getTarget()==self.getElement() is " + str(DOM.eventGetTarget(event) == self.getElement()) + @@ -2050,7 +2049,7 @@ def onBrowserEvent(self, event): " event.getTarget()=" + str(DOM.eventGetTarget(event))) elif "mouseover" == eventId: - log.writebr("MOUSEOVER: event.getClientX()=" + str(DOM.eventGetClientX(event)) + + log.debug("MOUSEOVER: event.getClientX()=" + str(DOM.eventGetClientX(event)) + " event.getClientY()=" + str(DOM.eventGetClientY(event)) + " event.getCurrentTarget()="+str(DOM.eventGetCurrentTarget(event)) + " event.getTarget()=" + str(DOM.eventGetTarget(event))) @@ -2067,7 +2066,7 @@ def onBrowserEvent(self, event): elif "mouseout" == eventId and self.chart.getHoverTouchingEnabled() and self.takesUsCompletelyOutsideChart(event): """ - log.writebr("MOUSEOUT: event.getClientX()=" + str(DOM.eventGetClientX(event)) + + log.debug("MOUSEOUT: event.getClientX()=" + str(DOM.eventGetClientX(event)) + " event.getClientY()=" + str(DOM.eventGetClientY(event)) + " event.getCurrentTarget()="+str(DOM.eventGetCurrentTarget(event)) + " event.getTarget()=" + str(DOM.eventGetTarget(event))) diff --git a/library/pyjamas/feed/Feed.py b/library/pyjamas/feed/Feed.py index 7fd1fb06a..61d877889 100644 --- a/library/pyjamas/feed/Feed.py +++ b/library/pyjamas/feed/Feed.py @@ -1,8 +1,9 @@ from pyjamas.Timer import Timer from __pyjamas__ import doc, JS from pyjamas import DOM -from pyjamas import log +#from pyjamas import logging +#log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) frameId = 0 class Feed: diff --git a/library/pyjamas/raphael/raphael.py b/library/pyjamas/raphael/raphael.py index 1e07af587..83587adce 100644 --- a/library/pyjamas/raphael/raphael.py +++ b/library/pyjamas/raphael/raphael.py @@ -22,7 +22,8 @@ from pyjamas import Window from __pyjamas__ import JS -from pyjamas import log +from pyjamas import logging +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) ############################################################################# class RaphaelEventHandler(object): diff --git a/library/pyjamas/ui/BuilderPanel.py b/library/pyjamas/ui/BuilderPanel.py index 1e9298571..b90ea7f32 100644 --- a/library/pyjamas/ui/BuilderPanel.py +++ b/library/pyjamas/ui/BuilderPanel.py @@ -14,8 +14,9 @@ """ -from pyjamas import log from pyjamas.ui.BuilderWidget import BuilderWidget +#from pyjamas import logging +#log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) class BuilderPanel(BuilderWidget): diff --git a/library/pyjamas/ui/FlashPanel.browser.py b/library/pyjamas/ui/FlashPanel.browser.py index 7e8604502..2c59faff2 100644 --- a/library/pyjamas/ui/FlashPanel.browser.py +++ b/library/pyjamas/ui/FlashPanel.browser.py @@ -27,7 +27,7 @@ def callFlash(self, functionName, arguments=[]): if returnString != 'undefined': returnValue = eval(returnString) except: - log.writebr('Call to '+functionName+' failed') + log.debug('Call to '+functionName+' failed') return returnValue def toJS(self, list_or_dict): diff --git a/library/pyjamas/ui/FlashPanel.py b/library/pyjamas/ui/FlashPanel.py index a1e2f7747..f9c519169 100644 --- a/library/pyjamas/ui/FlashPanel.py +++ b/library/pyjamas/ui/FlashPanel.py @@ -9,12 +9,14 @@ from pyjamas import DOM from pyjamas.ui.Panel import Panel -from pyjamas import log from __pyjamas__ import wnd import pyjd if not pyjd.is_desktop: from __javascript__ import Array, Object, eval +#from pyjamas import logging +#log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) + def browser(): return 'w3c' @@ -49,7 +51,7 @@ def __init__(self, **kwargs): """ The flashmovie bgcolor parameter. Default: #FFFFFF (white)""" self.flashvars = '' self.browser = browser() - #log.writebr('FlashPanel loaded on %s' % self.browser) + #log.debug('FlashPanel loaded on %s' % self.browser) def onLoad(self): DOM.setInnerHTML(self.element, self.__getFlashHTML()) diff --git a/library/pyjamas/ui/Widget.py b/library/pyjamas/ui/Widget.py index 435f01807..c05695d3e 100644 --- a/library/pyjamas/ui/Widget.py +++ b/library/pyjamas/ui/Widget.py @@ -14,7 +14,6 @@ # limitations under the License. from pyjamas import DOM from pyjamas import Factory -from pyjamas import log from pyjamas.ui.UIObject import UIObject from pyjamas.ui import Event @@ -27,6 +26,9 @@ from pyjamas.ui.DragHandler import DragHandler from pyjamas.ui.DropHandler import DropHandler +#from pyjamas import logging +#log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) + class Widget(UIObject): """ Base class for most of the UI classes. This class provides basic services diff --git a/pygtkweb/library/gtk.py b/pygtkweb/library/gtk.py index 01032a4b0..88a62bae7 100644 --- a/pygtkweb/library/gtk.py +++ b/pygtkweb/library/gtk.py @@ -1,10 +1,11 @@ import pyjd -from pyjamas import log +from pyjamas import logging import browser import gdk #import lxml.etree +log = logging.getAppendLogger(__name__, logging.DEBUG, logging.PLAIN_FORMAT) # WINDOW TYPES WINDOW_TOPLEVEL = 1 @@ -1274,11 +1275,11 @@ def find_props(node): for i in range(props.length): n = props.item(n) name = n.attributes.getNamedItem('name').nodeValue - log.write("find_props ") - log.write(name) - log.write(" ") - log.write(n.textContent) - log.writebr("") + log.debug("find_props ") + log.debug(name) + log.debug(" ") + log.debug(n.textContent) + log.debug("") res[name] = n.textContent return res @@ -1351,10 +1352,10 @@ def create_object_from_xml_node(self, node): klsname = node.attributes.getNamedItem('class').nodeValue # XXX shadowing builtin id id = node.attributes.getNamedItem('id').nodeValue - log.writebr("%s %s" % (klsname, id)) + log.debug("%s %s" % (klsname, id)) obj = gtkmap[klsname]() props = node.getElementsByTagName("property") - log.writebr("%s %d" % (klsname, props.length)) + log.debug("%s %d" % (klsname, props.length)) for i in range(props.length): prop = props.item(i) name = prop.attributes.getNamedItem('name').nodeValue @@ -1368,7 +1369,7 @@ def create_object_from_xml_node(self, node): else: print "setattr failed", klsname, name, value childnodes = node.getElementsByTagName("child") - log.writebr("%s children %d" % (klsname, childnodes.length)) + log.debug("%s children %d" % (klsname, childnodes.length)) for i in range(childnodes.length): childnode = childnodes.item(i) childobj = childnode.getElementsByTagName("object") @@ -1404,9 +1405,9 @@ def add_from_file(self, fname): def add_from_string(self, xmldoc): x = xmldoc.firstChild.firstChild while x: - log.writebr(x.nodeName) + log.debug(x.nodeName) if x.nodeName == 'object': - log.writebr("creating object") + log.debug("creating object") obj = self.create_object_from_xml_node(x) self.objects.append(obj) x = x.nextSibling