convert more prints to logging

courseware/modules/video_module.py

@@ -1,36 +1,39 @@
-from x_module import XModule
-from lxml import etree
-
+import logging
 import json
 
 ## TODO: Abstract out from Django
 from django.conf import settings
 from djangomako.shortcuts import render_to_response, render_to_string
+from lxml import etree
+
+from x_module import XModule
+
+log = logging.getLogger("mitx.courseware.modules")
 
 class VideoModule(XModule):
     #id_attribute = 'youtube'
     video_time = 0
 
     def handle_ajax(self, dispatch, get):
-        print "GET", get
-        print "DISPATCH", dispatch
-        if dispatch=='goto_position':
+        log.debug(u"GET {0}".format(get))
+        log.debug(u"DISPATCH {0}".format(dispatch))
+        if dispatch == 'goto_position':
             self.position = int(float(get['position']))
-            print "NEW POSITION", self.position
+            log.debug(u"NEW POSITION {0}".format(self.position))
             return json.dumps({'success':True})
         raise Http404()
 
     def get_state(self):
-        print "STATE POSITION", self.position
+        log.debug(u"STATE POSITION {0}".format(self.position))
         return json.dumps({ 'position':self.position })
 
     def get_xml_tags():
-        ''' Tags in the courseware file guaranteed to correspond to the module '''
+        '''Tags in the courseware file guaranteed to correspond to the module'''
         return "video"
         
     def video_list(self):
-        l=self.youtube.split(',')
-        l=[i.split(":") for i in l]
+        l = self.youtube.split(',')
+        l = [i.split(":") for i in l]
         return json.dumps(dict(l))
     
     def get_html(self):
@@ -39,24 +42,25 @@ class VideoModule(XModule):
                                               'position':self.position})
 
     def get_init_js(self):
-        ''' JavaScript code to be run when problem is shown. Be aware
+        '''JavaScript code to be run when problem is shown. Be aware
         that this may happen several times on the same page
         (e.g. student switching tabs). Common functions should be put
         in the main course .js files for now. ''' 
-        print "INIT POSITION", self.position
+        log.debug(u"INIT POSITION {0}".format(self.position))
         return render_to_string('video_init.js',{'streams':self.video_list(),
                                                  'id':self.item_id,
                                                  'position':self.position})
 
     def get_destroy_js(self):
-        return "videoDestroy(\""+self.item_id+"\");"
+        return "videoDestroy(\"{0}\");".format(self.item_id)
 
     def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None):
         XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function, render_function)
         self.youtube = etree.XML(xml).get('youtube')
         self.position = 0
-        if state!=None:
+        if state != None:
             state = json.loads(state)
-            if 'position' in state: self.position = int(float(state['position']))
-            print "POOSITION IN STATE"
-        print "LOAD POSITION", self.position
+            if 'position' in state:
+                self.position = int(float(state['position']))
+            log.debug("POSITION IN STATE")
+        log.debug(u"LOAD POSITION {0}".format(self.position))

settings_new_askbot.py

@@ -155,7 +155,7 @@ LOGGING = {
             'stream' : sys.stderr,
         },
         'app' : {
-            'level' : 'INFO',
+            'level' : 'DEBUG' if DEBUG else 'INFO',
             'class' : 'logging.handlers.TimedRotatingFileHandler',
             'formatter' : 'standard',
             'filename' : LOG_DIR + '/mitx.log', # temporary location for proof of concept