working on import issues

courseware/capa/capa_problem.py

@@ -5,7 +5,7 @@ from lxml import etree
 from lxml.etree import Element
 import copy
 from mako.template import Template
-from content_parser import xpath_remove
+from courseware.content_parser import xpath_remove
 import calc, eia
 
 from util import contextualize_text

courseware/module_render.py

@@ -30,7 +30,7 @@ import urllib
 
 from django.conf import settings
 
-import content_parser
+import courseware.content_parser
 
 import sys
 
@@ -79,7 +79,7 @@ def modx_dispatch(request, module=None, dispatch=None, id=None):
     id_tag=modx_modules[module].id_attribute
 
     # Grab the XML corresponding to the request from course.xml
-    xml = content_parser.module_xml(content_parser.course_file(request.user), module, id_tag, id)
+    xml = courseware.content_parser.module_xml(content_parser.course_file(request.user), module, id_tag, id)
 
     # Create the module
     instance=modx_modules[module](xml, 

courseware/views.py

@@ -20,7 +20,7 @@ from lxml import etree
 from auth.models import UserProfile
 from models import StudentModule
 from module_render import * # TODO: Clean up
-import courseware.content_parser
+import courseware.content_parser as content_parser
 
 log = logging.getLogger("mitx.courseware")
 
@@ -63,7 +63,7 @@ def profile(request):
                                 correct=response.grade
                             else:
                                 correct=0
-                    total=courseware.modules.capa_module.LoncapaModule(etree.tostring(p), "id").max_score() # TODO: Add state. Not useful now, but maybe someday problems will have randomized max scores? 
+                    total=modules.capa_module.LoncapaModule(etree.tostring(p), "id").max_score() # TODO: Add state. Not useful now, but maybe someday problems will have randomized max scores? 
                     scores.append((int(correct),total))
                 score={'course':course,
                        'section':s.get("name"),