Fix import paths to point to xmodule, remove old JS resource strings

common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

@@ -3,22 +3,22 @@ import logging
 from lxml import etree
 from lxml.html import rewrite_links
 
-from pkg_resources import resource_string
-
-from .capa_module import only_one, ComplexEncoder
-from .editing_module import EditingDescriptor
-from .html_checker import check_html
-from progress import Progress
-from .stringify import stringify_children
-from .x_module import XModule
-from .xml_module import XmlDescriptor
+
+from xmodule.capa_module import only_one, ComplexEncoder
+from xmodule.editing_module import EditingDescriptor
+from xmodule.html_checker import check_html
+
+from xmodule.progress import Progress
+from xmodule.stringify import stringify_children
+from xmodule.x_module import XModule
+from xmodule.xml_module import XmlDescriptor
 import self_assessment_module
 import open_ended_module
 from combined_open_ended_rubric import CombinedOpenEndedRubric, GRADER_TYPE_IMAGE_DICT, HUMAN_GRADER_TYPE, LEGEND_LIST
-from .stringify import stringify_children
+from xmodule.stringify import stringify_children
 import dateutil
 import dateutil.parser
-from timeparse import parse_timedelta
+from xmodule.timeparse import parse_timedelta
 
 log = logging.getLogger("mitx.courseware")
 
@@ -64,7 +64,7 @@ class CombinedOpenEndedV1Module():
         'save_assessment' -- Saves the student assessment (or external grader assessment)
         'save_post_assessment' -- saves a post assessment (hint, feedback on feedback, etc)
     ajax actions implemented by combined open ended module are:
-        'reset' -- resets the whole combined open ended module and returns to the first child module
+        'reset' -- resets the whole combined open ended module and returns to the first child moduleresource_string
         'next_problem' -- moves to the next child module
         'get_results' -- gets results from a given child module
 
@@ -81,14 +81,6 @@ class CombinedOpenEndedV1Module():
     INTERMEDIATE_DONE = 'intermediate_done'
     DONE = 'done'
 
-    js = {'coffee': [resource_string(__name__, 'js/src/combinedopenended/display.coffee'),
-                     resource_string(__name__, 'js/src/collapsible.coffee'),
-                     resource_string(__name__, 'js/src/javascript_loader.coffee'),
-                     ]}
-    js_module_name = "CombinedOpenEnded"
-
-    css = {'scss': [resource_string(__name__, 'css/combinedopenended/display.scss')]}
-
     def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, metadata = None, static_data = None, **kwargs):
 

common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py

@@ -10,13 +10,11 @@ import logging
 from lxml import etree
 import capa.xqueue_interface as xqueue_interface
 
-from pkg_resources import resource_string
-
-from .capa_module import  ComplexEncoder
-from .editing_module import EditingDescriptor
-from progress import Progress
-from .stringify import stringify_children
-from .xml_module import XmlDescriptor
+from xmodule.capa_module import  ComplexEncoder
+from xmodule.editing_module import EditingDescriptor
+from xmodule.progress import Progress
+from xmodule.stringify import stringify_children
+from xmodule.xml_module import XmlDescriptor
 from capa.util import *
 import openendedchild
 
@@ -679,9 +677,6 @@ class OpenEndedDescriptor(XmlDescriptor, EditingDescriptor):
     has_score = True
     template_dir_name = "openended"
 
-    js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
-    js_module_name = "HTMLEditingDescriptor"
-
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """

common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py

@@ -13,16 +13,14 @@ import hashlib
 import capa.xqueue_interface as xqueue_interface
 import re
 
-from pkg_resources import resource_string
-
-from .capa_module import only_one, ComplexEncoder
+from xmodule.capa_module import only_one, ComplexEncoder
 import open_ended_image_submission
-from .editing_module import EditingDescriptor
-from .html_checker import check_html
-from progress import Progress
-from .stringify import stringify_children
-from .xml_module import XmlDescriptor
-from xmodule.modulestore import Location
+from xmodule.editing_module import EditingDescriptor
+from xmodule.html_checker import check_html
+from xmodule.progress import Progress
+from xmodule.stringify import stringify_children
+from xmodule.xml_module import XmlDescriptor
+from xmodule.xmodule.modulestore import Location
 from capa.util import *
 
 from datetime import datetime

common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py

@@ -2,13 +2,11 @@ import json
 import logging
 from lxml import etree
 
-from pkg_resources import resource_string
-
-from .capa_module import  ComplexEncoder
-from .editing_module import EditingDescriptor
-from progress import Progress
-from .stringify import stringify_children
-from .xml_module import XmlDescriptor
+from xmodule.capa_module import  ComplexEncoder
+from xmodule.editing_module import EditingDescriptor
+from xmodule.progress import Progress
+from xmodule.stringify import stringify_children
+from xmodule.xml_module import XmlDescriptor
 import openendedchild
 
 from combined_open_ended_rubric import CombinedOpenEndedRubric
@@ -275,10 +273,6 @@ class SelfAssessmentDescriptor(XmlDescriptor, EditingDescriptor):
     has_score = True
     template_dir_name = "selfassessment"
 
-    js = {'coffee': [resource_string(__name__, 'js/src/html/edit.coffee')]}
-    js_module_name = "HTMLEditingDescriptor"
-    css = {'scss': [resource_string(__name__, 'css/editor/edit.scss'), resource_string(__name__, 'css/html/edit.scss')]}
-
     @classmethod
     def definition_from_xml(cls, xml_object, system):
         """