← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/tutorial/__init__.py

Don't shadow ivle.webapp.tutorial.rst (we were importing
ivle.webapp.tutorial.rst.rst into ivle.webapp.tutorial as rst).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/tutorial/__init__.py
42
42
from ivle.webapp.base.plugins import ViewPlugin
43
43
from ivle.webapp.media import MediaFileView
44
44
from ivle.webapp.errors import NotFound, Forbidden
45
 
from ivle.webapp.tutorial.rst import rst
 
45
from ivle.webapp.tutorial.rst import rst as rstfunc
46
46
from ivle.webapp.tutorial.service import AttemptsRESTView, \
47
47
                                        AttemptRESTView, ExerciseRESTView
48
48
 
367
367
    for elem in exercisedom.childNodes:
368
368
        if elem.nodeType == elem.ELEMENT_NODE:
369
369
            if elem.tagName == "desc":
370
 
                curctx['exercisedesc'] = genshi.XML(rst(innerXML(elem).strip()))
 
370
                curctx['exercisedesc'] = genshi.XML(
 
371
                                              rstfunc(innerXML(elem).strip()))
371
372
            if elem.tagName == "partial":
372
373
                curctx['exercisepartial'] = getTextData(elem) + '\n'
373
374
    curctx['exercisepartial_backup'] = curctx['exercisepartial']