cleanup; option to not display text when there is an image; replaced print statements with logging calls.

Author: jschaul

CommandBar.py

@@ -1,7 +1,11 @@
 import talkshowConfig
 import pyglet
 
-#from widget import Widget
+from talkshowLogger import logger
+
+debug = logger.debug
+info = logger.info
+warn = logger.warn
 
 class CommandBar(object):
 
@@ -45,12 +49,12 @@ def __init__(self, screen, orientation=0):
 
 
         if self.orientation == 0:
-            print "orientation 0"
+            debug("orientation 0")
             increaseX = int(self.style.warning.width) + self.imagePadding[1] + self.imagePadding[3]
             increaseY = 0
 
         else:            
-            print "orientation 1"
+            debug("orientation 1")
             increaseX = 0            
             increaseY = int(self.style.warning.height) + self.imagePadding[0] + self.imagePadding[2]      
 

TO_DO_s.py

@@ -46,7 +46,6 @@
 # TODO: Add a method in Talkshow object to test if all is well configured.
 
 
-# replace print with proper logging calls
 # strange paths replace by os.dirsep
 # refactor code into more classes/files 
 # documentation on structure

delayed_call.py

@@ -1,6 +1,13 @@
 import pyglet
 import weakref
 
+
+from talkshowLogger import logger
+
+debug = logger.debug
+info = logger.info
+warn = logger.warn
+
 class NoCookie: pass
 
 class DelayedCall:
@@ -63,7 +70,7 @@ def _callme(ref):
 
     def cancel(self):
         if self.scheduled:
-            print "cancel!"
+            debug("cancel!")
             pyglet.clock.unschedule(self.identifier)
         self.scheduled = False
         self.func = None

parseCSS.py

@@ -7,6 +7,11 @@
 import tinycss
 import os
 
+from talkshowLogger import logger
+
+debug = logger.debug
+info = logger.info
+warn = logger.warn
 
 class Struct(object):
     '''Struct to convert a python dict (which you access by myDict["key1"]) into a class, 
@@ -34,7 +39,7 @@ def __init__(self, filename):
         if os.path.exists(filename):
             self.parseFile()
         else:
-            print "filename %s not found" % filename
+            warn( "filename %s not found" % filename)
 
     def parseFile(self):
         parser = tinycss.make_parser()
@@ -44,12 +49,12 @@ def parseFile(self):
         try:
             self.dict = {removeHashesAndDots(rule.selector.as_css()):{declaration.name:makeFloatsOutOfPercentages(declaration.value.as_css()) for declaration in rule.declarations  } for rule in stylesheet.rules}
         except Exception, e:
-            print "problem with submethod, only generating basicDict"
+            warn( "problem with submethod, only generating basicDict")
             raise e
         try:
             self.style = Struct(**{removeHashesAndDots(rule.selector.as_css()):Struct(**{declaration.name.replace('-','_'):makeFloatsOutOfPercentages(declaration.value.as_css()) for declaration in rule.declarations  }) for rule in stylesheet.rules})
         except Exception, e:
-            print "problem with submethod, only generating basicDict and dict"
+            warn( "problem with submethod, only generating basicDict and dict")
             raise e