Skip to content

E
edx-platform
Commit 837e87e1 by Piotr Mitros
Options

Modules moved into their own directory 

--HG--
rename : courseware/capa_module.py => courseware/modules/capa_module.py
rename : courseware/html_module.py => courseware/modules/html_module.py
rename : courseware/schematic_module.py => courseware/modules/schematic_module.py
rename : courseware/video_module.py => courseware/modules/video_module.py
rename : courseware/x_module.py => courseware/modules/x_module.py
parent d410d829
Showing with 13 additions and 16 deletions
courseware/content_parser.py
......@@ -52,7 +52,8 @@ def xpath_remove(tree, path):
return tree
if __name__=='__main__':
print xpath('<html><problem name="Bob"></problem></html>', '/{search}/problem[@name="{name}"]', search='html', name="Bob")
print xpath('<html><problem name="Bob"></problem></html>', '/{search}/problem[@name="{name}"]',
search='html', name="Bob")
def item(l, default="", process=lambda x:x):
if len(l)==0:
......
courseware/module_render.py
......@@ -16,10 +16,10 @@ from django.http import Http404
import urllib
import capa_module
import video_module
import html_module
import schematic_module
import courseware.modules.capa_module
import courseware.modules.video_module
import courseware.modules.html_module
import courseware.modules.schematic_module
from models import StudentModule
......@@ -34,10 +34,11 @@ import sys
from lxml import etree
import uuid
modx_modules={'problem':capa_module.LoncapaModule,
'video':video_module.VideoModule,
'html':html_module.HtmlModule,
'schematic':schematic_module.SchematicModule}
## TODO: Add registration mechanism
modx_modules={'problem':courseware.modules.capa_module.LoncapaModule,
'video':courseware.modules.video_module.VideoModule,
'html':courseware.modules.html_module.HtmlModule,
'schematic':courseware.modules.schematic_module.SchematicModule}
def make_track_function(request):
def f(event_type, event):
......
courseware/capa_module.py → courseware/modules/capa_module.py
......@@ -2,14 +2,14 @@ import random, numpy, math, scipy, sys, StringIO, os, struct, json
from x_module import XModule
import sys
from capa.capa_problem import LoncapaProblem
from courseware.capa.capa_problem import LoncapaProblem
from django.http import Http404
import dateutil
import dateutil.parser
import datetime
import content_parser
import courseware.content_parser as content_parser
from lxml import etree
......
courseware/views.py
......@@ -13,11 +13,6 @@ import StringIO
from django.http import Http404
import urllib
import capa_module
import video_module
from models import StudentModule
import urllib
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment