Merge branch 'master' into drupal-new

2013-05-17 16:10:56 -04:00
parent 5268d982ce 036be2a692
commit de5b4d7d27
130 changed files with 4009 additions and 838 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
 :2e#
 .AppleDouble
 database.sqlite
-private-requirements.txt
+requirements/private.txt
 courseware/static/js/mathjax/*
 flushdb.sh
 build
--- a/73
+++ b/73
@@ -0,0 +1,73 @@
+Piotr Mitros <pmitros@edx.org>
+Kyle Fiedler <kyle@kylefiedler.com>
+Ernie Park <eipark@mit.edu>
+Bridger Maxwell <bridger@mit.edu>
+Lyla Fischer <lyla@edx.org>
+David Ormsbee <dave@edx.org>
+Chris Terman <cjt@edx.org>
+Reda Lemeden <reda@thoughtbot.com>
+Anant Agarwal <agarwal@edx.org>
+Jean-Michel Claus <jmc@edx.org>
+Calen Pennington <calen.pennington@gmail.com>
+JM Van Thong <jm@edx.org>
+Prem Sichanugrist <psichanugrist@thoughtbot.com>
+Isaac Chuang <ichuang@mit.edu>
+Galen Frechette <galen@thoughtbot.com>
+Edward Loveall <edward@edwardloveall.com>
+Matt Jankowski <mjankowski@thoughtbot.com>
+John Jarvis <jarv@edx.org>
+Victor Shnayder <victor@edx.org>
+Matthew Mongeau <halogenandtoast@gmail.com>
+Tony Kim <kimth@edx.org>
+Arjun Singh <arjun810@gmail.com>
+John Hess <mgojohn@gmail.com>
+Carlos Andrés Rocha <rocha@edx.org>
+Mike Chen <ccp0101@gmail.com>
+Rocky Duan <dementrock@gmail.com>
+Sidhanth Rao <sidhanth@mitx.mit.edu>
+Brittany Cheng <bcheng42@gmail.com>
+Dhaval Adjodah <dhaval@mit.edu>
+Tom Giannattasio <tom@mitx.mit.edu>
+Ibrahim Awwal <ibrahim.awwal@gmail.com>
+Sarina Canelake <sarina@edx.org>
+Mark L. Chang <mark.chang@gmail.com>
+Dean Dieker <ddieker@gmail.com>
+Tommy MacWilliam <tmacwilliam@cs.harvard.edu>
+Nate Hardison <natehardison@gmail.com>
+Chris Dodge <cdodge@edx.org>
+Kevin Chugh <kevinchugh@edx.org>
+Ned Batchelder <ned@nedbatchelder.com>
+Alexander Kryklia <kryklia@gmail.com>
+Vik Paruchuri <vik@edx.org>
+Louis Sobel <sobel@edx.org>
+Brian Wilson <brian@edx.org>
+Ashley Penney <apenney@edx.org>
+Don Mitchell <dmitchell@edx.org>
+Aaron Culich <aculich@edx.org>
+Brian Talbot <btalbot@edx.org>
+Jay Zoldak <jzoldak@edx.org>
+Valera Rozuvan <valera.rozuvan@gmail.com>
+Diana Huang <dkh@edx.org>
+Marco Morales <marcotuts@gmail.com>
+Christina Roberts <christina@edx.org>
+Robert Chirwa <robert@edx.org>
+Ed Zarecor <ed@edx.org>
+Deena Wang <thedeenawang@gmail.com>
+Jean Manuel-Nater <jnater@edx.org>
+Emily Zhang <1800.ehz.hang@gmail.com>
+Jennifer Akana <jaakana@gmail.com>
+Peter Baratta <peter.baratta@gmail.com>
+Julian Arni <julian@edx.org>
+Arthur Barrett <abarrett@edx.org>
+Vasyl Nakvasiuk <vaxxxa@gmail.com>
+Will Daly <will@edx.org>
+James Tauber <jtauber@jtauber.com>
+Greg Price <gprice@edx.org>
+Joe Blaylock <jrbl@stanford.edu>
+Sef Kloninger <sef@kloninger.com>
+Anto Stupak <s2pak.anton@gmail.com>
+David Adams <dcadams@stanford.edu>
+Steve Strassmann <straz@edx.org>
+Giulio Gratta <giulio@giuliogratta.com>
+David Baumgold <david@davidbaumgold.com>
+Jason Bau <jbau@stanford.edu>
--- a/cms/djangoapps/contentstore/tests/test_contentstore.py
+++ b/cms/djangoapps/contentstore/tests/test_contentstore.py
@@ -74,7 +74,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        self.client.login(username=uname, password=password)

    def check_edit_unit(self, test_course_name):
-        import_from_xml(modulestore(), 'common/test/data/', [test_course_name])
+        import_from_xml(modulestore('direct'), 'common/test/data/', [test_course_name])

        for descriptor in modulestore().get_items(Location(None, None, 'vertical', None, None)):
            print "Checking ", descriptor.location.url()
@@ -101,7 +101,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        Unfortunately, None = published for the revision field, so get_items() would return
        both draft and non-draft copies.
        '''
-        store = modulestore()
+        store = modulestore('direct')
        draft_store = modulestore('draft')
        import_from_xml(store, 'common/test/data/', ['simple'])

@@ -128,7 +128,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        module as 'own-metadata' when publishing. Also verifies the metadata inheritance is
        properly computed
        '''
-        store = modulestore()
+        store = modulestore('direct')
        draft_store = modulestore('draft')
        import_from_xml(store, 'common/test/data/', ['simple'])

@@ -186,7 +186,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        self.assertEqual(html_module.lms.graceperiod, new_graceperiod)

    def test_get_depth_with_drafts(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['simple'])
+        import_from_xml(modulestore('direct'), 'common/test/data/', ['simple'])

        course = modulestore('draft').get_item(
            Location(['i4x', 'edX', 'simple', 'course', '2012_Fall', None]),
@@ -221,17 +221,17 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        self.assertEqual(num_drafts, 1)

    def test_import_textbook_as_content_element(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
-
        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'])
+
        course = module_store.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))

        self.assertGreater(len(course.textbooks), 0)

    def test_static_tab_reordering(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
-
        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'])
+
        course = module_store.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))

        # reverse the ordering
@@ -253,10 +253,8 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        self.assertEqual(reverse_tabs, course_tabs)

    def test_import_polls(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
-
        module_store = modulestore('direct')
-        found = False
+        import_from_xml(module_store, 'common/test/data/', ['full'])

        items = module_store.get_items(['i4x', 'edX', 'full', 'poll_question', None, None])
        found = len(items) > 0
@@ -270,9 +268,8 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        self.assertGreater(err_cnt, 0)

    def test_delete(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
-
        direct_store = modulestore('direct')
+        import_from_xml(direct_store, 'common/test/data/', ['full'])

        sequential = direct_store.get_item(Location(['i4x', 'edX', 'full', 'sequential', 'Administrivia_and_Circuit_Elements', None]))

@@ -306,8 +303,9 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        This test case verifies that a course can use specialized override for about data, e.g. /about/Fall_2012/effort.html
        while there is a base definition in /about/effort.html
        '''
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'])
+
        effort = module_store.get_item(Location(['i4x', 'edX', 'full', 'about', 'effort', None]))
        self.assertEqual(effort.data, '6 hours')

@@ -316,9 +314,8 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        self.assertEqual(effort.data, 'TBD')

    def test_remove_hide_progress_tab(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
-
        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'])

        source_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
        course = module_store.get_item(source_location)
@@ -333,14 +330,14 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
            'display_name': 'Robot Super Course',
        }

-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'])

        resp = self.client.post(reverse('create_new_course'), course_data)
        self.assertEqual(resp.status_code, 200)
        data = parse_json(resp)
        self.assertEqual(data['id'], 'i4x://MITx/999/course/Robot_Super_Course')

-        module_store = modulestore('direct')
        content_store = contentstore()

        source_location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
@@ -365,9 +362,9 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        self.assertEqual(resp.status_code, 400)

    def test_delete_course(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
-
        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'])
+
        content_store = contentstore()

        location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')
@@ -523,8 +520,9 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
        self.assertContains(resp, '/c4x/edX/full/asset/handouts_schematic_tutorial.pdf')

    def test_prefetch_children(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'])
+
        location = CourseDescriptor.id_to_location('edX/full/6.002_Spring_2012')

        wrapper = MongoCollectionFindWrapper(module_store.collection.find)
@@ -736,7 +734,7 @@ class ContentStoreTest(ModuleStoreTestCase):
        Import and walk through some common URL endpoints. This just verifies non-500 and no other
        correct behavior, so it is not a deep test
        """
-        import_from_xml(modulestore(), 'common/test/data/', ['simple'])
+        import_from_xml(modulestore('direct'), 'common/test/data/', ['simple'])
        loc = Location(['i4x', 'edX', 'simple', 'course', '2012_Fall', None])
        resp = self.client.get(reverse('course_index',
                                       kwargs={'org': loc.org,
@@ -838,9 +836,11 @@ class ContentStoreTest(ModuleStoreTestCase):
                                json.dumps({'id': del_loc.url()}), "application/json")
        self.assertEqual(200, resp.status_code)

+
    def test_import_metadata_with_attempts_empty_string(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['simple'])
        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['simple'])
+
        did_load_item = False
        try:
            module_store.get_item(Location(['i4x', 'edX', 'simple', 'problem', 'ps01-simple', None]))
@@ -852,8 +852,9 @@ class ContentStoreTest(ModuleStoreTestCase):
        self.assertTrue(did_load_item)

    def test_forum_id_generation(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'])
+
        new_component_location = Location('i4x', 'edX', 'full', 'discussion', 'new_component')
        source_template_location = Location('i4x', 'edx', 'templates', 'discussion', 'Discussion_Tag')

@@ -865,9 +866,8 @@ class ContentStoreTest(ModuleStoreTestCase):
        self.assertNotEquals(new_discussion_item.discussion_id, '$$GUID$$')

    def test_update_modulestore_signal_did_fire(self):
-
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'])

        try:
            module_store.modulestore_update_signal = Signal(providing_args=['modulestore', 'course_id', 'location'])
@@ -891,9 +891,9 @@ class ContentStoreTest(ModuleStoreTestCase):
        self.assertTrue(self.got_signal)

    def test_metadata_inheritance(self):
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
-
        module_store = modulestore('direct')
+        import_from_xml(module_store, 'common/test/data/', ['full'])
+
        course = module_store.get_item(Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None]))

        verticals = module_store.get_items(['i4x', 'edX', 'full', 'vertical', None, None])
--- a/cms/djangoapps/contentstore/tests/test_course_settings.py
+++ b/cms/djangoapps/contentstore/tests/test_course_settings.py
@@ -17,7 +17,6 @@ from xmodule.modulestore.tests.factories import CourseFactory

 from models.settings.course_metadata import CourseMetadata
 from xmodule.modulestore.xml_importer import import_from_xml
-from xmodule.modulestore.django import modulestore
 from xmodule.fields import Date


@@ -256,7 +255,7 @@ class CourseMetadataEditingTest(CourseTestCase):
    def setUp(self):
        CourseTestCase.setUp(self)
        # add in the full class too
-        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+        import_from_xml(get_modulestore(self.course_location), 'common/test/data/', ['full'])
        self.fullcourse_location = Location(['i4x', 'edX', 'full', 'course', '6.002_Spring_2012', None])

    def test_fetch_initial_fields(self):
--- a/cms/djangoapps/contentstore/tests/test_item.py
+++ b/cms/djangoapps/contentstore/tests/test_item.py
@@ -0,0 +1,29 @@
+from contentstore.utils import get_modulestore, get_url_reverse
+from contentstore.tests.test_course_settings import CourseTestCase
+from xmodule.modulestore.tests.factories import CourseFactory
+from django.core.urlresolvers import reverse
+
+
+class DeleteItem(CourseTestCase):
+    def setUp(self):
+        """ Creates the test course with a static page in it. """
+        super(DeleteItem, self).setUp()
+        self.course = CourseFactory.create(org='mitX', number='333', display_name='Dummy Course')
+
+    def testDeleteStaticPage(self):
+        # Add static tab
+        data = {
+            'parent_location': 'i4x://mitX/333/course/Dummy_Course',
+            'template': 'i4x://edx/templates/static_tab/Empty'
+        }
+
+        resp = self.client.post(reverse('clone_item'), data)
+        self.assertEqual(resp.status_code, 200)
+
+        # Now delete it. There was a bug that the delete was failing (static tabs do not exist in draft modulestore).
+        resp = self.client.post(reverse('delete_item'), resp.content, "application/json")
+        self.assertEqual(resp.status_code, 200)
+
+
+
+
--- a/cms/djangoapps/contentstore/views/item.py
+++ b/cms/djangoapps/contentstore/views/item.py
@@ -113,7 +113,7 @@ def delete_item(request):
    delete_children = request.POST.get('delete_children', False)
    delete_all_versions = request.POST.get('delete_all_versions', False)

-    store = modulestore()
+    store = get_modulestore(item_location)

    item = store.get_item(item_location)

--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -48,7 +48,7 @@ MODULESTORE_OPTIONS = {

 MODULESTORE = {
    'default': {
-        'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore',
+        'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore',
        'OPTIONS': MODULESTORE_OPTIONS
    },
    'direct': {
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -801,7 +801,8 @@ hr.divide {
 }

 .tooltip {
-  @extend .t-copy-sub2;
+  @include font-size(12);
+  @include transition(opacity 0.1s ease-out);
  position: absolute;
  top: 0;
  left: 0;
@@ -811,10 +812,9 @@ hr.divide {
  background: rgba(0, 0, 0, 0.85);
  font-weight: normal;
  line-height: 26px;
-  color: #fff;
+  color: $white;
  pointer-events: none;
  opacity: 0;
-  @include transition(opacity 0.1s ease-out);

  &:after {
    content: '▾';
--- a/cms/static/sass/elements/_header.scss
+++ b/cms/static/sass/elements/_header.scss
@@ -106,13 +106,19 @@
    width: 1px;
  }

-  .course-org {
-    margin-right: ($baseline/4);
-  }
-
  .course-number, .course-org {
    @include font-size(12);
    display: inline-block;
+    max-width: 70px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    line-height: 1.3;
+  }
+
+  .course-org {
+    margin-right: ($baseline/4);
+    max-width: 140px;
  }

  .course-title {
@@ -132,7 +138,7 @@

 // specific elements - course nav
 .nav-course {
-  width: 285px;
+  width: 290px;
  margin-top: -($baseline/4);
  @include font-size(14);

--- a/common/.gitignore
+++ b/common/.gitignore
@@ -0,0 +1 @@
+jasmine_test_runner.html
--- a/common/djangoapps/util/views.py
+++ b/common/djangoapps/util/views.py
@@ -16,7 +16,7 @@ from mitxmako.shortcuts import render_to_response, render_to_string
 from urllib import urlencode
 import zendesk

-import capa.calc
+import calc
 import track.views


@@ -27,7 +27,7 @@ def calculate(request):
    ''' Calculator in footer of every page. '''
    equation = request.GET['equation']
    try:
-        result = capa.calc.evaluator({}, {}, equation)
+        result = calc.evaluator({}, {}, equation)
    except:
        event = {'error': map(str, sys.exc_info()),
                 'equation': equation}
--- a/common/lib/.gitignore
+++ b/common/lib/.gitignore
@@ -1 +0,0 @@
-*/jasmine_test_runner.html
--- a/common/lib/capa/capa/calc.py
+++ b/common/lib/capa/capa/calc.py
--- a/common/lib/calc/setup.py
+++ b/common/lib/calc/setup.py
@@ -0,0 +1,12 @@
+from setuptools import setup
+
+setup(
+    name="calc",
+    version="0.1",
+    py_modules=["calc"],
+    install_requires=[
+        "pyparsing==1.5.6",
+        "numpy",
+        "scipy"
+    ],
+)
--- a/common/lib/capa/capa/capa_problem.py
+++ b/common/lib/capa/capa/capa_problem.py
@@ -13,33 +13,19 @@ Main module which shows problems (of "capa" type).
 This is used by capa_module.
 '''

-from __future__ import division
-
 from datetime import datetime
 import logging
 import math
 import numpy
-import os
-import random
+import os.path
 import re
-import scipy
-import struct
 import sys

 from lxml import etree
 from xml.sax.saxutils import unescape
 from copy import deepcopy

-import chem
-import chem.miller
-import chem.chemcalc
-import chem.chemtools
-import verifiers
-import verifiers.draganddrop
-
-import calc
 from .correctmap import CorrectMap
-import eia
 import inputtypes
 import customrender
 from .util import contextualize_text, convert_files_to_filenames
@@ -47,6 +33,7 @@ import xqueue_interface

 # to be replaced with auto-registering
 import responsetypes
+import safe_exec

 # dict of tagname, Response Class -- this should come from auto-registering
 response_tag_dict = dict([(x.response_tag, x) for x in responsetypes.__all__])
@@ -63,17 +50,6 @@ html_transforms = {'problem': {'tag': 'div'},
                   "math": {'tag': 'span'},
                   }

-global_context = {'random': random,
-                  'numpy': numpy,
-                  'math': math,
-                  'scipy': scipy,
-                  'calc': calc,
-                  'eia': eia,
-                  'chemcalc': chem.chemcalc,
-                  'chemtools': chem.chemtools,
-                  'miller': chem.miller,
-                  'draganddrop': verifiers.draganddrop}
-
 # These should be removed from HTML output, including all subelements
 html_problem_semantics = ["codeparam", "responseparam", "answer", "script", "hintgroup", "openendedparam", "openendedrubric"]

@@ -96,7 +72,7 @@ class LoncapaProblem(object):

         - problem_text (string): xml defining the problem
         - id           (string): identifier for this problem; often a filename (no spaces)
-         - seed         (int): random number generator seed (int) 
+         - seed         (int): random number generator seed (int)
         - state        (dict): containing the following keys:
                                - 'seed' - (int) random number generator seed
                                - 'student_answers' - (dict) maps input id to the stored answer for that input
@@ -115,23 +91,20 @@ class LoncapaProblem(object):
        if self.system is None:
            raise Exception()

-        state = state if state else {}
+        state = state or {}

        # Set seed according to the following priority:
        #       1. Contained in problem's state
        #       2. Passed into capa_problem via constructor
-        #       3. Assign from the OS's random number generator
        self.seed = state.get('seed', seed)
-        if self.seed is None:
-            self.seed = struct.unpack('i', os.urandom(4))[0]
+        assert self.seed is not None, "Seed must be provided for LoncapaProblem."
+
        self.student_answers = state.get('student_answers', {})
        if 'correct_map' in state:
            self.correct_map.set_dict(state['correct_map'])
        self.done = state.get('done', False)
        self.input_state = state.get('input_state', {})

-
-
        # Convert startouttext and endouttext to proper <text></text>
        problem_text = re.sub("startouttext\s*/", "text", problem_text)
        problem_text = re.sub("endouttext\s*/", "/text", problem_text)
@@ -144,7 +117,7 @@ class LoncapaProblem(object):
        self._process_includes()

        # construct script processor context (eg for customresponse problems)
-        self.context = self._extract_context(self.tree, seed=self.seed)
+        self.context = self._extract_context(self.tree)

        # Pre-parse the XML tree: modifies it to add ID's and perform some in-place
        # transformations.  This also creates the dict (self.responders) of Response
@@ -440,18 +413,23 @@ class LoncapaProblem(object):
        path = []

        for dir in raw_path:
-
            if not dir:
                continue

            # path is an absolute path or a path relative to the data dir
            dir = os.path.join(self.system.filestore.root_path, dir)
+            # Check that we are within the filestore tree.
+            reldir = os.path.relpath(dir, self.system.filestore.root_path)
+            if ".." in reldir:
+                log.warning("Ignoring Python directory outside of course: %r" % dir)
+                continue
+
            abs_dir = os.path.normpath(dir)
            path.append(abs_dir)

        return path

-    def _extract_context(self, tree, seed=struct.unpack('i', os.urandom(4))[0]):  # private
+    def _extract_context(self, tree):
        '''
        Extract content of <script>...</script> from the problem.xml file, and exec it in the
        context of this problem.  Provides ability to randomize problems, and also set
@@ -459,55 +437,47 @@ class LoncapaProblem(object):

        Problem XML goes to Python execution context. Runs everything in script tags.
        '''
-        random.seed(self.seed)
-        # save global context in here also
-        context = {'global_context': global_context}
+        context = {}
+        context['seed'] = self.seed
+        all_code = ''

-        # initialize context to have stuff in global_context
-        context.update(global_context)
+        python_path = []

-        # put globals there also
-        context['__builtins__'] = globals()['__builtins__']
-
-        # pass instance of LoncapaProblem in
-        context['the_lcp'] = self
-        context['script_code'] = ''
-
-        self._execute_scripts(tree.findall('.//script'), context)
-
-        return context
-
-    def _execute_scripts(self, scripts, context):
-        '''
-        Executes scripts in the given context.
-        '''
-        original_path = sys.path
-
-        for script in scripts:
-            sys.path = original_path + self._extract_system_path(script)
+        for script in tree.findall('.//script'):

            stype = script.get('type')
-
            if stype:
                if 'javascript' in stype:
                    continue    # skip javascript
                if 'perl' in stype:
                    continue        # skip perl
            # TODO: evaluate only python
-            code = script.text
+
+            for d in self._extract_system_path(script):
+                if d not in python_path and os.path.exists(d):
+                    python_path.append(d)
+
            XMLESC = {"&apos;": "'", "&quot;": '"'}
-            code = unescape(code, XMLESC)
-            # store code source in context
-            context['script_code'] += code
+            code = unescape(script.text, XMLESC)
+            all_code += code
+
+        if all_code:
            try:
-                # use "context" for global context; thus defs in code are global within code
-                exec code in context, context
+                safe_exec.safe_exec(
+                    all_code,
+                    context,
+                    random_seed=self.seed,
+                    python_path=python_path,
+                    cache=self.system.cache,
+                )
            except Exception as err:
-                log.exception("Error while execing script code: " + code)
+                log.exception("Error while execing script code: " + all_code)
                msg = "Error while executing script code: %s" % str(err).replace('<', '&lt;')
                raise responsetypes.LoncapaProblemError(msg)
-            finally:
-                sys.path = original_path
+
+        # store code source in context
+        context['script_code'] = all_code
+        return context



--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -46,7 +46,7 @@ import sys
 import pyparsing

 from .registry import TagRegistry
-from capa.chem import chemcalc
+from chem import chemcalc
 import xqueue_interface
 from datetime import datetime

--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -23,6 +23,7 @@ import random
 import re
 import requests
 import subprocess
+import textwrap
 import traceback
 import xml.sax.saxutils as saxutils

@@ -30,17 +31,23 @@ from collections import namedtuple
 from shapely.geometry import Point, MultiPoint

 # specific library imports
-from .calc import evaluator, UndefinedVariable
-from .correctmap import CorrectMap
+from calc import evaluator, UndefinedVariable
+from . import correctmap
 from datetime import datetime
 from .util import *
 from lxml import etree
 from lxml.html.soupparser import fromstring as fromstring_bs     # uses Beautiful Soup!!! FIXME?
 import capa.xqueue_interface as xqueue_interface

+import safe_exec
+
 log = logging.getLogger(__name__)


+CorrectMap = correctmap.CorrectMap
+CORRECTMAP_PY = None
+
+
 #-----------------------------------------------------------------------------
 # Exceptions

@@ -252,20 +259,41 @@ class LoncapaResponse(object):

            # We may extend this in the future to add another argument which provides a
            # callback procedure to a social hint generation system.
-            if not hintfn in self.context:
-                msg = 'missing specified hint function %s in script context' % hintfn
-                msg += "\nSee XML source line %s" % getattr(
-                    self.xml, 'sourceline', '<unavailable>')
-                raise LoncapaProblemError(msg)
+
+            global CORRECTMAP_PY
+            if CORRECTMAP_PY is None:
+                # We need the CorrectMap code for hint functions. No, this is not great.
+                CORRECTMAP_PY = inspect.getsource(correctmap)
+
+            code = (
+                CORRECTMAP_PY + "\n" +
+                self.context['script_code'] + "\n" +
+                textwrap.dedent("""
+                    new_cmap = CorrectMap()
+                    new_cmap.set_dict(new_cmap_dict)
+                    old_cmap = CorrectMap()
+                    old_cmap.set_dict(old_cmap_dict)
+                    {hintfn}(answer_ids, student_answers, new_cmap, old_cmap)
+                    new_cmap_dict.update(new_cmap.get_dict())
+                    old_cmap_dict.update(old_cmap.get_dict())
+                    """).format(hintfn=hintfn)
+            )
+            globals_dict = {
+                'answer_ids': self.answer_ids,
+                'student_answers': student_answers,
+                'new_cmap_dict': new_cmap.get_dict(),
+                'old_cmap_dict': old_cmap.get_dict(),
+            }

            try:
-                self.context[hintfn](
-                    self.answer_ids, student_answers, new_cmap, old_cmap)
+                safe_exec.safe_exec(code, globals_dict)
            except Exception as err:
                msg = 'Error %s in evaluating hint function %s' % (err, hintfn)
                msg += "\nSee XML source line %s" % getattr(
                    self.xml, 'sourceline', '<unavailable>')
                raise ResponseError(msg)
+
+            new_cmap.set_dict(globals_dict['new_cmap_dict'])
            return

        # hint specified by conditions and text dependent on conditions (a-la Loncapa design)
@@ -475,6 +503,10 @@ class JavascriptResponse(LoncapaResponse):
        return tmp_env

    def call_node(self, args):
+        # Node.js code is un-sandboxed. If the XModuleSystem says we aren't
+        # allowed to run unsafe code, then stop now.
+        if not self.system.can_execute_unsafe_code():
+            raise LoncapaProblemError("Execution of unsafe Javascript code is not allowed.")

        subprocess_args = ["node"]
        subprocess_args.extend(args)
@@ -488,7 +520,7 @@ class JavascriptResponse(LoncapaResponse):
        output = self.call_node([generator_file,
                                 self.generator,
                                 json.dumps(self.generator_dependencies),
-                                 json.dumps(str(self.context['the_lcp'].seed)),
+                                 json.dumps(str(self.context['seed'])),
                                 json.dumps(self.params)]).strip()

        return json.loads(output)
@@ -660,15 +692,6 @@ class ChoiceResponse(LoncapaResponse):

 class MultipleChoiceResponse(LoncapaResponse):
    # TODO: handle direction and randomize
-    snippets = [{'snippet': '''<multiplechoiceresponse direction="vertical" randomize="yes">
-     <choicegroup type="MultipleChoice">
-        <choice location="random" correct="false"><span>`a+b`<br/></span></choice>
-        <choice location="random" correct="true"><span><math>a+b^2</math><br/></span></choice>
-        <choice location="random" correct="false"><math>a+b+c</math></choice>
-        <choice location="bottom" correct="false"><math>a+b+d</math></choice>
-     </choicegroup>
-    </multiplechoiceresponse>
-    '''}]

    response_tag = 'multiplechoiceresponse'
    max_inputfields = 1
@@ -754,14 +777,6 @@ class OptionResponse(LoncapaResponse):
    '''
    TODO: handle direction and randomize
    '''
-    snippets = [{'snippet': """<optionresponse direction="vertical" randomize="yes">
-        <optioninput options="('Up','Down')" correct="Up">
-          <text>The location of the sky</text>
-        </optioninput>
-        <optioninput options="('Up','Down')" correct="Down">
-          <text>The location of the earth</text>
-        </optioninput>
-    </optionresponse>"""}]

    response_tag = 'optionresponse'
    hint_tag = 'optionhint'
@@ -905,39 +920,6 @@ class CustomResponse(LoncapaResponse):
    Custom response.  The python code to be run should be in <answer>...</answer>
    or in a <script>...</script>
    '''
-    snippets = [{'snippet': r"""<customresponse>
-    <text>
-    <br/>
-    Suppose that \(I(t)\) rises from \(0\) to \(I_S\) at a time \(t_0 \neq 0\)
-    In the space provided below write an algebraic expression for \(I(t)\).
-    <br/>
-    <textline size="5" correct_answer="IS*u(t-t0)" />
-    </text>
-    <answer type="loncapa/python">
-    correct=['correct']
-    try:
-        r = str(submission[0])
-    except ValueError:
-        correct[0] ='incorrect'
-        r = '0'
-    if not(r=="IS*u(t-t0)"):
-        correct[0] ='incorrect'
-    </answer>
-    </customresponse>"""},
-                {'snippet': """<script type="loncapa/python"><![CDATA[
-
-def sympy_check2():
-  messages[0] = '%s:%s' % (submission[0],fromjs[0].replace('<','&lt;'))
-  #messages[0] = str(answers)
-  correct[0] = 'correct'
-
-]]>
-</script>
-
-  <customresponse cfn="sympy_check2" type="cs" expect="2.27E-39" dojs="math" size="30" answer="2.27E-39">
-    <textline size="40" dojs="math" />
-    <responseparam description="Numerical Tolerance" type="tolerance" default="0.00001" name="tol"/>
-  </customresponse>"""}]

    response_tag = 'customresponse'

@@ -972,14 +954,29 @@ def sympy_check2():
            cfn = xml.get('cfn')
            if cfn:
                log.debug("cfn = %s" % cfn)
-                if cfn in self.context:
-                    self.code = self.context[cfn]
-                else:
-                    msg = "%s: can't find cfn %s in context" % (
-                        unicode(self), cfn)
-                    msg += "\nSee XML source line %s" % getattr(self.xml, 'sourceline',
-                                                                '<unavailable>')
-                    raise LoncapaProblemError(msg)
+
+                # This is a bit twisty.  We used to grab the cfn function from
+                # the context, but now that we sandbox Python execution, we
+                # can't get functions from previous executions.  So we make an
+                # actual function that will re-execute the original script,
+                # and invoke the function with the data needed.
+                def make_check_function(script_code, cfn):
+                    def check_function(expect, ans, **kwargs):
+                        extra_args = "".join(", {0}={0}".format(k) for k in kwargs)
+                        code = (
+                            script_code + "\n" +
+                            "cfn_return = %s(expect, ans%s)\n" % (cfn, extra_args)
+                        )
+                        globals_dict = {
+                            'expect': expect,
+                            'ans': ans,
+                        }
+                        globals_dict.update(kwargs)
+                        safe_exec.safe_exec(code, globals_dict, cache=self.system.cache)
+                        return globals_dict['cfn_return']
+                    return check_function
+
+                self.code = make_check_function(self.context['script_code'], cfn)

        if not self.code:
            if answer is None:
@@ -1036,9 +1033,6 @@ def sympy_check2():
        # put these in the context of the check function evaluator
        # note that this doesn't help the "cfn" version - only the exec version
        self.context.update({
-            # our subtree
-            'xml': self.xml,
-
            # my ID
            'response_id': self.myid,

@@ -1075,65 +1069,63 @@ def sympy_check2():
        # pass self.system.debug to cfn
        self.context['debug'] = self.system.DEBUG

+        # Run the check function
+        self.execute_check_function(idset, submission)
+
+        # build map giving "correct"ness of the answer(s)
+        correct = self.context['correct']
+        messages = self.context['messages']
+        overall_message = self.clean_message_html(self.context['overall_message'])
+        correct_map = CorrectMap()
+        correct_map.set_overall_message(overall_message)
+
+        for k in range(len(idset)):
+            npoints = self.maxpoints[idset[k]] if correct[k] == 'correct' else 0
+            correct_map.set(idset[k], correct[k], msg=messages[k],
+                            npoints=npoints)
+        return correct_map
+
+    def execute_check_function(self, idset, submission):
        # exec the check function
        if isinstance(self.code, basestring):
            try:
-                exec self.code in self.context['global_context'], self.context
-                correct = self.context['correct']
-                messages = self.context['messages']
-                overall_message = self.context['overall_message']
-
+                safe_exec.safe_exec(self.code, self.context, cache=self.system.cache)
            except Exception as err:
                self._handle_exec_exception(err)

        else:
-            # self.code is not a string; assume its a function
+            # self.code is not a string; it's a function we created earlier.

            # this is an interface to the Tutor2 check functions
            fn = self.code
-            ret = None
+            answer_given = submission[0] if (len(idset) == 1) else submission
+            kwnames = self.xml.get("cfn_extra_args", "").split()
+            kwargs = {n:self.context.get(n) for n in kwnames}
            log.debug(" submission = %s" % submission)
            try:
-                answer_given = submission[0] if (
-                    len(idset) == 1) else submission
-                # handle variable number of arguments in check function, for backwards compatibility
-                # with various Tutor2 check functions
-                args = [self.expect, answer_given,
-                        student_answers, self.answer_ids[0]]
-                argspec = inspect.getargspec(fn)
-                nargs = len(argspec.args) - len(argspec.defaults or [])
-                kwargs = {}
-                for argname in argspec.args[nargs:]:
-                    kwargs[argname] = self.context[
-                        argname] if argname in self.context else None
-
-                log.debug('[customresponse] answer_given=%s' % answer_given)
-                log.debug('nargs=%d, args=%s, kwargs=%s' % (
-                    nargs, args, kwargs))
-
-                ret = fn(*args[:nargs], **kwargs)
-
+                ret = fn(self.expect, answer_given, **kwargs)
            except Exception as err:
                self._handle_exec_exception(err)
-
-            if type(ret) == dict:
-
+            log.debug(
+                "[courseware.capa.responsetypes.customresponse.get_score] ret = %s",
+                ret
+            )
+            if isinstance(ret, dict):
                # One kind of dictionary the check function can return has the
                # form {'ok': BOOLEAN, 'msg': STRING}
                # If there are multiple inputs, they all get marked
                # to the same correct/incorrect value
                if 'ok' in ret:
-                    correct = ['correct'] * len(idset) if ret[
-                        'ok'] else ['incorrect'] * len(idset)
+                    correct = ['correct' if ret['ok'] else 'incorrect'] * len(idset)
                    msg = ret.get('msg', None)
                    msg = self.clean_message_html(msg)

                    # If there is only one input, apply the message to that input
                    # Otherwise, apply the message to the whole problem
                    if len(idset) > 1:
-                        overall_message = msg
+                        self.context['overall_message'] = msg
                    else:
-                        messages[0] = msg
+                        self.context['messages'][0] = msg

                # Another kind of dictionary the check function can return has
                # the form:
@@ -1155,6 +1147,8 @@ def sympy_check2():
                        msg = (self.clean_message_html(input_dict['msg'])
                               if 'msg' in input_dict else None)
                        messages.append(msg)
+                    self.context['messages'] = messages
+                    self.context['overall_message'] = overall_message

                # Otherwise, we do not recognize the dictionary
                # Raise an exception
@@ -1163,25 +1157,10 @@ def sympy_check2():
                    raise ResponseError(
                        "CustomResponse: check function returned an invalid dict")

-            # The check function can return a boolean value,
-            # indicating whether all inputs should be marked
-            # correct or incorrect
            else:
-                n = len(idset)
-                correct = ['correct'] * n if ret else ['incorrect'] * n
+                correct = ['correct' if ret else 'incorrect'] * len(idset)

-        # build map giving "correct"ness of the answer(s)
-        correct_map = CorrectMap()
-
-        overall_message = self.clean_message_html(overall_message)
-        correct_map.set_overall_message(overall_message)
-
-        for k in range(len(idset)):
-            npoints = (self.maxpoints[idset[k]]
-                       if correct[k] == 'correct' else 0)
-            correct_map.set(idset[k], correct[k], msg=messages[k],
-                            npoints=npoints)
-        return correct_map
+            self.context['correct'] = correct

    def clean_message_html(self, msg):

@@ -1253,24 +1232,38 @@ class SymbolicResponse(CustomResponse):
    """
    Symbolic math response checking, using symmath library.
    """
-    snippets = [{'snippet': r'''<problem>
-      <text>Compute \[ \exp\left(-i \frac{\theta}{2} \left[ \begin{matrix} 0 & 1 \\ 1 & 0 \end{matrix} \right] \right) \]
-      and give the resulting \(2\times 2\) matrix: <br/>
-        <symbolicresponse answer="">
-          <textline size="40" math="1" />
-        </symbolicresponse>
-      <br/>
-      Your input should be typed in as a list of lists, eg <tt>[[1,2],[3,4]]</tt>.
-      </text>
-    </problem>'''}]

    response_tag = 'symbolicresponse'
+    max_inputfields = 1

    def setup_response(self):
+        # Symbolic response always uses symmath_check()
+        # If the XML did not specify this, then set it now
+        # Otherwise, we get an error from the superclass
        self.xml.set('cfn', 'symmath_check')
-        code = "from symmath import *"
-        exec code in self.context, self.context
-        CustomResponse.setup_response(self)
+
+        # Let CustomResponse do its setup
+        super(SymbolicResponse, self).setup_response()
+
+    def execute_check_function(self, idset, submission):
+        from symmath import symmath_check
+        try:
+            # Since we have limited max_inputfields to 1,
+            # we can assume that there is only one submission
+            answer_given = submission[0]
+
+            ret = symmath_check(
+                self.expect, answer_given,
+                dynamath=self.context.get('dynamath'),
+                options=self.context.get('options'),
+                debug=self.context.get('debug'),
+            )
+        except Exception as err:
+            log.error("oops in symbolicresponse (cfn) error %s" % err)
+            log.error(traceback.format_exc())
+            raise Exception("oops in symbolicresponse (cfn) error %s" % err)
+        self.context['messages'][0] = self.clean_message_html(ret['msg'])
+        self.context['correct'] = ['correct' if ret['ok'] else 'incorrect'] * len(idset)

 #-----------------------------------------------------------------------------

@@ -1325,10 +1318,8 @@ class CodeResponse(LoncapaResponse):
        # Check if XML uses the ExternalResponse format or the generic
        # CodeResponse format
        codeparam = self.xml.find('codeparam')
-        if codeparam is None:
-            self._parse_externalresponse_xml()
-        else:
-            self._parse_coderesponse_xml(codeparam)
+        assert codeparam is not None, "Unsupported old format! <coderesponse> without <codeparam>"
+        self._parse_coderesponse_xml(codeparam)

    def _parse_coderesponse_xml(self, codeparam):
        '''
@@ -1348,62 +1339,6 @@ class CodeResponse(LoncapaResponse):
        self.answer = find_with_default(codeparam, 'answer_display',
                                        'No answer provided.')

-    def _parse_externalresponse_xml(self):
-        '''
-        VS[compat]: Suppport for old ExternalResponse XML format. When successful, sets:
-            self.initial_display
-            self.answer (an answer to display to the student in the LMS)
-            self.payload
-        '''
-        answer = self.xml.find('answer')
-
-        if answer is not None:
-            answer_src = answer.get('src')
-            if answer_src is not None:
-                code = self.system.filesystem.open('src/' + answer_src).read()
-            else:
-                code = answer.text
-        else:  # no <answer> stanza; get code from <script>
-            code = self.context['script_code']
-            if not code:
-                msg = '%s: Missing answer script code for coderesponse' % unicode(
-                    self)
-                msg += "\nSee XML source line %s" % getattr(
-                    self.xml, 'sourceline', '<unavailable>')
-                raise LoncapaProblemError(msg)
-
-        tests = self.xml.get('tests')
-
-        # Extract 'answer' and 'initial_display' from XML. Note that the code to be exec'ed here is:
-        #   (1) Internal edX code, i.e. NOT student submissions, and
-        #   (2) The code should only define the strings 'initial_display', 'answer',
-        #           'preamble', 'test_program'
-        #           following the ExternalResponse XML format
-        penv = {}
-        penv['__builtins__'] = globals()['__builtins__']
-        try:
-            exec(code, penv, penv)
-        except Exception as err:
-            log.error(
-                'Error in CodeResponse %s: Error in problem reference code' % err)
-            raise Exception(err)
-        try:
-            self.answer = penv['answer']
-            self.initial_display = penv['initial_display']
-        except Exception as err:
-            log.error("Error in CodeResponse %s: Problem reference code does not define"
-                      " 'answer' and/or 'initial_display' in <answer>...</answer>" % err)
-            raise Exception(err)
-
-        # Finally, make the ExternalResponse input XML format conform to the generic
-        # exteral grader interface
-        #   The XML tagging of grader_payload is pyxserver-specific
-        grader_payload = '<pyxserver>'
-        grader_payload += '<tests>' + tests + '</tests>\n'
-        grader_payload += '<processor>' + code + '</processor>'
-        grader_payload += '</pyxserver>'
-        self.payload = {'grader_payload': grader_payload}
-
    def get_score(self, student_answers):
        try:
            # Note that submission can be a file
@@ -1583,44 +1518,6 @@ class ExternalResponse(LoncapaResponse):
    Typically used by coding problems.

    '''
-    snippets = [{'snippet': '''<externalresponse tests="repeat:10,generate">
-    <textbox rows="10" cols="70"  mode="python"/>
-    <answer><![CDATA[
-initial_display = """
-def inc(x):
-"""
-
-answer = """
-def inc(n):
-    return n+1
-"""
-preamble = """
-import sympy
-"""
-test_program = """
-import random
-
-def testInc(n = None):
-    if n is None:
-       n = random.randint(2, 20)
-    print 'Test is: inc(%d)'%n
-    return str(inc(n))
-
-def main():
-   f = os.fdopen(3,'w')
-   test = int(sys.argv[1])
-   rndlist = map(int,os.getenv('rndlist').split(','))
-   random.seed(rndlist[0])
-   if test == 1: f.write(testInc(0))
-   elif test == 2: f.write(testInc(1))
-   else:  f.write(testInc())
-   f.close()
-
-main()
-"""
-]]>
-    </answer>
-  </externalresponse>'''}]

    response_tag = 'externalresponse'
    allowed_inputfields = ['textline', 'textbox']
@@ -1766,23 +1663,6 @@ class FormulaResponse(LoncapaResponse):
    '''
    Checking of symbolic math response using numerical sampling.
    '''
-    snippets = [{'snippet': '''<problem>
-
-    <script type="loncapa/python">
-    I = "m*c^2"
-    </script>
-
-    <text>
-    <br/>
-    Give an equation for the relativistic energy of an object with mass m.
-    </text>
-    <formularesponse type="cs" samples="m,c@1,2:3,4#10" answer="$I">
-      <responseparam description="Numerical Tolerance" type="tolerance"
-                   default="0.00001" name="tol" />
-      <textline size="40" math="1" />
-    </formularesponse>
-
-    </problem>'''}]

    response_tag = 'formularesponse'
    hint_tag = 'formulahint'
@@ -1927,21 +1807,18 @@ class SchematicResponse(LoncapaResponse):
            self.code = answer.text

    def get_score(self, student_answers):
-        from capa_problem import global_context
-        submission = [json.loads(student_answers[
-                                 k]) for k in sorted(self.answer_ids)]
+        #from capa_problem import global_context
+        submission = [
+            json.loads(student_answers[k]) for k in sorted(self.answer_ids)
+        ]
        self.context.update({'submission': submission})
-
        try:
-            exec self.code in global_context, self.context
-
+            safe_exec.safe_exec(self.code, self.context, cache=self.system.cache)
        except Exception as err:
-            _, _, traceback_obj = sys.exc_info()
-            raise ResponseError, ResponseError(err.message), traceback_obj
-
+            msg = 'Error %s in evaluating SchematicResponse' % err
+            raise ResponseError(msg)
        cmap = CorrectMap()
-        cmap.set_dict(dict(zip(sorted(
-            self.answer_ids), self.context['correct'])))
+        cmap.set_dict(dict(zip(sorted(self.answer_ids), self.context['correct'])))
        return cmap

    def get_answers(self):
@@ -1977,19 +1854,6 @@ class ImageResponse(LoncapaResponse):
    Returns:
        True, if click is inside any region or rectangle. Otherwise False.
    """
-    snippets = [{'snippet': '''<imageresponse>
-      <imageinput src="image1.jpg" width="200" height="100"
-      rectangle="(10,10)-(20,30)" />
-      <imageinput src="image2.jpg" width="210" height="130"
-      rectangle="(12,12)-(40,60)" />
-      <imageinput src="image3.jpg" width="210" height="130"
-      rectangle="(10,10)-(20,30);(12,12)-(40,60)" />
-      <imageinput src="image4.jpg" width="811" height="610"
-      rectangle="(10,10)-(20,30);(12,12)-(40,60)"
-      regions="[[[10,10], [20,30], [40, 10]], [[100,100], [120,130], [110,150]]]"/>
-      <imageinput src="image5.jpg" width="200" height="200"
-      regions="[[[10,10], [20,30], [40, 10]], [[100,100], [120,130], [110,150]]]"/>
-    </imageresponse>'''}]

    response_tag = 'imageresponse'
    allowed_inputfields = ['imageinput']
--- a/common/lib/capa/capa/safe_exec/README.rst
+++ b/common/lib/capa/capa/safe_exec/README.rst
@@ -0,0 +1,51 @@
+Configuring Capa sandboxed execution
+====================================
+
+Capa problems can contain code authored by the course author.  We need to
+execute that code in a sandbox.  We use CodeJail as the sandboxing facility,
+but it needs to be configured specifically for Capa's use.
+
+As a developer, you don't have to do anything to configure sandboxing if you
+don't want to, and everything will operate properly, you just won't have
+protection on that code.
+
+If you want to configure sandboxing, you're going to use the `README from
+CodeJail`__, with a few customized tweaks.
+
+__ https://github.com/edx/codejail/blob/master/README.rst
+
+
+1. At the instruction to install packages into the sandboxed code, you'll 
+   need to install both `pre-sandbox-requirements.txt` and 
+   `sandbox-requirements.txt`::
+
+    $ sudo pip install -r pre-sandbox-requirements.txt
+    $ sudo pip install -r sandbox-requirements.txt
+
+2. At the instruction to create the AppArmor profile, you'll need a line in
+   the profile for the sandbox packages.  <EDXPLATFORM> is the full path to
+   your edx_platform repo::
+
+    <EDXPLATFORM>/common/lib/sandbox-packages/** r,
+
+3. You can configure resource limits in settings.py.  A CODE_JAIL setting is
+   available, a dictionary.  The "limits" key lets you adjust the limits for
+   CPU time, real time, and memory use.  Setting any of them to zero disables
+   that limit::
+
+    # in settings.py...
+    CODE_JAIL = {
+        # Configurable limits.
+        'limits': {
+            # How many CPU seconds can jailed code use?
+            'CPU': 1,
+            # How many real-time seconds will a sandbox survive?
+            'REALTIME': 1,
+            # How much memory (in bytes) can a sandbox use?
+            'VMEM': 30000000,
+        },
+    }
+
+
+That's it.  Once you've finished the CodeJail configuration instructions,
+your course-hosted Python code should be run securely.
--- a/common/lib/capa/capa/safe_exec/init.py
+++ b/common/lib/capa/capa/safe_exec/init.py
@@ -0,0 +1,3 @@
+"""Capa's specialized use of codejail.safe_exec."""
+
+from .safe_exec import safe_exec, update_hash
--- a/common/lib/capa/capa/safe_exec/lazymod.py
+++ b/common/lib/capa/capa/safe_exec/lazymod.py
@@ -0,0 +1,42 @@
+"""A module proxy for delayed importing of modules.
+
+From http://barnesc.blogspot.com/2006/06/automatic-python-imports-with-autoimp.html,
+in the public domain.
+
+"""
+
+import sys
+
+class LazyModule(object):
+    """A lazy module proxy."""
+
+    def __init__(self, modname):
+        self.__dict__['__name__'] = modname
+        self._set_mod(None)
+
+    def _set_mod(self, mod):
+        if mod is not None:
+            self.__dict__ = mod.__dict__
+        self.__dict__['_lazymod_mod'] = mod
+
+    def _load_mod(self):
+        __import__(self.__name__)
+        self._set_mod(sys.modules[self.__name__])
+
+    def __getattr__(self, name):
+        if self.__dict__['_lazymod_mod'] is None:
+            self._load_mod()
+
+        mod = self.__dict__['_lazymod_mod']
+
+        if hasattr(mod, name):
+            return getattr(mod, name)
+        else:
+            try:
+                subname = '%s.%s' % (self.__name__, name)
+                __import__(subname)
+                submod = getattr(mod, name)
+            except ImportError:
+                raise AttributeError("'module' object has no attribute %r" % name)
+            self.__dict__[name] = LazyModule(subname, submod)
+            return self.__dict__[name]
--- a/common/lib/capa/capa/safe_exec/safe_exec.py
+++ b/common/lib/capa/capa/safe_exec/safe_exec.py
@@ -0,0 +1,130 @@
+"""Capa's specialized use of codejail.safe_exec."""
+
+from codejail.safe_exec import safe_exec as codejail_safe_exec
+from codejail.safe_exec import json_safe, SafeExecException
+from . import lazymod
+from statsd import statsd
+
+import hashlib
+
+# Establish the Python environment for Capa.
+# Capa assumes float-friendly division always.
+# The name "random" is a properly-seeded stand-in for the random module.
+CODE_PROLOG = """\
+from __future__ import division
+
+import random as random_module
+import sys
+random = random_module.Random(%r)
+random.Random = random_module.Random
+del random_module
+sys.modules['random'] = random
+"""
+
+ASSUMED_IMPORTS=[
+    ("numpy", "numpy"),
+    ("math", "math"),
+    ("scipy", "scipy"),
+    ("calc", "calc"),
+    ("eia", "eia"),
+    ("chemcalc", "chem.chemcalc"),
+    ("chemtools", "chem.chemtools"),
+    ("miller", "chem.miller"),
+    ("draganddrop", "verifiers.draganddrop"),
+]
+
+# We'll need the code from lazymod.py for use in safe_exec, so read it now.
+lazymod_py_file = lazymod.__file__
+if lazymod_py_file.endswith("c"):
+    lazymod_py_file = lazymod_py_file[:-1]
+
+lazymod_py = open(lazymod_py_file).read()
+
+LAZY_IMPORTS = [lazymod_py]
+for name, modname in ASSUMED_IMPORTS:
+    LAZY_IMPORTS.append("{} = LazyModule('{}')\n".format(name, modname))
+
+LAZY_IMPORTS = "".join(LAZY_IMPORTS)
+
+
+def update_hash(hasher, obj):
+    """
+    Update a `hashlib` hasher with a nested object.
+
+    To properly cache nested structures, we need to compute a hash from the
+    entire structure, canonicalizing at every level.
+
+    `hasher`'s `.update()` method is called a number of times, touching all of
+    `obj` in the process.  Only primitive JSON-safe types are supported.
+
+    """
+    hasher.update(str(type(obj)))
+    if isinstance(obj, (tuple, list)):
+        for e in obj:
+            update_hash(hasher, e)
+    elif isinstance(obj, dict):
+        for k in sorted(obj):
+            update_hash(hasher, k)
+            update_hash(hasher, obj[k])
+    else:
+        hasher.update(repr(obj))
+
+
+@statsd.timed('capa.safe_exec.time')
+def safe_exec(code, globals_dict, random_seed=None, python_path=None, cache=None):
+    """
+    Execute python code safely.
+
+    `code` is the Python code to execute.  It has access to the globals in `globals_dict`,
+    and any changes it makes to those globals are visible in `globals_dict` when this
+    function returns.
+
+    `random_seed` will be used to see the `random` module available to the code.
+
+    `python_path` is a list of directories to add to the Python path before execution.
+
+    `cache` is an object with .get(key) and .set(key, value) methods.  It will be used
+    to cache the execution, taking into account the code, the values of the globals,
+    and the random seed.
+
+    """
+    # Check the cache for a previous result.
+    if cache:
+        safe_globals = json_safe(globals_dict)
+        md5er = hashlib.md5()
+        md5er.update(repr(code))
+        update_hash(md5er, safe_globals)
+        key = "safe_exec.%r.%s" % (random_seed, md5er.hexdigest())
+        cached = cache.get(key)
+        if cached is not None:
+            # We have a cached result.  The result is a pair: the exception
+            # message, if any, else None; and the resulting globals dictionary.
+            emsg, cleaned_results = cached
+            globals_dict.update(cleaned_results)
+            if emsg:
+                raise SafeExecException(emsg)
+            return
+
+    # Create the complete code we'll run.
+    code_prolog = CODE_PROLOG % random_seed
+
+    # Run the code!  Results are side effects in globals_dict.
+    try:
+        codejail_safe_exec(
+            code_prolog + LAZY_IMPORTS + code, globals_dict,
+            python_path=python_path,
+        )
+    except SafeExecException as e:
+        emsg = e.message
+    else:
+        emsg = None
+
+    # Put the result back in the cache.  This is complicated by the fact that
+    # the globals dict might not be entirely serializable.
+    if cache:
+        cleaned_results = json_safe(globals_dict)
+        cache.set(key, (emsg, cleaned_results))
+
+    # If an exception happened, raise it now.
+    if emsg:
+        raise e
--- a/common/lib/capa/capa/safe_exec/tests/test_files/pylib/constant.py
+++ b/common/lib/capa/capa/safe_exec/tests/test_files/pylib/constant.py
@@ -0,0 +1 @@
+THE_CONST = 23
--- a/common/lib/capa/capa/safe_exec/tests/test_lazymod.py
+++ b/common/lib/capa/capa/safe_exec/tests/test_lazymod.py
@@ -0,0 +1,44 @@
+"""Test lazymod.py"""
+
+import sys
+import unittest
+
+from capa.safe_exec.lazymod import LazyModule
+
+
+class ModuleIsolation(object):
+    """
+    Manage changes to sys.modules so that we can roll back imported modules.
+
+    Create this object, it will snapshot the currently imported modules. When
+    you call `clean_up()`, it will delete any module imported since its creation.
+    """
+    def __init__(self):
+        # Save all the names of all the imported modules.
+        self.mods = set(sys.modules)
+
+    def clean_up(self):
+        # Get a list of modules that didn't exist when we were created
+        new_mods = [m for m in sys.modules if m not in self.mods]
+        # and delete them all so another import will run code for real again.
+        for m in new_mods:
+            del sys.modules[m]
+
+
+class TestLazyMod(unittest.TestCase):
+
+    def setUp(self):
+        # Each test will remove modules that it imported.
+        self.addCleanup(ModuleIsolation().clean_up)
+
+    def test_simple(self):
+        # Import some stdlib module that has not been imported before
+        self.assertNotIn("colorsys", sys.modules)
+        colorsys = LazyModule("colorsys")
+        hsv = colorsys.rgb_to_hsv(.3, .4, .2)
+        self.assertEqual(hsv[0], 0.25)
+
+    def test_dotted(self):
+        self.assertNotIn("email.utils", sys.modules)
+        email_utils = LazyModule("email.utils")
+        self.assertEqual(email_utils.quote('"hi"'), r'\"hi\"')
--- a/common/lib/capa/capa/safe_exec/tests/test_safe_exec.py
+++ b/common/lib/capa/capa/safe_exec/tests/test_safe_exec.py
@@ -0,0 +1,281 @@
+"""Test safe_exec.py"""
+
+import hashlib
+import os.path
+import random
+import textwrap
+import unittest
+
+from capa.safe_exec import safe_exec, update_hash
+from codejail.safe_exec import SafeExecException
+
+
+class TestSafeExec(unittest.TestCase):
+    def test_set_values(self):
+        g = {}
+        safe_exec("a = 17", g)
+        self.assertEqual(g['a'], 17)
+
+    def test_division(self):
+        g = {}
+        # Future division: 1/2 is 0.5.
+        safe_exec("a = 1/2", g)
+        self.assertEqual(g['a'], 0.5)
+
+    def test_assumed_imports(self):
+        g = {}
+        # Math is always available.
+        safe_exec("a = int(math.pi)", g)
+        self.assertEqual(g['a'], 3)
+
+    def test_random_seeding(self):
+        g = {}
+        r = random.Random(17)
+        rnums = [r.randint(0, 999) for _ in xrange(100)]
+
+        # Without a seed, the results are unpredictable
+        safe_exec("rnums = [random.randint(0, 999) for _ in xrange(100)]", g)
+        self.assertNotEqual(g['rnums'], rnums)
+
+        # With a seed, the results are predictable
+        safe_exec("rnums = [random.randint(0, 999) for _ in xrange(100)]", g, random_seed=17)
+        self.assertEqual(g['rnums'], rnums)
+
+    def test_random_is_still_importable(self):
+        g = {}
+        r = random.Random(17)
+        rnums = [r.randint(0, 999) for _ in xrange(100)]
+
+        # With a seed, the results are predictable even from the random module
+        safe_exec(
+            "import random\n"
+            "rnums = [random.randint(0, 999) for _ in xrange(100)]\n",
+            g, random_seed=17)
+        self.assertEqual(g['rnums'], rnums)
+
+    def test_python_lib(self):
+        pylib = os.path.dirname(__file__) + "/test_files/pylib"
+        g = {}
+        safe_exec(
+            "import constant; a = constant.THE_CONST",
+            g, python_path=[pylib]
+        )
+
+    def test_raising_exceptions(self):
+        g = {}
+        with self.assertRaises(SafeExecException) as cm:
+            safe_exec("1/0", g)
+        self.assertIn("ZeroDivisionError", cm.exception.message)
+
+
+class DictCache(object):
+    """A cache implementation over a simple dict, for testing."""
+
+    def __init__(self, d):
+        self.cache = d
+
+    def get(self, key):
+        # Actual cache implementations have limits on key length
+        assert len(key) <= 250
+        return self.cache.get(key)
+
+    def set(self, key, value):
+        # Actual cache implementations have limits on key length
+        assert len(key) <= 250
+        self.cache[key] = value
+
+
+class TestSafeExecCaching(unittest.TestCase):
+    """Test that caching works on safe_exec."""
+
+    def test_cache_miss_then_hit(self):
+        g = {}
+        cache = {}
+
+        # Cache miss
+        safe_exec("a = int(math.pi)", g, cache=DictCache(cache))
+        self.assertEqual(g['a'], 3)
+        # A result has been cached
+        self.assertEqual(cache.values()[0], (None, {'a': 3}))
+
+        # Fiddle with the cache, then try it again.
+        cache[cache.keys()[0]] = (None, {'a': 17})
+
+        g = {}
+        safe_exec("a = int(math.pi)", g, cache=DictCache(cache))
+        self.assertEqual(g['a'], 17)
+
+    def test_cache_large_code_chunk(self):
+        # Caching used to die on memcache with more than 250 bytes of code.
+        # Check that it doesn't any more.
+        code = "a = 0\n" + ("a += 1\n" * 12345)
+
+        g = {}
+        cache = {}
+        safe_exec(code, g, cache=DictCache(cache))
+        self.assertEqual(g['a'], 12345)
+
+    def test_cache_exceptions(self):
+        # Used to be that running code that raised an exception didn't cache
+        # the result.  Check that now it does.
+        code = "1/0"
+        g = {}
+        cache = {}
+        with self.assertRaises(SafeExecException):
+            safe_exec(code, g, cache=DictCache(cache))
+
+        # The exception should be in the cache now.
+        self.assertEqual(len(cache), 1)
+        cache_exc_msg, cache_globals = cache.values()[0]
+        self.assertIn("ZeroDivisionError", cache_exc_msg)
+
+        # Change the value stored in the cache, the result should change.
+        cache[cache.keys()[0]] = ("Hey there!", {})
+
+        with self.assertRaises(SafeExecException):
+            safe_exec(code, g, cache=DictCache(cache))
+
+        self.assertEqual(len(cache), 1)
+        cache_exc_msg, cache_globals = cache.values()[0]
+        self.assertEqual("Hey there!", cache_exc_msg)
+
+        # Change it again, now no exception!
+        cache[cache.keys()[0]] = (None, {'a': 17})
+        safe_exec(code, g, cache=DictCache(cache))
+        self.assertEqual(g['a'], 17)
+
+    def test_unicode_submission(self):
+        # Check that using non-ASCII unicode does not raise an encoding error.
+        # Try several non-ASCII unicode characters
+        for code in [129, 500, 2**8 - 1, 2**16 - 1]:
+            code_with_unichr = unicode("# ") + unichr(code)
+            try:
+                safe_exec(code_with_unichr, {}, cache=DictCache({}))
+            except UnicodeEncodeError:
+                self.fail("Tried executing code with non-ASCII unicode: {0}".format(code))
+
+
+class TestUpdateHash(unittest.TestCase):
+    """Test the safe_exec.update_hash function to be sure it canonicalizes properly."""
+
+    def hash_obj(self, obj):
+        """Return the md5 hash that `update_hash` makes us."""
+        md5er = hashlib.md5()
+        update_hash(md5er, obj)
+        return md5er.hexdigest()
+
+    def equal_but_different_dicts(self):
+        """
+        Make two equal dicts with different key order.
+
+        Simple literals won't do it.  Filling one and then shrinking it will
+        make them different.
+
+        """
+        d1 = {k:1 for k in "abcdefghijklmnopqrstuvwxyz"}
+        d2 = dict(d1)
+        for i in xrange(10000):
+            d2[i] = 1
+        for i in xrange(10000):
+            del d2[i]
+
+        # Check that our dicts are equal, but with different key order.
+        self.assertEqual(d1, d2)
+        self.assertNotEqual(d1.keys(), d2.keys())
+
+        return d1, d2
+
+    def test_simple_cases(self):
+        h1 = self.hash_obj(1)
+        h10 = self.hash_obj(10)
+        hs1 = self.hash_obj("1")
+
+        self.assertNotEqual(h1, h10)
+        self.assertNotEqual(h1, hs1)
+
+    def test_list_ordering(self):
+        h1 = self.hash_obj({'a': [1,2,3]})
+        h2 = self.hash_obj({'a': [3,2,1]})
+        self.assertNotEqual(h1, h2)
+
+    def test_dict_ordering(self):
+        d1, d2 = self.equal_but_different_dicts()
+        h1 = self.hash_obj(d1)
+        h2 = self.hash_obj(d2)
+        self.assertEqual(h1, h2)
+
+    def test_deep_ordering(self):
+        d1, d2 = self.equal_but_different_dicts()
+        o1 = {'a':[1, 2, [d1], 3, 4]}
+        o2 = {'a':[1, 2, [d2], 3, 4]}
+        h1 = self.hash_obj(o1)
+        h2 = self.hash_obj(o2)
+        self.assertEqual(h1, h2)
+
+
+class TestRealProblems(unittest.TestCase):
+    def test_802x(self):
+        code = textwrap.dedent("""\
+            import math
+            import random
+            import numpy
+            e=1.602e-19 #C
+            me=9.1e-31  #kg
+            mp=1.672e-27 #kg
+            eps0=8.854e-12 #SI units
+            mu0=4e-7*math.pi #SI units
+
+            Rd1=random.randrange(1,30,1)
+            Rd2=random.randrange(30,50,1)
+            Rd3=random.randrange(50,70,1)
+            Rd4=random.randrange(70,100,1)
+            Rd5=random.randrange(100,120,1)
+
+            Vd1=random.randrange(1,20,1)
+            Vd2=random.randrange(20,40,1)
+            Vd3=random.randrange(40,60,1)
+
+            #R=[0,10,30,50,70,100] #Ohm
+            #V=[0,12,24,36] # Volt
+
+            R=[0,Rd1,Rd2,Rd3,Rd4,Rd5] #Ohms
+            V=[0,Vd1,Vd2,Vd3] #Volts
+            #here the currents IL and IR are defined as in figure ps3_p3_fig2
+            a=numpy.array([  [  R[1]+R[4]+R[5],R[4] ],[R[4], R[2]+R[3]+R[4] ] ])
+            b=numpy.array([V[1]-V[2],-V[3]-V[2]])
+            x=numpy.linalg.solve(a,b)
+            IL='%.2e' % x[0]
+            IR='%.2e' % x[1]
+            ILR='%.2e' % (x[0]+x[1])
+            def sign(x):
+                return abs(x)/x
+
+            RW="Rightwards"
+            LW="Leftwards"
+            UW="Upwards"
+            DW="Downwards"
+            I1='%.2e' % abs(x[0])
+            I1d=LW if sign(x[0])==1 else RW
+            I1not=LW if I1d==RW else RW
+            I2='%.2e' % abs(x[1])
+            I2d=RW if sign(x[1])==1 else LW
+            I2not=LW if I2d==RW else RW
+            I3='%.2e' % abs(x[1])
+            I3d=DW if sign(x[1])==1 else UW
+            I3not=DW if I3d==UW else UW
+            I4='%.2e' % abs(x[0]+x[1])
+            I4d=UW if sign(x[1]+x[0])==1 else DW
+            I4not=DW if I4d==UW else UW
+            I5='%.2e' % abs(x[0])
+            I5d=RW if sign(x[0])==1 else LW
+            I5not=LW if I5d==RW else RW
+            VAP=-x[0]*R[1]-(x[0]+x[1])*R[4]
+            VPN=-V[2]
+            VGD=+V[1]-x[0]*R[1]+V[3]+x[1]*R[2]
+            aVAP='%.2e' % VAP
+            aVPN='%.2e' % VPN
+            aVGD='%.2e' % VGD
+            """)
+        g = {}
+        safe_exec(code, g)
+        self.assertIn("aVAP", g)
--- a/common/lib/capa/capa/tests/init.py
+++ b/common/lib/capa/capa/tests/init.py
@@ -1,7 +1,7 @@
-import fs
 import fs.osfs
-import os
+import os, os.path

+from capa.capa_problem import LoncapaProblem
 from mock import Mock, MagicMock

 import xml.sax.saxutils as saxutils
@@ -22,16 +22,28 @@ def calledback_url(dispatch = 'score_update'):
 xqueue_interface = MagicMock()
 xqueue_interface.send_to_queue.return_value = (0, 'Success!')

-test_system = Mock(
-    ajax_url='courses/course_id/modx/a_location',
-    track_function=Mock(),
-    get_module=Mock(),
-    render_template=tst_render_template,
-    replace_urls=Mock(),
-    user=Mock(),
-    filestore=fs.osfs.OSFS(os.path.join(TEST_DIR, "test_files")),
-    debug=True,
-    xqueue={'interface': xqueue_interface, 'construct_callback': calledback_url, 'default_queuename': 'testqueue', 'waittime': 10},
-    node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
-    anonymous_student_id='student'
-)
+def test_system():
+    """
+    Construct a mock ModuleSystem instance.
+
+    """
+    the_system = Mock(
+        ajax_url='courses/course_id/modx/a_location',
+        track_function=Mock(),
+        get_module=Mock(),
+        render_template=tst_render_template,
+        replace_urls=Mock(),
+        user=Mock(),
+        filestore=fs.osfs.OSFS(os.path.join(TEST_DIR, "test_files")),
+        debug=True,
+        xqueue={'interface': xqueue_interface, 'construct_callback': calledback_url, 'default_queuename': 'testqueue', 'waittime': 10},
+        node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"),
+        anonymous_student_id='student',
+        cache=None,
+        can_execute_unsafe_code=lambda: False,
+    )
+    return the_system
+
+def new_loncapa_problem(xml, system=None):
+    """Construct a `LoncapaProblem` suitable for unit tests."""
+    return LoncapaProblem(xml, id='1', seed=723, system=system or test_system())
--- a/common/lib/capa/capa/tests/response_xml_factory.py
+++ b/common/lib/capa/capa/tests/response_xml_factory.py
@@ -221,6 +221,8 @@ class CustomResponseXMLFactory(ResponseXMLFactory):
        cfn = kwargs.get('cfn', None)
        expect = kwargs.get('expect', None)
        answer = kwargs.get('answer', None)
+        options = kwargs.get('options', None)
+        cfn_extra_args = kwargs.get('cfn_extra_args', None)

        # Create the response element
        response_element = etree.Element("customresponse")
@@ -235,6 +237,33 @@ class CustomResponseXMLFactory(ResponseXMLFactory):
            answer_element = etree.SubElement(response_element, "answer")
            answer_element.text = str(answer)

+        if options:
+            response_element.set('options', str(options))
+
+        if cfn_extra_args:
+            response_element.set('cfn_extra_args', str(cfn_extra_args))
+
+        return response_element
+
+    def create_input_element(self, **kwargs):
+        return ResponseXMLFactory.textline_input_xml(**kwargs)
+
+
+class SymbolicResponseXMLFactory(ResponseXMLFactory):
+    """ Factory for creating <symbolicresponse> XML trees """
+
+    def create_response_element(self, **kwargs):
+        cfn = kwargs.get('cfn', None)
+        answer = kwargs.get('answer', None)
+        options = kwargs.get('options', None)
+
+        response_element = etree.Element("symbolicresponse")
+        if cfn:
+            response_element.set('cfn', str(cfn))
+        if answer:
+            response_element.set('answer', str(answer))
+        if options:
+            response_element.set('options', str(options))
        return response_element

    def create_input_element(self, **kwargs):
@@ -638,12 +667,16 @@ class StringResponseXMLFactory(ResponseXMLFactory):
                Where *hint_prompt* is the string for which we show the hint,
                *hint_name* is an internal identifier for the hint,
                and *hint_text* is the text we show for the hint.
+
+            *hintfn*: The name of a function in the script to use for hints.
+
        """
        # Retrieve the **kwargs
        answer = kwargs.get("answer", None)
        case_sensitive = kwargs.get("case_sensitive", True)
        hint_list = kwargs.get('hints', None)
-        assert(answer)
+        hint_fn = kwargs.get('hintfn', None)
+        assert answer

        # Create the <stringresponse> element
        response_element = etree.Element("stringresponse")
@@ -655,18 +688,24 @@ class StringResponseXMLFactory(ResponseXMLFactory):
        response_element.set("type", "cs" if case_sensitive else "ci")

        # Add the hints if specified
-        if hint_list:
+        if hint_list or hint_fn:
            hintgroup_element = etree.SubElement(response_element, "hintgroup")
-            for (hint_prompt, hint_name, hint_text) in hint_list:
-                stringhint_element = etree.SubElement(hintgroup_element, "stringhint")
-                stringhint_element.set("answer", str(hint_prompt))
-                stringhint_element.set("name", str(hint_name))
+            if hint_list:
+                assert not hint_fn
+                for (hint_prompt, hint_name, hint_text) in hint_list:
+                    stringhint_element = etree.SubElement(hintgroup_element, "stringhint")
+                    stringhint_element.set("answer", str(hint_prompt))
+                    stringhint_element.set("name", str(hint_name))

-                hintpart_element = etree.SubElement(hintgroup_element, "hintpart")
-                hintpart_element.set("on", str(hint_name))
+                    hintpart_element = etree.SubElement(hintgroup_element, "hintpart")
+                    hintpart_element.set("on", str(hint_name))

-                hint_text_element = etree.SubElement(hintpart_element, "text")
-                hint_text_element.text = str(hint_text)
+                    hint_text_element = etree.SubElement(hintpart_element, "text")
+                    hint_text_element.text = str(hint_text)
+
+            if hint_fn:
+                assert not hint_list
+                hintgroup_element.set("hintfn", hint_fn)

        return response_element

@@ -705,3 +744,38 @@ class AnnotationResponseXMLFactory(ResponseXMLFactory):
            option_element.text = description

        return input_element
+
+
+class SymbolicResponseXMLFactory(ResponseXMLFactory):
+    """ Factory for producing <symbolicresponse> xml """
+
+    def create_response_element(self, **kwargs):
+        """ Build the <symbolicresponse> XML element.
+
+        Uses **kwargs:
+
+        *expect*: The correct answer (a sympy string)
+
+        *options*: list of option strings to pass to symmath_check
+            (e.g. 'matrix', 'qbit', 'imaginary', 'numerical')"""
+
+        # Retrieve **kwargs
+        expect = kwargs.get('expect', '')
+        options = kwargs.get('options', [])
+
+        # Symmath check expects a string of options
+        options_str = ",".join(options)
+
+        # Construct the <symbolicresponse> element
+        response_element = etree.Element('symbolicresponse')
+
+        if expect:
+            response_element.set('expect', str(expect))
+
+        if options_str:
+            response_element.set('options', str(options_str))
+
+        return response_element
+
+    def create_input_element(self, **kwargs):
+        return ResponseXMLFactory.textline_input_xml(**kwargs)
--- a/common/lib/capa/capa/tests/test_customrender.py
+++ b/common/lib/capa/capa/tests/test_customrender.py
@@ -26,7 +26,7 @@ class HelperTest(unittest.TestCase):
    Make sure that our helper function works!
    '''
    def check(self, d):
-        xml = etree.XML(test_system.render_template('blah', d))
+        xml = etree.XML(test_system().render_template('blah', d))
        self.assertEqual(d, extract_context(xml))

    def test_extract_context(self):
@@ -46,11 +46,11 @@ class SolutionRenderTest(unittest.TestCase):
        xml_str = """<solution id="solution_12">{s}</solution>""".format(s=solution)
        element = etree.fromstring(xml_str)

-        renderer = lookup_tag('solution')(test_system, element)
+        renderer = lookup_tag('solution')(test_system(), element)

        self.assertEqual(renderer.id, 'solution_12')

-        # our test_system "renders" templates to a div with the repr of the context
+        # Our test_system "renders" templates to a div with the repr of the context.
        xml = renderer.get_html()
        context = extract_context(xml)
        self.assertEqual(context, {'id': 'solution_12'})
@@ -65,7 +65,7 @@ class MathRenderTest(unittest.TestCase):
        xml_str = """<math>{tex}</math>""".format(tex=latex_in)
        element = etree.fromstring(xml_str)

-        renderer = lookup_tag('math')(test_system, element)
+        renderer = lookup_tag('math')(test_system(), element)

        self.assertEqual(renderer.mathstr, mathjax_out)

--- a/common/lib/capa/capa/tests/test_files/snuggletex_correct.html
+++ b/common/lib/capa/capa/tests/test_files/snuggletex_correct.html
@@ -0,0 +1,480 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+   <head>
+      <meta content="application/xhtml+xml; charset=UTF-8" http-equiv="Content-Type" />
+      <meta content="SnuggleTeX" name="Generator" />
+      <meta content="SnuggleTeX Documentation" name="description" />
+      <meta content="David McKain" name="author" />
+      <meta content="The University of Edinburgh" name="publisher" />
+      <link href="/snuggletex-webapp-1.2.2/includes/core.css" rel="stylesheet" />
+      <link href="/snuggletex-webapp-1.2.2/includes/webapp.css" rel="stylesheet" />
+      <link href="/snuggletex-webapp-1.2.2/includes/snuggletex.css" rel="stylesheet" />
+      <link href="/snuggletex-webapp-1.2.2/includes/jquery-ui-1.7.2.custom.css"
+            rel="stylesheet" /><script src="/snuggletex-webapp-1.2.2/includes/jquery.js" type="text/javascript"></script><script src="/snuggletex-webapp-1.2.2/includes/jquery-ui-1.7.2.custom.js"
+              type="text/javascript"></script><script src="/snuggletex-webapp-1.2.2/includes/webapp.js" type="text/javascript"></script><title>SnuggleTeX - ASCIIMathML Enrichment Demo</title><script src="/snuggletex-webapp-1.2.2/includes/ASCIIMathML.js" type="text/javascript"></script><script src="/snuggletex-webapp-1.2.2/includes/ASCIIMathMLwidget.js"
+              type="text/javascript"></script></head>
+   <body id="asciiMathMLUpConversionDemo">
+      <table border="0" cellpadding="0" cellspacing="0" id="header" width="100%">
+         <tr>
+            <td align="left" id="logo" valign="top"><a class="headertext" href="http://www.ed.ac.uk"><img alt="The University of Edinburgh" height="84"
+                       src="/snuggletex-webapp-1.2.2/includes/uoe_logo.jpg"
+                       width="84" /></a></td>
+            <td align="left">
+               <h3>THE UNIVERSITY of EDINBURGH</h3>
+               <h1>SCHOOL OF PHYSICS AND ASTRONOMY</h1>
+            </td>
+         </tr>
+      </table>
+      <h1 id="location"><a href="/snuggletex-webapp-1.2.2">SnuggleTeX (1.2.2)</a></h1>
+      <div id="content">
+         <div id="skipnavigation"><a href="#maincontent">Skip Navigation</a></div>
+         <div id="navigation">
+            <div id="navinner">
+               <h2>About SnuggleTeX</h2>
+               <ul>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/overview-and-features.html">Overview &amp; Features</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/use-cases.html">Why Use SnuggleTeX?</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/license.html">License</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/release-notes.html">Release Notes</a></li>
+               </ul>
+               <h2>Demos &amp; Samples</h2>
+               <ul>
+                  <li><a href="/snuggletex-webapp-1.2.2/MathInputDemo">Simple Math Input Demo</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/FullLaTeXInputDemo">Full LaTeX Input Demo</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/UpConversionDemo">MathML Semantic Enrichment Demo</a></li>
+                  <li><a class="selected" href="/snuggletex-webapp-1.2.2/ASCIIMathMLUpConversionDemo">ASCIIMathML Enrichment Demo</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/web-output-samples.html">Web Output Samples</a></li>
+               </ul>
+               <h2>User Guide</h2>
+               <ul>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/getting-snuggletex.html">Getting SnuggleTeX</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/software-requirements.html">Software Requirements</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/your-classpath.html">Setting up Your ClassPath</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/examples.html">Examples</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/basic-usage.html">Basic Usage</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/inputs.html">Parsing LaTeX Inputs</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/xml-or-dom-output.html">Creating XML String or DOM Outputs</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/web-output.html">Creating Web Pages</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/error-reporting.html">Error Reporting</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/supported-latex.html">Supported LaTeX</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/advanced-usage.html">Advanced Usage</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/semantic-enrichment.html">Semantic Enrichment</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/migrating-from-older-versions.html">Migrating from older versions</a></li>
+                  <li><a href="http://snuggletex.sourceforge.net/maven/apidocs/index.html">API Documentation<span class="extlink"> </span></a></li>
+                  <li><a href="http://snuggletex.sourceforge.net/maven/xref/index.html">Source Code Cross-Reference<span class="extlink"> </span></a></li>
+               </ul>
+               <h2>SnuggleTeX Project Links</h2>
+               <ul>
+                  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=221375">Download from SourceForge.net<span class="extlink"> </span></a></li>
+                  <li><a href="http://sourceforge.net/projects/snuggletex/">SnuggleTeX on SourceForge.net<span class="extlink"> </span></a></li>
+                  <li><a href="http://snuggletex.sourceforge.net/maven/">SnuggleTeX Maven Developer Reports<span class="extlink"> </span></a></li>
+                  <li><a href="https://www.wiki.ed.ac.uk/display/Physics/SnuggleTeX">SnuggleTeX Wiki<span class="extlink"> </span></a></li>
+               </ul>
+            </div>
+         </div>
+         <div id="maincontent">
+            <div id="popup"></div>
+            <div id="maininner">
+               <h2>ASCIIMathML Enrichment Demo</h2>
+               <h3>Input</h3>
+               <p>
+                  This demo is similar to the
+                  <a href="/snuggletex-webapp-1.2.2/UpConversionDemo">MathML Semantic Enrichnment Demo</a>
+                  but uses
+                  <a href="http://www1.chapman.edu/~jipsen/asciimath.html">ASCIIMathML</a> as
+                  an alternative input format, which provides real-time feedback as you
+                  type but can often generate MathML with odd semantics in it.
+                  SnuggleTeX includes some functionality that can to convert this raw MathML into
+                  something equivalent to its own MathML output, thereby allowing you to
+                  <a href="/snuggletex-webapp-1.2.2/documentation/semantic-enrichment.html">semantically enrich</a> it in
+                  certain simple cases, making ASCIIMathML a possibly viable input format
+                  for simple semantic maths.
+                  
+               </p>
+               <p>
+                  To try the demo, simply enter some some ASCIIMathML into the box below.
+                  You should see a real time preview of this while you type.
+                  Then hit <tt>Go!</tt> to use SnuggleTeX to semantically enrich your
+                  input.
+                  
+               </p>
+               <form action="/snuggletex-webapp-1.2.2/ASCIIMathMLUpConversionDemo" class="input"
+                     method="post">
+                  <div class="inputBox">
+                     ASCIIMath Input:
+                     <input id="asciiMathInput" name="asciiMathInput" type="text" value="" /><input id="asciiMathML" name="asciiMathML" type="hidden" /><input type="submit" value="Go!" /></div>
+               </form>
+               <h3>Live Preview</h3>
+               <p>
+                  This is a MathML rendering of your input, generated by ASCIIMathML as you type.
+                  
+               </p>
+               <div class="result">
+                  <div id="preview"> </div>
+               </div>
+               <p>
+                  This is the underlying MathML source generated by ASCIIMathML, again updated in real time.
+                  
+               </p>
+               <div class="result"><pre id="previewSource"> </pre></div><script type="text/javascript">
+          registerASCIIMathMLInputWidget('asciiMathInput', 'preview', 'asciiMathML', 'previewSource');
+          var inputChanged = false;
+          // Hide any existing output stuff in page on first change, as it will no longer be in sync
+          jQuery(document).ready(function() {
+            jQuery('#asciiMathInput').bind('keydown', function() {
+              if (!inputChanged) jQuery('.outputContainer').css('visibility', 'hidden');
+              inputChanged = true;
+            });
+          });
+        </script><div class="outputContainer">
+                  <h3>Enhanced Presentation MathML</h3>
+                  <p>
+                     This shows the result of attempting to enrich the raw Presentation MathML
+                     generated by ASCIIMathML:
+                     
+                  </p><pre class="result">&lt;math xmlns="http://www.w3.org/1998/Math/MathML"&gt;
+   &lt;mrow&gt;
+      &lt;mrow&gt;
+         &lt;mrow&gt;
+            &lt;mi&gt;cos&lt;/mi&gt;
+            &lt;mo&gt;&amp;ApplyFunction;&lt;/mo&gt;
+            &lt;mfenced close=")" open="("&gt;
+               &lt;mi&gt;theta&lt;/mi&gt;
+            &lt;/mfenced&gt;
+         &lt;/mrow&gt;
+         &lt;mo&gt;&amp;sdot;&lt;/mo&gt;
+         &lt;mfenced close="]" open="["&gt;
+            &lt;mtable&gt;
+               &lt;mtr&gt;
+                  &lt;mtd&gt;
+                     &lt;mn&gt;1&lt;/mn&gt;
+                  &lt;/mtd&gt;
+                  &lt;mtd&gt;
+                     &lt;mn&gt;0&lt;/mn&gt;
+                  &lt;/mtd&gt;
+               &lt;/mtr&gt;
+               &lt;mtr&gt;
+                  &lt;mtd&gt;
+                     &lt;mn&gt;0&lt;/mn&gt;
+                  &lt;/mtd&gt;
+                  &lt;mtd&gt;
+                     &lt;mn&gt;1&lt;/mn&gt;
+                  &lt;/mtd&gt;
+               &lt;/mtr&gt;
+            &lt;/mtable&gt;
+         &lt;/mfenced&gt;
+      &lt;/mrow&gt;
+      &lt;mo&gt;+&lt;/mo&gt;
+      &lt;mrow&gt;
+         &lt;mi&gt;i&lt;/mi&gt;
+         &lt;mo&gt;&amp;sdot;&lt;/mo&gt;
+         &lt;mrow&gt;
+            &lt;mi&gt;sin&lt;/mi&gt;
+            &lt;mo&gt;&amp;ApplyFunction;&lt;/mo&gt;
+            &lt;mfenced close=")" open="("&gt;
+               &lt;mi&gt;theta&lt;/mi&gt;
+            &lt;/mfenced&gt;
+         &lt;/mrow&gt;
+         &lt;mo&gt;&amp;sdot;&lt;/mo&gt;
+         &lt;mfenced close="]" open="["&gt;
+            &lt;mtable&gt;
+               &lt;mtr&gt;
+                  &lt;mtd&gt;
+                     &lt;mn&gt;0&lt;/mn&gt;
+                  &lt;/mtd&gt;
+                  &lt;mtd&gt;
+                     &lt;mn&gt;1&lt;/mn&gt;
+                  &lt;/mtd&gt;
+               &lt;/mtr&gt;
+               &lt;mtr&gt;
+                  &lt;mtd&gt;
+                     &lt;mn&gt;1&lt;/mn&gt;
+                  &lt;/mtd&gt;
+                  &lt;mtd&gt;
+                     &lt;mn&gt;0&lt;/mn&gt;
+                  &lt;/mtd&gt;
+               &lt;/mtr&gt;
+            &lt;/mtable&gt;
+         &lt;/mfenced&gt;
+      &lt;/mrow&gt;
+   &lt;/mrow&gt;
+&lt;/math&gt;</pre><h3>Content MathML</h3>
+                  <p>
+                     This shows the result of an attempted
+                     <a href="documentation/content-mathml.html">conversion to Content MathML</a>:
+                     
+                  </p><pre class="result">&lt;math xmlns="http://www.w3.org/1998/Math/MathML"&gt;
+   &lt;apply&gt;
+      &lt;plus/&gt;
+      &lt;apply&gt;
+         &lt;times/&gt;
+         &lt;apply&gt;
+            &lt;cos/&gt;
+            &lt;ci&gt;theta&lt;/ci&gt;
+         &lt;/apply&gt;
+         &lt;list&gt;
+            &lt;matrix&gt;
+               &lt;vector&gt;
+                  &lt;cn&gt;1&lt;/cn&gt;
+                  &lt;cn&gt;0&lt;/cn&gt;
+               &lt;/vector&gt;
+               &lt;vector&gt;
+                  &lt;cn&gt;0&lt;/cn&gt;
+                  &lt;cn&gt;1&lt;/cn&gt;
+               &lt;/vector&gt;
+            &lt;/matrix&gt;
+         &lt;/list&gt;
+      &lt;/apply&gt;
+      &lt;apply&gt;
+         &lt;times/&gt;
+         &lt;ci&gt;i&lt;/ci&gt;
+         &lt;apply&gt;
+            &lt;sin/&gt;
+            &lt;ci&gt;theta&lt;/ci&gt;
+         &lt;/apply&gt;
+         &lt;list&gt;
+            &lt;matrix&gt;
+               &lt;vector&gt;
+                  &lt;cn&gt;0&lt;/cn&gt;
+                  &lt;cn&gt;1&lt;/cn&gt;
+               &lt;/vector&gt;
+               &lt;vector&gt;
+                  &lt;cn&gt;1&lt;/cn&gt;
+                  &lt;cn&gt;0&lt;/cn&gt;
+               &lt;/vector&gt;
+            &lt;/matrix&gt;
+         &lt;/list&gt;
+      &lt;/apply&gt;
+   &lt;/apply&gt;
+&lt;/math&gt;</pre><h3>Maxima Input Form</h3>
+                  <p>
+                     This shows the result of an attempted
+                     <a href="documentation/maxima-input.html">conversion to Maxima Input syntax</a>:
+                     
+                  </p>
+                  <p>
+                     The conversion from Content MathML to Maxima Input was not successful for
+                     this input.
+                     
+                  </p>
+                  <table class="failures">
+                     <thead>
+                        <tr>
+                           <th>Failure Code</th>
+                           <th>Message</th>
+                           <th>XPath</th>
+                           <th>Context</th>
+                        </tr>
+                     </thead>
+                     <tbody>
+                        <tr>
+                           <td><a href="/snuggletex-webapp-1.2.2/documentation/error-codes.html#UMFG00">UMFG00</a></td>
+                           <td>Content MathML element matrix not supported</td>
+                           <td>apply[1]/apply[1]/list[1]/matrix[1]</td>
+                           <td><pre>&lt;matrix&gt;
+   &lt;vector&gt;
+      &lt;cn&gt;1&lt;/cn&gt;
+      &lt;cn&gt;0&lt;/cn&gt;
+   &lt;/vector&gt;
+   &lt;vector&gt;
+      &lt;cn&gt;0&lt;/cn&gt;
+      &lt;cn&gt;1&lt;/cn&gt;
+   &lt;/vector&gt;
+&lt;/matrix&gt;</pre></td>
+                        </tr>
+                        <tr>
+                           <td><a href="/snuggletex-webapp-1.2.2/documentation/error-codes.html#UMFG00">UMFG00</a></td>
+                           <td>Content MathML element matrix not supported</td>
+                           <td>apply[1]/apply[2]/list[1]/matrix[1]</td>
+                           <td><pre>&lt;matrix&gt;
+   &lt;vector&gt;
+      &lt;cn&gt;0&lt;/cn&gt;
+      &lt;cn&gt;1&lt;/cn&gt;
+   &lt;/vector&gt;
+   &lt;vector&gt;
+      &lt;cn&gt;1&lt;/cn&gt;
+      &lt;cn&gt;0&lt;/cn&gt;
+   &lt;/vector&gt;
+&lt;/matrix&gt;</pre></td>
+                        </tr>
+                     </tbody>
+                  </table>
+                  <h3>MathML Parallel Markup</h3>
+                  <p>
+                     This shows the enhanced Presentation MathML with other forms encapsulated
+                     as annotations:
+                     
+                  </p><pre class="result">&lt;math xmlns="http://www.w3.org/1998/Math/MathML"&gt;
+   &lt;semantics&gt;
+      &lt;mrow&gt;
+         &lt;mrow&gt;
+            &lt;mrow&gt;
+               &lt;mi&gt;cos&lt;/mi&gt;
+               &lt;mo&gt;&amp;ApplyFunction;&lt;/mo&gt;
+               &lt;mfenced close=")" open="("&gt;
+                  &lt;mi&gt;theta&lt;/mi&gt;
+               &lt;/mfenced&gt;
+            &lt;/mrow&gt;
+            &lt;mo&gt;&amp;sdot;&lt;/mo&gt;
+            &lt;mfenced close="]" open="["&gt;
+               &lt;mtable&gt;
+                  &lt;mtr&gt;
+                     &lt;mtd&gt;
+                        &lt;mn&gt;1&lt;/mn&gt;
+                     &lt;/mtd&gt;
+                     &lt;mtd&gt;
+                        &lt;mn&gt;0&lt;/mn&gt;
+                     &lt;/mtd&gt;
+                  &lt;/mtr&gt;
+                  &lt;mtr&gt;
+                     &lt;mtd&gt;
+                        &lt;mn&gt;0&lt;/mn&gt;
+                     &lt;/mtd&gt;
+                     &lt;mtd&gt;
+                        &lt;mn&gt;1&lt;/mn&gt;
+                     &lt;/mtd&gt;
+                  &lt;/mtr&gt;
+               &lt;/mtable&gt;
+            &lt;/mfenced&gt;
+         &lt;/mrow&gt;
+         &lt;mo&gt;+&lt;/mo&gt;
+         &lt;mrow&gt;
+            &lt;mi&gt;i&lt;/mi&gt;
+            &lt;mo&gt;&amp;sdot;&lt;/mo&gt;
+            &lt;mrow&gt;
+               &lt;mi&gt;sin&lt;/mi&gt;
+               &lt;mo&gt;&amp;ApplyFunction;&lt;/mo&gt;
+               &lt;mfenced close=")" open="("&gt;
+                  &lt;mi&gt;theta&lt;/mi&gt;
+               &lt;/mfenced&gt;
+            &lt;/mrow&gt;
+            &lt;mo&gt;&amp;sdot;&lt;/mo&gt;
+            &lt;mfenced close="]" open="["&gt;
+               &lt;mtable&gt;
+                  &lt;mtr&gt;
+                     &lt;mtd&gt;
+                        &lt;mn&gt;0&lt;/mn&gt;
+                     &lt;/mtd&gt;
+                     &lt;mtd&gt;
+                        &lt;mn&gt;1&lt;/mn&gt;
+                     &lt;/mtd&gt;
+                  &lt;/mtr&gt;
+                  &lt;mtr&gt;
+                     &lt;mtd&gt;
+                        &lt;mn&gt;1&lt;/mn&gt;
+                     &lt;/mtd&gt;
+                     &lt;mtd&gt;
+                        &lt;mn&gt;0&lt;/mn&gt;
+                     &lt;/mtd&gt;
+                  &lt;/mtr&gt;
+               &lt;/mtable&gt;
+            &lt;/mfenced&gt;
+         &lt;/mrow&gt;
+      &lt;/mrow&gt;
+      &lt;annotation-xml encoding="MathML-Content"&gt;
+         &lt;apply&gt;
+            &lt;plus/&gt;
+            &lt;apply&gt;
+               &lt;times/&gt;
+               &lt;apply&gt;
+                  &lt;cos/&gt;
+                  &lt;ci&gt;theta&lt;/ci&gt;
+               &lt;/apply&gt;
+               &lt;list&gt;
+                  &lt;matrix&gt;
+                     &lt;vector&gt;
+                        &lt;cn&gt;1&lt;/cn&gt;
+                        &lt;cn&gt;0&lt;/cn&gt;
+                     &lt;/vector&gt;
+                     &lt;vector&gt;
+                        &lt;cn&gt;0&lt;/cn&gt;
+                        &lt;cn&gt;1&lt;/cn&gt;
+                     &lt;/vector&gt;
+                  &lt;/matrix&gt;
+               &lt;/list&gt;
+            &lt;/apply&gt;
+            &lt;apply&gt;
+               &lt;times/&gt;
+               &lt;ci&gt;i&lt;/ci&gt;
+               &lt;apply&gt;
+                  &lt;sin/&gt;
+                  &lt;ci&gt;theta&lt;/ci&gt;
+               &lt;/apply&gt;
+               &lt;list&gt;
+                  &lt;matrix&gt;
+                     &lt;vector&gt;
+                        &lt;cn&gt;0&lt;/cn&gt;
+                        &lt;cn&gt;1&lt;/cn&gt;
+                     &lt;/vector&gt;
+                     &lt;vector&gt;
+                        &lt;cn&gt;1&lt;/cn&gt;
+                        &lt;cn&gt;0&lt;/cn&gt;
+                     &lt;/vector&gt;
+                  &lt;/matrix&gt;
+               &lt;/list&gt;
+            &lt;/apply&gt;
+         &lt;/apply&gt;
+      &lt;/annotation-xml&gt;
+      &lt;annotation encoding="ASCIIMathInput"/&gt;
+      &lt;annotation-xml encoding="Maxima-upconversion-failures"&gt;
+         &lt;s:fail xmlns:s="http://www.ph.ed.ac.uk/snuggletex" code="UMFG00"
+                 message="Content MathML element matrix not supported"&gt;
+            &lt;s:arg&gt;matrix&lt;/s:arg&gt;
+            &lt;s:xpath&gt;apply[1]/apply[1]/list[1]/matrix[1]&lt;/s:xpath&gt;
+            &lt;s:context&gt;
+               &lt;matrix&gt;
+                  &lt;vector&gt;
+                     &lt;cn&gt;1&lt;/cn&gt;
+                     &lt;cn&gt;0&lt;/cn&gt;
+                  &lt;/vector&gt;
+                  &lt;vector&gt;
+                     &lt;cn&gt;0&lt;/cn&gt;
+                     &lt;cn&gt;1&lt;/cn&gt;
+                  &lt;/vector&gt;
+               &lt;/matrix&gt;
+            &lt;/s:context&gt;
+         &lt;/s:fail&gt;
+         &lt;s:fail xmlns:s="http://www.ph.ed.ac.uk/snuggletex" code="UMFG00"
+                 message="Content MathML element matrix not supported"&gt;
+            &lt;s:arg&gt;matrix&lt;/s:arg&gt;
+            &lt;s:xpath&gt;apply[1]/apply[2]/list[1]/matrix[1]&lt;/s:xpath&gt;
+            &lt;s:context&gt;
+               &lt;matrix&gt;
+                  &lt;vector&gt;
+                     &lt;cn&gt;0&lt;/cn&gt;
+                     &lt;cn&gt;1&lt;/cn&gt;
+                  &lt;/vector&gt;
+                  &lt;vector&gt;
+                     &lt;cn&gt;1&lt;/cn&gt;
+                     &lt;cn&gt;0&lt;/cn&gt;
+                  &lt;/vector&gt;
+               &lt;/matrix&gt;
+            &lt;/s:context&gt;
+         &lt;/s:fail&gt;
+      &lt;/annotation-xml&gt;
+   &lt;/semantics&gt;
+&lt;/math&gt;</pre></div>
+            </div>
+         </div>
+      </div>
+      <div id="copyright">
+         <p>
+            SnuggleTeX Release 1.2.2 —
+            <a href="/snuggletex-webapp-1.2.2/documentation/release-notes.html">Release Notes</a><br />
+            Copyright © 2009
+            <a href="http://www.ph.ed.ac.uk">The School of Physics and Astronomy</a>,
+            <a href="http://www.ed.ac.uk">The University of Edinburgh</a>.
+            <br />
+            For more information, contact
+            <a href="http://www.ph.ed.ac.uk/elearning/contacts/#dmckain">David McKain</a>.
+            
+         </p>
+         <p>
+            The University of Edinburgh is a charitable body, registered in Scotland,
+            with registration number SC005336.
+            
+         </p>
+      </div>
+   </body>
+</html>
--- a/common/lib/capa/capa/tests/test_files/snuggletex_wrong.html
+++ b/common/lib/capa/capa/tests/test_files/snuggletex_wrong.html
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/xhtml-math11-f.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+   <head>
+      <meta content="application/xhtml+xml; charset=UTF-8" http-equiv="Content-Type" />
+      <meta content="SnuggleTeX" name="Generator" />
+      <meta content="SnuggleTeX Documentation" name="description" />
+      <meta content="David McKain" name="author" />
+      <meta content="The University of Edinburgh" name="publisher" />
+      <link href="/snuggletex-webapp-1.2.2/includes/core.css" rel="stylesheet" />
+      <link href="/snuggletex-webapp-1.2.2/includes/webapp.css" rel="stylesheet" />
+      <link href="/snuggletex-webapp-1.2.2/includes/snuggletex.css" rel="stylesheet" />
+      <link href="/snuggletex-webapp-1.2.2/includes/jquery-ui-1.7.2.custom.css"
+            rel="stylesheet" /><script src="/snuggletex-webapp-1.2.2/includes/jquery.js" type="text/javascript"></script><script src="/snuggletex-webapp-1.2.2/includes/jquery-ui-1.7.2.custom.js"
+              type="text/javascript"></script><script src="/snuggletex-webapp-1.2.2/includes/webapp.js" type="text/javascript"></script><title>SnuggleTeX - ASCIIMathML Enrichment Demo</title><script src="/snuggletex-webapp-1.2.2/includes/ASCIIMathML.js" type="text/javascript"></script><script src="/snuggletex-webapp-1.2.2/includes/ASCIIMathMLwidget.js"
+              type="text/javascript"></script></head>
+   <body id="asciiMathMLUpConversionDemo">
+      <table border="0" cellpadding="0" cellspacing="0" id="header" width="100%">
+         <tr>
+            <td align="left" id="logo" valign="top"><a class="headertext" href="http://www.ed.ac.uk"><img alt="The University of Edinburgh" height="84"
+                       src="/snuggletex-webapp-1.2.2/includes/uoe_logo.jpg"
+                       width="84" /></a></td>
+            <td align="left">
+               <h3>THE UNIVERSITY of EDINBURGH</h3>
+               <h1>SCHOOL OF PHYSICS AND ASTRONOMY</h1>
+            </td>
+         </tr>
+      </table>
+      <h1 id="location"><a href="/snuggletex-webapp-1.2.2">SnuggleTeX (1.2.2)</a></h1>
+      <div id="content">
+         <div id="skipnavigation"><a href="#maincontent">Skip Navigation</a></div>
+         <div id="navigation">
+            <div id="navinner">
+               <h2>About SnuggleTeX</h2>
+               <ul>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/overview-and-features.html">Overview &amp; Features</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/use-cases.html">Why Use SnuggleTeX?</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/license.html">License</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/release-notes.html">Release Notes</a></li>
+               </ul>
+               <h2>Demos &amp; Samples</h2>
+               <ul>
+                  <li><a href="/snuggletex-webapp-1.2.2/MathInputDemo">Simple Math Input Demo</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/FullLaTeXInputDemo">Full LaTeX Input Demo</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/UpConversionDemo">MathML Semantic Enrichment Demo</a></li>
+                  <li><a class="selected" href="/snuggletex-webapp-1.2.2/ASCIIMathMLUpConversionDemo">ASCIIMathML Enrichment Demo</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/web-output-samples.html">Web Output Samples</a></li>
+               </ul>
+               <h2>User Guide</h2>
+               <ul>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/getting-snuggletex.html">Getting SnuggleTeX</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/software-requirements.html">Software Requirements</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/your-classpath.html">Setting up Your ClassPath</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/examples.html">Examples</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/basic-usage.html">Basic Usage</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/inputs.html">Parsing LaTeX Inputs</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/xml-or-dom-output.html">Creating XML String or DOM Outputs</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/web-output.html">Creating Web Pages</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/error-reporting.html">Error Reporting</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/supported-latex.html">Supported LaTeX</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/advanced-usage.html">Advanced Usage</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/semantic-enrichment.html">Semantic Enrichment</a></li>
+                  <li><a href="/snuggletex-webapp-1.2.2/documentation/migrating-from-older-versions.html">Migrating from older versions</a></li>
+                  <li><a href="http://snuggletex.sourceforge.net/maven/apidocs/index.html">API Documentation<span class="extlink"> </span></a></li>
+                  <li><a href="http://snuggletex.sourceforge.net/maven/xref/index.html">Source Code Cross-Reference<span class="extlink"> </span></a></li>
+               </ul>
+               <h2>SnuggleTeX Project Links</h2>
+               <ul>
+                  <li><a href="http://sourceforge.net/project/showfiles.php?group_id=221375">Download from SourceForge.net<span class="extlink"> </span></a></li>
+                  <li><a href="http://sourceforge.net/projects/snuggletex/">SnuggleTeX on SourceForge.net<span class="extlink"> </span></a></li>
+                  <li><a href="http://snuggletex.sourceforge.net/maven/">SnuggleTeX Maven Developer Reports<span class="extlink"> </span></a></li>
+                  <li><a href="https://www.wiki.ed.ac.uk/display/Physics/SnuggleTeX">SnuggleTeX Wiki<span class="extlink"> </span></a></li>
+               </ul>
+            </div>
+         </div>
+         <div id="maincontent">
+            <div id="popup"></div>
+            <div id="maininner">
+               <h2>ASCIIMathML Enrichment Demo</h2>
+               <h3>Input</h3>
+               <p>
+                  This demo is similar to the
+                  <a href="/snuggletex-webapp-1.2.2/UpConversionDemo">MathML Semantic Enrichnment Demo</a>
+                  but uses
+                  <a href="http://www1.chapman.edu/~jipsen/asciimath.html">ASCIIMathML</a> as
+                  an alternative input format, which provides real-time feedback as you
+                  type but can often generate MathML with odd semantics in it.
+                  SnuggleTeX includes some functionality that can to convert this raw MathML into
+                  something equivalent to its own MathML output, thereby allowing you to
+                  <a href="/snuggletex-webapp-1.2.2/documentation/semantic-enrichment.html">semantically enrich</a> it in
+                  certain simple cases, making ASCIIMathML a possibly viable input format
+                  for simple semantic maths.
+                  
+               </p>
+               <p>
+                  To try the demo, simply enter some some ASCIIMathML into the box below.
+                  You should see a real time preview of this while you type.
+                  Then hit <tt>Go!</tt> to use SnuggleTeX to semantically enrich your
+                  input.
+                  
+               </p>
+               <form action="/snuggletex-webapp-1.2.2/ASCIIMathMLUpConversionDemo" class="input"
+                     method="post">
+                  <div class="inputBox">
+                     ASCIIMath Input:
+                     <input id="asciiMathInput" name="asciiMathInput" type="text" value="" /><input id="asciiMathML" name="asciiMathML" type="hidden" /><input type="submit" value="Go!" /></div>
+               </form>
+               <h3>Live Preview</h3>
+               <p>
+                  This is a MathML rendering of your input, generated by ASCIIMathML as you type.
+                  
+               </p>
+               <div class="result">
+                  <div id="preview"> </div>
+               </div>
+               <p>
+                  This is the underlying MathML source generated by ASCIIMathML, again updated in real time.
+                  
+               </p>
+               <div class="result"><pre id="previewSource"> </pre></div><script type="text/javascript">
+          registerASCIIMathMLInputWidget('asciiMathInput', 'preview', 'asciiMathML', 'previewSource');
+          var inputChanged = false;
+          // Hide any existing output stuff in page on first change, as it will no longer be in sync
+          jQuery(document).ready(function() {
+            jQuery('#asciiMathInput').bind('keydown', function() {
+              if (!inputChanged) jQuery('.outputContainer').css('visibility', 'hidden');
+              inputChanged = true;
+            });
+          });
+        </script><div class="outputContainer">
+                  <h3>Enhanced Presentation MathML</h3>
+                  <p>
+                     This shows the result of attempting to enrich the raw Presentation MathML
+                     generated by ASCIIMathML:
+                     
+                  </p><pre class="result">&lt;math xmlns="http://www.w3.org/1998/Math/MathML"&gt;
+   &lt;mn&gt;2&lt;/mn&gt;
+&lt;/math&gt;</pre><h3>Content MathML</h3>
+                  <p>
+                     This shows the result of an attempted
+                     <a href="documentation/content-mathml.html">conversion to Content MathML</a>:
+                     
+                  </p><pre class="result">&lt;math xmlns="http://www.w3.org/1998/Math/MathML"&gt;
+   &lt;cn&gt;2&lt;/cn&gt;
+&lt;/math&gt;</pre><h3>Maxima Input Form</h3>
+                  <p>
+                     This shows the result of an attempted
+                     <a href="documentation/maxima-input.html">conversion to Maxima Input syntax</a>:
+                     
+                  </p><pre class="result">2</pre><h3>MathML Parallel Markup</h3>
+                  <p>
+                     This shows the enhanced Presentation MathML with other forms encapsulated
+                     as annotations:
+                     
+                  </p><pre class="result">&lt;math xmlns="http://www.w3.org/1998/Math/MathML"&gt;
+   &lt;semantics&gt;
+      &lt;mn&gt;2&lt;/mn&gt;
+      &lt;annotation-xml encoding="MathML-Content"&gt;
+         &lt;cn&gt;2&lt;/cn&gt;
+      &lt;/annotation-xml&gt;
+      &lt;annotation encoding="ASCIIMathInput"/&gt;
+      &lt;annotation encoding="Maxima"&gt;2&lt;/annotation&gt;
+   &lt;/semantics&gt;
+&lt;/math&gt;</pre></div>
+            </div>
+         </div>
+      </div>
+      <div id="copyright">
+         <p>
+            SnuggleTeX Release 1.2.2 —
+            <a href="/snuggletex-webapp-1.2.2/documentation/release-notes.html">Release Notes</a><br />
+            Copyright © 2009
+            <a href="http://www.ph.ed.ac.uk">The School of Physics and Astronomy</a>,
+            <a href="http://www.ed.ac.uk">The University of Edinburgh</a>.
+            <br />
+            For more information, contact
+            <a href="http://www.ph.ed.ac.uk/elearning/contacts/#dmckain">David McKain</a>.
+            
+         </p>
+         <p>
+            The University of Edinburgh is a charitable body, registered in Scotland,
+            with registration number SC005336.
+            
+         </p>
+      </div>
+   </body>
+</html>
--- a/common/lib/capa/capa/tests/test_html_render.py
+++ b/common/lib/capa/capa/tests/test_html_render.py
@@ -6,12 +6,15 @@ import json

 import mock

-from capa.capa_problem import LoncapaProblem
 from .response_xml_factory import StringResponseXMLFactory, CustomResponseXMLFactory
-from . import test_system
+from . import test_system, new_loncapa_problem

 class CapaHtmlRenderTest(unittest.TestCase):

+    def setUp(self):
+        super(CapaHtmlRenderTest, self).setUp()
+        self.system = test_system()
+
    def test_blank_problem(self):
        """
        It's important that blank problems don't break, since that's
@@ -20,7 +23,7 @@ class CapaHtmlRenderTest(unittest.TestCase):
        xml_str = "<problem> </problem>"

        # Create the problem
-        problem = LoncapaProblem(xml_str, '1', system=test_system)
+        problem = new_loncapa_problem(xml_str)

        # Render the HTML
        rendered_html = etree.XML(problem.get_html())
@@ -39,7 +42,7 @@ class CapaHtmlRenderTest(unittest.TestCase):
        """)

        # Create the problem
-        problem = LoncapaProblem(xml_str, '1', system=test_system)
+        problem = new_loncapa_problem(xml_str, system=self.system)

        # Render the HTML
        rendered_html = etree.XML(problem.get_html())
@@ -49,9 +52,6 @@ class CapaHtmlRenderTest(unittest.TestCase):
        self.assertEqual(test_element.tag, "test")
        self.assertEqual(test_element.text, "Test include")

-
-
-
    def test_process_outtext(self):
        # Generate some XML with <startouttext /> and <endouttext />
        xml_str = textwrap.dedent("""
@@ -61,7 +61,7 @@ class CapaHtmlRenderTest(unittest.TestCase):
        """)

        # Create the problem
-        problem = LoncapaProblem(xml_str, '1', system=test_system)
+        problem = new_loncapa_problem(xml_str)

        # Render the HTML
        rendered_html = etree.XML(problem.get_html())
@@ -80,7 +80,7 @@ class CapaHtmlRenderTest(unittest.TestCase):
        """)

        # Create the problem
-        problem = LoncapaProblem(xml_str, '1', system=test_system)
+        problem = new_loncapa_problem(xml_str)

        # Render the HTML
        rendered_html = etree.XML(problem.get_html())
@@ -98,7 +98,7 @@ class CapaHtmlRenderTest(unittest.TestCase):
        """)

        # Create the problem
-        problem = LoncapaProblem(xml_str, '1', system=test_system)
+        problem = new_loncapa_problem(xml_str)

        # Render the HTML
        rendered_html = etree.XML(problem.get_html())
@@ -117,11 +117,12 @@ class CapaHtmlRenderTest(unittest.TestCase):
        xml_str = StringResponseXMLFactory().build_xml(**kwargs)

        # Mock out the template renderer
-        test_system.render_template = mock.Mock()
-        test_system.render_template.return_value = "<div>Input Template Render</div>"
+        the_system = test_system()
+        the_system.render_template = mock.Mock()
+        the_system.render_template.return_value = "<div>Input Template Render</div>"

        # Create the problem and render the HTML
-        problem = LoncapaProblem(xml_str, '1', system=test_system)
+        problem = new_loncapa_problem(xml_str, system=the_system)
        rendered_html = etree.XML(problem.get_html())

        # Expect problem has been turned into a <div>
@@ -166,7 +167,7 @@ class CapaHtmlRenderTest(unittest.TestCase):
                mock.call('textline.html', expected_textline_context),
                mock.call('solutionspan.html', expected_solution_context)]

-        self.assertEqual(test_system.render_template.call_args_list,
+        self.assertEqual(the_system.render_template.call_args_list,
                            expected_calls)


@@ -184,7 +185,7 @@ class CapaHtmlRenderTest(unittest.TestCase):
        xml_str = CustomResponseXMLFactory().build_xml(**kwargs)

        # Create the problem and render the html
-        problem = LoncapaProblem(xml_str, '1', system=test_system)
+        problem = new_loncapa_problem(xml_str)

        # Grade the problem
        correctmap = problem.grade_answers({'1_2_1': 'test'})
@@ -219,7 +220,7 @@ class CapaHtmlRenderTest(unittest.TestCase):
        """)

        # Create the problem and render the HTML
-        problem = LoncapaProblem(xml_str, '1', system=test_system)
+        problem = new_loncapa_problem(xml_str)
        rendered_html = etree.XML(problem.get_html())

        # Expect that the variable $test has been replaced with its value
@@ -227,7 +228,7 @@ class CapaHtmlRenderTest(unittest.TestCase):
        self.assertEqual(span_element.get('attr'), "TEST")

    def _create_test_file(self, path, content_str):
-        test_fp = test_system.filestore.open(path, "w")
+        test_fp = self.system.filestore.open(path, "w")
        test_fp.write(content_str)
        test_fp.close()

--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -45,7 +45,7 @@ class OptionInputTest(unittest.TestCase):
        state = {'value': 'Down',
                 'id': 'sky_input',
                 'status': 'answered'}
-        option_input = lookup_tag('optioninput')(test_system, element, state)
+        option_input = lookup_tag('optioninput')(test_system(), element, state)

        context = option_input._get_render_context()

@@ -92,7 +92,7 @@ class ChoiceGroupTest(unittest.TestCase):
                 'id': 'sky_input',
                 'status': 'answered'}

-        the_input = lookup_tag(tag)(test_system, element, state)
+        the_input = lookup_tag(tag)(test_system(), element, state)

        context = the_input._get_render_context()

@@ -142,7 +142,7 @@ class JavascriptInputTest(unittest.TestCase):
        element = etree.fromstring(xml_str)

        state = {'value': '3', }
-        the_input = lookup_tag('javascriptinput')(test_system, element, state)
+        the_input = lookup_tag('javascriptinput')(test_system(), element, state)

        context = the_input._get_render_context()

@@ -170,7 +170,7 @@ class TextLineTest(unittest.TestCase):
        element = etree.fromstring(xml_str)

        state = {'value': 'BumbleBee', }
-        the_input = lookup_tag('textline')(test_system, element, state)
+        the_input = lookup_tag('textline')(test_system(), element, state)

        context = the_input._get_render_context()

@@ -198,7 +198,7 @@ class TextLineTest(unittest.TestCase):
        element = etree.fromstring(xml_str)

        state = {'value': 'BumbleBee', }
-        the_input = lookup_tag('textline')(test_system, element, state)
+        the_input = lookup_tag('textline')(test_system(), element, state)

        context = the_input._get_render_context()

@@ -236,7 +236,7 @@ class TextLineTest(unittest.TestCase):
            element = etree.fromstring(xml_str)

            state = {'value': 'BumbleBee', }
-            the_input = lookup_tag('textline')(test_system, element, state)
+            the_input = lookup_tag('textline')(test_system(), element, state)

            context = the_input._get_render_context()

@@ -274,7 +274,7 @@ class FileSubmissionTest(unittest.TestCase):
                 'status': 'incomplete',
                 'feedback': {'message': '3'}, }
        input_class = lookup_tag('filesubmission')
-        the_input = input_class(test_system, element, state)
+        the_input = input_class(test_system(), element, state)

        context = the_input._get_render_context()

@@ -319,7 +319,7 @@ class CodeInputTest(unittest.TestCase):
                 'feedback': {'message': '3'}, }

        input_class = lookup_tag('codeinput')
-        the_input = input_class(test_system, element, state)
+        the_input = input_class(test_system(), element, state)

        context = the_input._get_render_context()

@@ -368,7 +368,7 @@ class MatlabTest(unittest.TestCase):
                 'feedback': {'message': '3'}, }

        self.input_class = lookup_tag('matlabinput')
-        self.the_input = self.input_class(test_system, elt, state)
+        self.the_input = self.input_class(test_system(), elt, state)

    def test_rendering(self):
        context = self.the_input._get_render_context()
@@ -396,7 +396,7 @@ class MatlabTest(unittest.TestCase):
                 'feedback': {'message': '3'}, }
        elt = etree.fromstring(self.xml)

-        the_input = self.input_class(test_system, elt, state)
+        the_input = self.input_class(test_system(), elt, state)
        context = the_input._get_render_context()

        expected = {'id': 'prob_1_2',
@@ -423,7 +423,7 @@ class MatlabTest(unittest.TestCase):
                     }
            elt = etree.fromstring(self.xml)

-            the_input = self.input_class(test_system, elt, state)
+            the_input = self.input_class(test_system(), elt, state)
            context = the_input._get_render_context()
            expected = {'id': 'prob_1_2',
                        'value': 'print "good evening"',
@@ -448,7 +448,7 @@ class MatlabTest(unittest.TestCase):
                 }
        elt = etree.fromstring(self.xml)

-        the_input = self.input_class(test_system, elt, state)
+        the_input = self.input_class(test_system(), elt, state)
        context = the_input._get_render_context()
        expected = {'id': 'prob_1_2',
                    'value': 'print "good evening"',
@@ -470,7 +470,7 @@ class MatlabTest(unittest.TestCase):
        get = {'submission': 'x = 1234;'}
        response = self.the_input.handle_ajax("plot", get)

-        test_system.xqueue['interface'].send_to_queue.assert_called_with(header=ANY, body=ANY)
+        test_system().xqueue['interface'].send_to_queue.assert_called_with(header=ANY, body=ANY)

        self.assertTrue(response['success'])
        self.assertTrue(self.the_input.input_state['queuekey'] is not None)
@@ -479,13 +479,12 @@ class MatlabTest(unittest.TestCase):
    def test_plot_data_failure(self):
        get = {'submission': 'x = 1234;'}
        error_message = 'Error message!'
-        test_system.xqueue['interface'].send_to_queue.return_value = (1, error_message)
+        test_system().xqueue['interface'].send_to_queue.return_value = (1, error_message)
        response = self.the_input.handle_ajax("plot", get)
        self.assertFalse(response['success'])
        self.assertEqual(response['message'], error_message)
        self.assertTrue('queuekey' not in self.the_input.input_state)
        self.assertTrue('queuestate' not in self.the_input.input_state)
-        test_system.xqueue['interface'].send_to_queue.return_value = (0, 'Success!')

    def test_ungraded_response_success(self):
        queuekey = 'abcd'
@@ -496,7 +495,7 @@ class MatlabTest(unittest.TestCase):
                 'feedback': {'message': '3'}, }
        elt = etree.fromstring(self.xml)

-        the_input = self.input_class(test_system, elt, state)
+        the_input = self.input_class(test_system(), elt, state)
        inner_msg = 'hello!'
        queue_msg = json.dumps({'msg': inner_msg})

@@ -514,7 +513,7 @@ class MatlabTest(unittest.TestCase):
                 'feedback': {'message': '3'}, }
        elt = etree.fromstring(self.xml)

-        the_input = self.input_class(test_system, elt, state)
+        the_input = self.input_class(test_system(), elt, state)
        inner_msg = 'hello!'
        queue_msg = json.dumps({'msg': inner_msg})

@@ -553,7 +552,7 @@ class SchematicTest(unittest.TestCase):
        state = {'value': value,
                 'status': 'unsubmitted'}

-        the_input = lookup_tag('schematic')(test_system, element, state)
+        the_input = lookup_tag('schematic')(test_system(), element, state)

        context = the_input._get_render_context()

@@ -592,7 +591,7 @@ class ImageInputTest(unittest.TestCase):
        state = {'value': value,
                 'status': 'unsubmitted'}

-        the_input = lookup_tag('imageinput')(test_system, element, state)
+        the_input = lookup_tag('imageinput')(test_system(), element, state)

        context = the_input._get_render_context()

@@ -643,7 +642,7 @@ class CrystallographyTest(unittest.TestCase):
        state = {'value': value,
                 'status': 'unsubmitted'}

-        the_input = lookup_tag('crystallography')(test_system, element, state)
+        the_input = lookup_tag('crystallography')(test_system(), element, state)

        context = the_input._get_render_context()

@@ -681,7 +680,7 @@ class VseprTest(unittest.TestCase):
        state = {'value': value,
                 'status': 'unsubmitted'}

-        the_input = lookup_tag('vsepr_input')(test_system, element, state)
+        the_input = lookup_tag('vsepr_input')(test_system(), element, state)

        context = the_input._get_render_context()

@@ -708,7 +707,7 @@ class ChemicalEquationTest(unittest.TestCase):
        element = etree.fromstring(xml_str)

        state = {'value': 'H2OYeah', }
-        self.the_input = lookup_tag('chemicalequationinput')(test_system, element, state)
+        self.the_input = lookup_tag('chemicalequationinput')(test_system(), element, state)

    def test_rendering(self):
        ''' Verify that the render context matches the expected render context'''
@@ -783,7 +782,7 @@ class DragAndDropTest(unittest.TestCase):
                                    ]
                    }

-        the_input = lookup_tag('drag_and_drop_input')(test_system, element, state)
+        the_input = lookup_tag('drag_and_drop_input')(test_system(), element, state)

        context = the_input._get_render_context()
        expected = {'id': 'prob_1_2',
@@ -832,7 +831,7 @@ class AnnotationInputTest(unittest.TestCase):

        tag = 'annotationinput'

-        the_input = lookup_tag(tag)(test_system, element, state)
+        the_input = lookup_tag(tag)(test_system(), element, state)

        context = the_input._get_render_context()

--- a/common/lib/capa/capa/tests/test_responsetypes.py
+++ b/common/lib/capa/capa/tests/test_responsetypes.py
@@ -2,7 +2,6 @@
 Tests of responsetypes
 """

-
 from datetime import datetime
 import json
 from nose.plugins.skip import SkipTest
@@ -10,10 +9,11 @@ import os
 import random
 import unittest
 import textwrap
+import mock
+import textwrap

-from . import test_system
+from . import new_loncapa_problem, test_system

-import capa.capa_problem as lcp
 from capa.responsetypes import LoncapaProblemError, \
    StudentInputError, ResponseError
 from capa.correctmap import CorrectMap
@@ -30,9 +30,9 @@ class ResponseTest(unittest.TestCase):
        if self.xml_factory_class:
            self.xml_factory = self.xml_factory_class()

-    def build_problem(self, **kwargs):
+    def build_problem(self, system=None, **kwargs):
        xml = self.xml_factory.build_xml(**kwargs)
-        return lcp.LoncapaProblem(xml, '1', system=test_system)
+        return new_loncapa_problem(xml, system=system)

    def assert_grade(self, problem, submission, expected_correctness, msg=None):
        input_dict = {'1_2_1': submission}
@@ -184,94 +184,151 @@ class ImageResponseTest(ResponseTest):
        self.assert_answer_format(problem)


-class SymbolicResponseTest(unittest.TestCase):
-    def test_sr_grade(self):
-        raise SkipTest()  # This test fails due to dependencies on a local copy of snuggletex-webapp. Until we have figured that out, we'll just skip this test
-        symbolicresponse_file = os.path.dirname(__file__) + "/test_files/symbolicresponse.xml"
-        test_lcp = lcp.LoncapaProblem(open(symbolicresponse_file).read(), '1', system=test_system)
-        correct_answers = {'1_2_1': 'cos(theta)*[[1,0],[0,1]] + i*sin(theta)*[[0,1],[1,0]]',
-                           '1_2_1_dynamath': '''
-                            <math xmlns="http://www.w3.org/1998/Math/MathML">
-                              <mstyle displaystyle="true">
-                                <mrow>
-                                  <mi>cos</mi>
-                                  <mrow>
-                                    <mo>(</mo>
-                                    <mi>&#x3B8;</mi>
-                                    <mo>)</mo>
-                                  </mrow>
-                                </mrow>
-                                <mo>&#x22C5;</mo>
-                                <mrow>
-                                  <mo>[</mo>
-                                  <mtable>
-                                    <mtr>
-                                      <mtd>
-                                        <mn>1</mn>
-                                      </mtd>
-                                      <mtd>
-                                        <mn>0</mn>
-                                      </mtd>
-                                    </mtr>
-                                    <mtr>
-                                      <mtd>
-                                        <mn>0</mn>
-                                      </mtd>
-                                      <mtd>
-                                        <mn>1</mn>
-                                      </mtd>
-                                    </mtr>
-                                  </mtable>
-                                  <mo>]</mo>
-                                </mrow>
-                                <mo>+</mo>
-                                <mi>i</mi>
-                                <mo>&#x22C5;</mo>
-                                <mrow>
-                                  <mi>sin</mi>
-                                  <mrow>
-                                    <mo>(</mo>
-                                    <mi>&#x3B8;</mi>
-                                    <mo>)</mo>
-                                  </mrow>
-                                </mrow>
-                                <mo>&#x22C5;</mo>
-                                <mrow>
-                                  <mo>[</mo>
-                                  <mtable>
-                                    <mtr>
-                                      <mtd>
-                                        <mn>0</mn>
-                                      </mtd>
-                                      <mtd>
-                                        <mn>1</mn>
-                                      </mtd>
-                                    </mtr>
-                                    <mtr>
-                                      <mtd>
-                                        <mn>1</mn>
-                                      </mtd>
-                                      <mtd>
-                                        <mn>0</mn>
-                                      </mtd>
-                                    </mtr>
-                                  </mtable>
-                                  <mo>]</mo>
-                                </mrow>
-                              </mstyle>
-                            </math>
-                            ''',
-                           }
-        wrong_answers = {'1_2_1': '2',
-                         '1_2_1_dynamath': '''
-                         <math xmlns="http://www.w3.org/1998/Math/MathML">
-                           <mstyle displaystyle="true">
-                             <mn>2</mn>
-                           </mstyle>
-                         </math>''',
-                         }
-        self.assertEquals(test_lcp.grade_answers(correct_answers).get_correctness('1_2_1'), 'correct')
-        self.assertEquals(test_lcp.grade_answers(wrong_answers).get_correctness('1_2_1'), 'incorrect')
+class SymbolicResponseTest(ResponseTest):
+    from response_xml_factory import SymbolicResponseXMLFactory
+    xml_factory_class = SymbolicResponseXMLFactory
+
+    def test_grade_single_input(self):
+        problem = self.build_problem(math_display=True,
+                                    expect="2*x+3*y")
+
+        # Correct answers
+        correct_inputs = [
+            ('2x+3y', textwrap.dedent("""
+                <math xmlns="http://www.w3.org/1998/Math/MathML">
+                    <mstyle displaystyle="true">
+                    <mn>2</mn><mo>*</mo><mi>x</mi><mo>+</mo><mn>3</mn><mo>*</mo><mi>y</mi>
+                    </mstyle></math>""")),
+
+            ('x+x+3y', textwrap.dedent("""
+                <math xmlns="http://www.w3.org/1998/Math/MathML">
+                    <mstyle displaystyle="true">
+                    <mi>x</mi><mo>+</mo><mi>x</mi><mo>+</mo><mn>3</mn><mo>*</mo><mi>y</mi>
+                    </mstyle></math>""")),
+        ]
+
+        for (input_str, input_mathml) in correct_inputs:
+            self._assert_symbolic_grade(problem, input_str, input_mathml, 'correct')
+
+        # Incorrect answers
+        incorrect_inputs = [
+            ('0', ''),
+            ('4x+3y', textwrap.dedent("""
+                <math xmlns="http://www.w3.org/1998/Math/MathML">
+                    <mstyle displaystyle="true">
+                    <mn>4</mn><mo>*</mo><mi>x</mi><mo>+</mo><mn>3</mn><mo>*</mo><mi>y</mi>
+                    </mstyle></math>""")),
+        ]
+
+        for (input_str, input_mathml) in incorrect_inputs:
+            self._assert_symbolic_grade(problem, input_str, input_mathml, 'incorrect')
+
+
+    def test_complex_number_grade(self):
+        problem = self.build_problem(math_display=True,
+            expect="[[cos(theta),i*sin(theta)],[i*sin(theta),cos(theta)]]",
+            options=["matrix", "imaginary"])
+
+        # For LaTeX-style inputs, symmath_check() will try to contact
+        # a server to convert the input to MathML.
+        # We mock out the server, simulating the response that it would give
+        # for this input.
+        import requests
+        dirpath = os.path.dirname(__file__)
+        correct_snuggletex_response = open(os.path.join(dirpath, "test_files/snuggletex_correct.html")).read().decode('utf8')
+        wrong_snuggletex_response = open(os.path.join(dirpath, "test_files/snuggletex_wrong.html")).read().decode('utf8')
+
+        # Correct answer
+        with mock.patch.object(requests, 'post') as mock_post:
+
+            # Simulate what the LaTeX-to-MathML server would 
+            # send for the correct response input
+            mock_post.return_value.text = correct_snuggletex_response
+
+            self._assert_symbolic_grade(problem,
+                "cos(theta)*[[1,0],[0,1]] + i*sin(theta)*[[0,1],[1,0]]",
+                textwrap.dedent("""
+                <math xmlns="http://www.w3.org/1998/Math/MathML">
+                  <mstyle displaystyle="true">
+                    <mrow>
+                      <mi>cos</mi>
+                      <mrow><mo>(</mo><mi>&#x3B8;</mi><mo>)</mo></mrow>
+                    </mrow>
+                    <mo>&#x22C5;</mo>
+                    <mrow>
+                      <mo>[</mo>
+                      <mtable>
+                        <mtr>
+                          <mtd><mn>1</mn></mtd><mtd><mn>0</mn></mtd>
+                        </mtr>
+                        <mtr>
+                          <mtd><mn>0</mn></mtd><mtd><mn>1</mn></mtd>
+                        </mtr>
+                      </mtable>
+                      <mo>]</mo>
+                    </mrow>
+                    <mo>+</mo>
+                    <mi>i</mi>
+                    <mo>&#x22C5;</mo>
+                    <mrow>
+                      <mi>sin</mi>
+                      <mrow>
+                        <mo>(</mo><mi>&#x3B8;</mi><mo>)</mo>
+                      </mrow>
+                    </mrow>
+                    <mo>&#x22C5;</mo>
+                    <mrow>
+                      <mo>[</mo>
+                      <mtable>
+                        <mtr>
+                          <mtd><mn>0</mn></mtd><mtd><mn>1</mn></mtd>
+                        </mtr>
+                        <mtr>
+                          <mtd><mn>1</mn></mtd><mtd><mn>0</mn></mtd>
+                        </mtr>
+                      </mtable>
+                      <mo>]</mo>
+                    </mrow>
+                  </mstyle>
+                </math>
+                """),
+                'correct')
+
+        # Incorrect answer
+        with mock.patch.object(requests, 'post') as mock_post:
+
+            # Simulate what the LaTeX-to-MathML server would
+            # send for the incorrect response input
+            mock_post.return_value.text = wrong_snuggletex_response
+
+            self._assert_symbolic_grade(problem, "2",
+                    textwrap.dedent("""
+                    <math xmlns="http://www.w3.org/1998/Math/MathML">
+                      <mstyle displaystyle="true"><mn>2</mn></mstyle>
+                    </math>
+                    """),
+                'incorrect')
+
+    def test_multiple_inputs_exception(self):
+
+        # Should not allow multiple inputs, since we specify
+        # only one "expect" value
+        with self.assertRaises(Exception):
+            problem = self.build_problem(math_display=True,
+                                        expect="2*x+3*y",
+                                        num_inputs=3)
+
+    def _assert_symbolic_grade(self, problem,
+                                student_input,
+                                dynamath_input,
+                                expected_correctness):
+        input_dict = {'1_2_1': str(student_input),
+                        '1_2_1_dynamath': str(dynamath_input) }
+
+        correct_map = problem.grade_answers(input_dict)
+
+        self.assertEqual(correct_map.get_correctness('1_2_1'),
+                        expected_correctness)


 class OptionResponseTest(ResponseTest):
@@ -531,6 +588,22 @@ class StringResponseTest(ResponseTest):
        correct_map = problem.grade_answers(input_dict)
        self.assertEquals(correct_map.get_hint('1_2_1'), "")

+    def test_computed_hints(self):
+        problem = self.build_problem(
+            answer="Michigan",
+            hintfn="gimme_a_hint",
+            script = textwrap.dedent("""
+                def gimme_a_hint(answer_ids, student_answers, new_cmap, old_cmap):
+                    aid = answer_ids[0]
+                    answer = student_answers[aid]
+                    new_cmap.set_hint_and_mode(aid, answer+"??", "always")
+            """)
+        )
+
+        input_dict = {'1_2_1': 'Hello'}
+        correct_map = problem.grade_answers(input_dict)
+        self.assertEquals(correct_map.get_hint('1_2_1'), "Hello??")
+

 class CodeResponseTest(ResponseTest):
    from response_xml_factory import CodeResponseXMLFactory
@@ -710,16 +783,37 @@ class JavascriptResponseTest(ResponseTest):
        coffee_file_path = os.path.dirname(__file__) + "/test_files/js/*.coffee"
        os.system("node_modules/.bin/coffee -c %s" % (coffee_file_path))

-        problem = self.build_problem(generator_src="test_problem_generator.js",
-                                     grader_src="test_problem_grader.js",
-                                     display_class="TestProblemDisplay",
-                                     display_src="test_problem_display.js",
-                                     param_dict={'value': '4'})
+        system = test_system()
+        system.can_execute_unsafe_code = lambda: True
+        problem = self.build_problem(
+            system=system,
+            generator_src="test_problem_generator.js",
+            grader_src="test_problem_grader.js",
+            display_class="TestProblemDisplay",
+            display_src="test_problem_display.js",
+            param_dict={'value': '4'},
+        )

        # Test that we get graded correctly
        self.assert_grade(problem, json.dumps({0: 4}), "correct")
        self.assert_grade(problem, json.dumps({0: 5}), "incorrect")

+    def test_cant_execute_javascript(self):
+        # If the system says to disallow unsafe code execution, then making
+        # this problem will raise an exception.
+        system = test_system()
+        system.can_execute_unsafe_code = lambda: False
+
+        with self.assertRaises(LoncapaProblemError):
+            problem = self.build_problem(
+                system=system,
+                generator_src="test_problem_generator.js",
+                grader_src="test_problem_grader.js",
+                display_class="TestProblemDisplay",
+                display_src="test_problem_display.js",
+                param_dict={'value': '4'},
+            )
+

 class NumericalResponseTest(ResponseTest):
    from response_xml_factory import NumericalResponseXMLFactory
@@ -853,9 +947,8 @@ class CustomResponseTest(ResponseTest):
        #
        #   'answer_given' is the answer the student gave (if there is just one input)
        #       or an ordered list of answers (if there are multiple inputs)
-        #
-        #
-        # The function should return a dict of the form
+        #   
+        # The function should return a dict of the form 
        # { 'ok': BOOL, 'msg': STRING }
        #
        script = textwrap.dedent("""
@@ -964,6 +1057,35 @@ class CustomResponseTest(ResponseTest):
        self.assertEqual(correct_map.get_msg('1_2_2'), 'Feedback 2')
        self.assertEqual(correct_map.get_msg('1_2_3'), 'Feedback 3')

+    def test_function_code_with_extra_args(self):
+        script = textwrap.dedent("""\
+                    def check_func(expect, answer_given, options, dynamath):
+                        assert options == "xyzzy", "Options was %r" % options
+                        return {'ok': answer_given == expect, 'msg': 'Message text'}
+                    """)
+
+        problem = self.build_problem(script=script, cfn="check_func", expect="42", options="xyzzy", cfn_extra_args="options dynamath")
+
+        # Correct answer
+        input_dict = {'1_2_1': '42'}
+        correct_map = problem.grade_answers(input_dict)
+
+        correctness = correct_map.get_correctness('1_2_1')
+        msg = correct_map.get_msg('1_2_1')
+
+        self.assertEqual(correctness, 'correct')
+        self.assertEqual(msg, "Message text")
+
+        # Incorrect answer
+        input_dict = {'1_2_1': '0'}
+        correct_map = problem.grade_answers(input_dict)
+
+        correctness = correct_map.get_correctness('1_2_1')
+        msg = correct_map.get_msg('1_2_1')
+
+        self.assertEqual(correctness, 'incorrect')
+        self.assertEqual(msg, "Message text")
+
    def test_multiple_inputs_return_one_status(self):
        # When given multiple inputs, the 'answer_given' argument
        # to the check_func() is a list of inputs
--- a/common/lib/capa/capa/util.py
+++ b/common/lib/capa/capa/util.py
@@ -1,4 +1,4 @@
-from .calc import evaluator, UndefinedVariable
+from calc import evaluator, UndefinedVariable
 from cmath import isinf

 #-----------------------------------------------------------------------------
--- a/common/lib/capa/setup.py
+++ b/common/lib/capa/setup.py
@@ -4,5 +4,5 @@ setup(
    name="capa",
    version="0.1",
    packages=find_packages(exclude=["tests"]),
-    install_requires=['distribute==0.6.28', 'pyparsing==1.5.6'],
+    install_requires=["distribute==0.6.28"],
 )
--- a/common/lib/capa/symmath/README.md
+++ b/common/lib/capa/symmath/README.md
--- a/common/lib/capa/symmath/init.py
+++ b/common/lib/capa/symmath/init.py
--- a/common/lib/capa/symmath/formula.py
+++ b/common/lib/capa/symmath/formula.py
@@ -736,4 +736,4 @@ def test6():		# imaginary numbers
  </mstyle>
 </math>
 '''
-    return formula(xmlstr, options='imaginaryi')
+    return formula(xmlstr, options='imaginary')
--- a/common/lib/capa/symmath/symmath_check.py
+++ b/common/lib/capa/symmath/symmath_check.py
@@ -324,4 +324,5 @@ def symmath_check(expect, ans, dynamath=None, options=None, debug=None, xml=None
            msg += "<p>Difference: %s</p>" % to_latex(diff)
        msg += '<hr>'

-    return {'ok': False, 'msg': msg, 'ex': fexpect, 'got': fsym}
+    # Used to return more keys: 'ex': fexpect, 'got': fsym
+    return {'ok': False, 'msg': msg}
--- a/common/lib/capa/capa/chem/init.py
+++ b/common/lib/capa/capa/chem/init.py
--- a/common/lib/capa/capa/chem/chemcalc.py
+++ b/common/lib/capa/capa/chem/chemcalc.py
--- a/common/lib/capa/capa/chem/chemtools.py
+++ b/common/lib/capa/capa/chem/chemtools.py
--- a/common/lib/capa/capa/chem/miller.py
+++ b/common/lib/capa/capa/chem/miller.py
--- a/common/lib/capa/capa/chem/tests.py
+++ b/common/lib/capa/capa/chem/tests.py
--- a/common/lib/chem/setup.py
+++ b/common/lib/chem/setup.py
@@ -0,0 +1,13 @@
+from setuptools import setup
+
+setup(
+    name="chem",
+    version="0.1",
+    packages=["chem"],
+    install_requires=[
+        "pyparsing==1.5.6",
+        "numpy",
+        "scipy",
+        "nltk==2.0.4",
+    ],
+)
--- a/common/lib/sandbox-packages/README
+++ b/common/lib/sandbox-packages/README
@@ -0,0 +1 @@
+This directory is in the Python path for sandboxed Python execution.
--- a/common/lib/sandbox-packages/eia.py
+++ b/common/lib/sandbox-packages/eia.py
--- a/common/lib/sandbox-packages/setup.py
+++ b/common/lib/sandbox-packages/setup.py
@@ -0,0 +1,14 @@
+from setuptools import setup
+
+setup(
+    name="sandbox-packages",
+    version="0.1",
+    packages=[
+        "verifiers",
+    ],
+    py_modules=[
+        "eia",
+    ],
+    install_requires=[
+    ],
+)
--- a/common/lib/sandbox-packages/verifiers/init.py
+++ b/common/lib/sandbox-packages/verifiers/init.py
--- a/common/lib/sandbox-packages/verifiers/draganddrop.py
+++ b/common/lib/sandbox-packages/verifiers/draganddrop.py
--- a/common/lib/sandbox-packages/verifiers/tests_draganddrop.py
+++ b/common/lib/sandbox-packages/verifiers/tests_draganddrop.py
--- a/common/lib/xmodule/test_files/symbolicresponse.xml
+++ b/common/lib/xmodule/test_files/symbolicresponse.xml
@@ -13,13 +13,10 @@ real time, next to the input box.
 <p>This is a correct answer which may be entered below: </p>
 <p><tt>cos(theta)*[[1,0],[0,1]] + i*sin(theta)*[[0,1],[1,0]]</tt></p>

-<script>
-from symmath import *
-</script>
  <text>Compute [mathjax] U = \exp\left( i \theta \left[ \begin{matrix} 0 &amp; 1 \\ 1 &amp; 0 \end{matrix} \right] \right) [/mathjax]
      and give the resulting \(2 \times 2\) matrix. <br/>
      Your input should be typed in as a list of lists, eg <tt>[[1,2],[3,4]]</tt>. <br/>
-       [mathjax]U=[/mathjax] <symbolicresponse cfn="symmath_check" answer="[[cos(theta),I*sin(theta)],[I*sin(theta),cos(theta)]]" options="matrix,imaginaryi" id="filenamedogi0VpEBOWedxsymmathresponse_1" state="unsubmitted">
+       [mathjax]U=[/mathjax] <symbolicresponse cfn="symmath_check" answer="[[cos(theta),i*sin(theta)],[i*sin(theta),cos(theta)]]" options="matrix,imaginary" id="filenamedogi0VpEBOWedxsymmathresponse_1" state="unsubmitted">
          <textline size="80" math="1" response_id="2" answer_id="1" id="filenamedogi0VpEBOWedxsymmathresponse_2_1"/>
        </symbolicresponse>
      <br/>
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -3,7 +3,9 @@ import datetime
 import hashlib
 import json
 import logging
+import os
 import traceback
+import struct
 import sys

 from pkg_resources import resource_string
@@ -23,8 +25,10 @@ from xmodule.util.date_utils import time_to_datetime
 log = logging.getLogger("mitx.courseware")


-# Generated this many different variants of problems with rerandomize=per_student
+# Generate this many different variants of problems with rerandomize=per_student
 NUM_RANDOMIZATION_BINS = 20
+# Never produce more than this many different seeds, no matter what.
+MAX_RANDOMIZATION_BINS = 1000


 def randomization_bin(seed, problem_id):
@@ -109,11 +113,7 @@ class CapaModule(CapaFields, XModule):
            self.close_date = due_date

        if self.seed is None:
-            if self.rerandomize == 'never':
-                self.seed = 1
-            elif self.rerandomize == "per_student" and hasattr(self.system, 'seed'):
-                # see comment on randomization_bin
-                self.seed = randomization_bin(system.seed, self.location.url)
+            self.choose_new_seed()

        # Need the problem location in openendedresponse to send out.  Adding
        # it to the system here seems like the least clunky way to get it
@@ -157,6 +157,22 @@ class CapaModule(CapaFields, XModule):

            self.set_state_from_lcp()

+        assert self.seed is not None
+
+    def choose_new_seed(self):
+        """Choose a new seed."""
+        if self.rerandomize == 'never':
+            self.seed = 1
+        elif self.rerandomize == "per_student" and hasattr(self.system, 'seed'):
+            # see comment on randomization_bin
+            self.seed = randomization_bin(self.system.seed, self.location.url)
+        else:
+            self.seed = struct.unpack('i', os.urandom(4))[0]
+
+            # So that sandboxed code execution can be cached, but still have an interesting
+            # number of possibilities, cap the number of different random seeds.
+            self.seed %= MAX_RANDOMIZATION_BINS
+
    def new_lcp(self, state, text=None):
        if text is None:
            text = self.data
@@ -165,6 +181,7 @@ class CapaModule(CapaFields, XModule):
            problem_text=text,
            id=self.location.html_id(),
            state=state,
+            seed=self.seed,
            system=self.system,
        )

@@ -832,14 +849,11 @@ class CapaModule(CapaFields, XModule):
                    'error': "Refresh the page and make an attempt before resetting."}

        if self.rerandomize in ["always", "onreset"]:
-            # reset random number generator seed (note the self.lcp.get_state()
-            # in next line)
-            seed = None
-        else:
-            seed = self.lcp.seed
+            # Reset random number generator seed.
+            self.choose_new_seed()

        # Generate a new problem with either the previous seed or a new seed
-        self.lcp = self.new_lcp({'seed': seed})
+        self.lcp = self.new_lcp(None)

        # Pull in the new problem seed
        self.set_state_from_lcp()
--- a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
+++ b/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
@@ -31,11 +31,11 @@ class ModuleStoreTestCase(TestCase):
    @staticmethod
    def load_templates_if_necessary():
        '''
-        Load templates into the modulestore only if they do not already exist.
+        Load templates into the direct modulestore only if they do not already exist.
        We need the templates, because they are copied to create
        XModules such as sections and problems
        '''
-        modulestore = xmodule.modulestore.django.modulestore()
+        modulestore = xmodule.modulestore.django.modulestore('direct')

        # Count the number of templates
        query = {"_id.course": "templates"}
--- a/common/lib/xmodule/xmodule/tests/init.py
+++ b/common/lib/xmodule/xmodule/tests/init.py
@@ -14,7 +14,7 @@ import fs.osfs

 import numpy

-import capa.calc as calc
+import calc
 import xmodule
 from xmodule.x_module import ModuleSystem
 from mock import Mock
@@ -33,15 +33,14 @@ def test_system():
    """
    Construct a test ModuleSystem instance.

-    By default, the render_template() method simply returns
-    the context it is passed as a string.
-    You can override this behavior by monkey patching:
+    By default, the render_template() method simply returns the context it is
+    passed as a string.  You can override this behavior by monkey patching::

-    system = test_system()
-    system.render_template = my_render_func
+        system = test_system()
+        system.render_template = my_render_func
+
+    where `my_render_func` is a function of the form my_render_func(template, context).

-    where my_render_func is a function of the form
-    my_render_func(template, context)
    """
    return ModuleSystem(
        ajax_url='courses/course_id/modx/a_location',
@@ -86,10 +85,12 @@ class ModelsTest(unittest.TestCase):
        self.assertTrue(abs(calc.evaluator(variables, functions, "e^(j*pi)") + 1) < 0.00001)
        self.assertTrue(abs(calc.evaluator(variables, functions, "j||1") - 0.5 - 0.5j) < 0.00001)
        variables['t'] = 1.0
+        # Use self.assertAlmostEqual here...
        self.assertTrue(abs(calc.evaluator(variables, functions, "t") - 1.0) < 0.00001)
        self.assertTrue(abs(calc.evaluator(variables, functions, "T") - 1.0) < 0.00001)
        self.assertTrue(abs(calc.evaluator(variables, functions, "t", cs=True) - 1.0) < 0.00001)
        self.assertTrue(abs(calc.evaluator(variables, functions, "T", cs=True) - 298) < 0.2)
+        # Use self.assertRaises here...
        exception_happened = False
        try:
            calc.evaluator({}, {}, "5+7 QWSEKO")
--- a/common/lib/xmodule/xmodule/tests/test_capa_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_capa_module.py
@@ -550,6 +550,7 @@ class CapaModuleTest(unittest.TestCase):
    def test_reset_problem(self):
        module = CapaFactory.create(done=True)
        module.new_lcp = Mock(wraps=module.new_lcp)
+        module.choose_new_seed = Mock(wraps=module.choose_new_seed)

        # Stub out HTML rendering
        with patch('xmodule.capa_module.CapaModule.get_problem_html') as mock_html:
@@ -567,7 +568,8 @@ class CapaModuleTest(unittest.TestCase):
        self.assertEqual(result['html'], "<div>Test HTML</div>")

        # Expect that the problem was reset
-        module.new_lcp.assert_called_once_with({'seed': None})
+        module.new_lcp.assert_called_once_with(None)
+        module.choose_new_seed.assert_called_once_with()

    def test_reset_problem_closed(self):
        module = CapaFactory.create()
@@ -1033,3 +1035,13 @@ class CapaModuleTest(unittest.TestCase):
                self.assertTrue(module.seed is not None)
                msg = 'Could not get a new seed from reset after 5 tries'
                self.assertTrue(success, msg)
+
+    def test_random_seed_bins(self):
+        # Assert that we are limiting the number of possible seeds.
+
+        # Check the conditions that generate random seeds
+        for rerandomize in ['always', 'per_student', 'true', 'onreset']:
+            # Get a bunch of seeds, they should all be in 0-999.
+            for i in range(200):
+                module = CapaFactory.create(rerandomize=rerandomize)
+                assert 0 <= module.seed < 1000
--- a/common/lib/xmodule/xmodule/tests/test_progress.py
+++ b/common/lib/xmodule/xmodule/tests/test_progress.py
@@ -134,6 +134,6 @@ class ModuleProgressTest(unittest.TestCase):
    '''
    def test_xmodule_default(self):
        '''Make sure default get_progress exists, returns None'''
-        xm = x_module.XModule(test_system, 'a://b/c/d/e', None, {})
+        xm = x_module.XModule(test_system(), 'a://b/c/d/e', None, {})
        p = xm.get_progress()
        self.assertEqual(p, None)
--- a/common/lib/xmodule/xmodule/tests/test_randomize_module.py
+++ b/common/lib/xmodule/xmodule/tests/test_randomize_module.py
@@ -14,7 +14,6 @@ START = '2013-01-01T01:00:00'


 from .test_course_module import DummySystem as DummyImportSystem
-from . import test_system


 class RandomizeModuleTestCase(unittest.TestCase):
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -737,7 +737,10 @@ class ModuleSystem(object):
                 anonymous_student_id='',
                 course_id=None,
                 open_ended_grading_interface=None,
-                 s3_interface=None):
+                 s3_interface=None,
+                 cache=None,
+                 can_execute_unsafe_code=None,
+                ):
        '''
        Create a closure around the system environment.

@@ -779,6 +782,14 @@ class ModuleSystem(object):

        xblock_model_data - A dict-like object containing the all data available to this
            xblock
+
+        cache - A cache object with two methods:
+            .get(key) returns an object from the cache or None.
+            .set(key, value, timeout_secs=None) stores a value in the cache with a timeout.
+
+        can_execute_unsafe_code - A function returning a boolean, whether or
+            not to allow the execution of unsafe, unsandboxed code.
+
        '''
        self.ajax_url = ajax_url
        self.xqueue = xqueue
@@ -803,6 +814,9 @@ class ModuleSystem(object):
        self.open_ended_grading_interface = open_ended_grading_interface
        self.s3_interface = s3_interface

+        self.cache = cache or DoNothingCache()
+        self.can_execute_unsafe_code = can_execute_unsafe_code or (lambda: False)
+
    def get(self, attr):
        '''	provide uniform access to attributes (like etree).'''
        return self.__dict__.get(attr)
@@ -816,3 +830,12 @@ class ModuleSystem(object):

    def __str__(self):
        return str(self.__dict__)
+
+
+class DoNothingCache(object):
+    """A duck-compatible object to use in ModuleSystem when there's no cache."""
+    def get(self, key):
+        return None
+
+    def set(self, key, value, timeout=None):
+        pass
--- a/common/static/coffee/spec/discussion/content_spec.coffee
+++ b/common/static/coffee/spec/discussion/content_spec.coffee
@@ -0,0 +1,66 @@
+describe 'All Content', ->
+    beforeEach ->
+        # TODO: figure out a better way of handling this
+        # It is set up in main.coffee DiscussionApp.start
+        window.$$course_id = 'mitX/999/test'
+        window.user = new DiscussionUser {id: '567'}
+
+    describe 'Content', ->
+        beforeEach ->
+            @content = new Content {
+                id: '01234567',
+                user_id: '567',
+                course_id: 'mitX/999/test',
+                body: 'this is some content',
+                abuse_flaggers: ['123']
+            }
+
+        it 'should exist', ->
+            expect(Content).toBeDefined()
+
+        it 'is initialized correctly', ->
+            @content.initialize
+            expect(Content.contents['01234567']).toEqual @content
+            expect(@content.get 'id').toEqual '01234567'
+            expect(@content.get 'user_url').toEqual '/courses/mitX/999/test/discussion/forum/users/567'
+            expect(@content.get 'children').toEqual []
+            expect(@content.get 'comments').toEqual(jasmine.any(Comments))
+
+        it 'can update info', ->
+            @content.updateInfo {
+                                ability: 'can_endorse',
+                                voted: true,
+                                subscribed: true
+                                }
+            expect(@content.get 'ability').toEqual 'can_endorse'
+            expect(@content.get 'voted').toEqual true
+            expect(@content.get 'subscribed').toEqual true
+
+        it 'can be flagged for abuse', ->
+            @content.flagAbuse()
+            expect(@content.get 'abuse_flaggers').toEqual ['123', '567']
+
+        it 'can be unflagged for abuse', ->
+            temp_array = []
+            temp_array.push(window.user.get('id'))
+            @content.set("abuse_flaggers",temp_array)
+            @content.unflagAbuse()
+            expect(@content.get 'abuse_flaggers').toEqual []
+
+    describe 'Comments', ->
+        beforeEach ->
+            @comment1 = new Comment {id: '123'}
+            @comment2 = new Comment {id: '345'}
+
+        it 'can contain multiple comments', ->
+            myComments = new Comments
+            expect(myComments.length).toEqual 0
+            myComments.add @comment1
+            expect(myComments.length).toEqual 1
+            myComments.add @comment2
+            expect(myComments.length).toEqual 2
+
+        it 'returns results to the find method', ->
+            myComments = new Comments
+            myComments.add @comment1
+            expect(myComments.find('123')).toBe @comment1
--- a/common/static/coffee/spec/discussion/view/discussion_content_view_spec.coffee
+++ b/common/static/coffee/spec/discussion/view/discussion_content_view_spec.coffee
@@ -0,0 +1,58 @@
+describe "DiscussionContentView", ->
+    beforeEach ->
+
+        setFixtures
+        (
+            """
+            <div class="discussion-post">
+                <header>
+                    <a data-tooltip="vote" data-role="discussion-vote" class="vote-btn discussion-vote discussion-vote-up" href="#">
+                    <span class="plus-icon">+</span> <span class="votes-count-number">0</span></a>
+                    <h1>Post Title</h1>
+                    <p class="posted-details">
+                        <a class="username" href="/courses/MITx/999/Robot_Super_Course/discussion/forum/users/1">robot</a>
+                        <span title="2013-05-08T17:34:07Z" class="timeago">less than a minute ago</span>
+                    </p>
+                </header>
+                <div class="post-body"><p>Post body.</p></div>
+                <div data-tooltip="Report Misuse" data-role="thread-flag" class="discussion-flag-abuse notflagged">
+                <i class="icon"></i><span class="flag-label">Report Misuse</span></div>
+                <div data-tooltip="pin this thread" data-role="thread-pin" class="admin-pin discussion-pin notpinned">
+                <i class="icon"></i><span class="pin-label">Pin Thread</span></div>
+            </div>
+            """
+        )
+
+        @thread = new Thread {
+                id: '01234567',
+                user_id: '567',
+                course_id: 'mitX/999/test',
+                body: 'this is a thread',
+                created_at: '2013-04-03T20:08:39Z',
+                abuse_flaggers: ['123']
+                roles: []
+        }
+        @view = new DiscussionContentView({ model: @thread })
+
+    it 'defines the tag', ->
+        expect($('#jasmine-fixtures')).toExist
+        expect(@view.tagName).toBeDefined
+        expect(@view.el.tagName.toLowerCase()).toBe 'div'
+
+    it "defines the class", ->
+        # spyOn @content, 'initialize'
+        expect(@view.model).toBeDefined();
+
+    it 'is tied to the model', ->
+        expect(@view.model).toBeDefined();
+
+    it 'can be flagged for abuse', ->
+            @thread.flagAbuse()
+            expect(@thread.get 'abuse_flaggers').toEqual ['123', '567']
+
+    it 'can be unflagged for abuse', ->
+        temp_array = []
+        temp_array.push(window.user.get('id'))
+        @thread.set("abuse_flaggers",temp_array)
+        @thread.unflagAbuse()
+        expect(@thread.get 'abuse_flaggers').toEqual []
--- a/common/static/coffee/spec/discussion/view/response_comment_show_view_spec.coffee
+++ b/common/static/coffee/spec/discussion/view/response_comment_show_view_spec.coffee
@@ -0,0 +1,62 @@
+describe 'ResponseCommentShowView', ->
+    beforeEach ->
+        # set up the container for the response to go in
+        setFixtures """
+        <ol class="responses"></ol>
+        <script id="response-comment-show-template" type="text/template">
+            <div id="comment_<%- id %>">
+            <div class="response-body"><%- body %></div>
+            <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="report misuse">
+            <i class="icon"></i><span class="flag-label"></span></div>
+            <p class="posted-details">&ndash;posted <span class="timeago" title="<%- created_at %>"><%- created_at %></span> by
+            <% if (obj.username) { %>
+            <a href="<%- user_url %>" class="profile-link"><%- username %></a>
+            <% } else {print('anonymous');} %>
+            </p>
+            </div>
+        </script>
+        """
+
+        # set up a model for a new Comment
+        @response = new Comment {
+                id: '01234567',
+                user_id: '567',
+                course_id: 'mitX/999/test',
+                body: 'this is a response',
+                created_at: '2013-04-03T20:08:39Z',
+                abuse_flaggers: ['123']
+                roles: []
+        }
+        @view = new ResponseCommentShowView({ model: @response })
+
+        # spyOn(DiscussionUtil, 'loadRoles').andReturn []
+
+    it 'defines the tag', ->
+        expect($('#jasmine-fixtures')).toExist
+        expect(@view.tagName).toBeDefined
+        expect(@view.el.tagName.toLowerCase()).toBe 'li'
+
+    it 'is tied to the model', ->
+        expect(@view.model).toBeDefined();
+
+    describe 'rendering', ->
+
+        beforeEach ->
+            spyOn(@view, 'renderAttrs')
+            spyOn(@view, 'markAsStaff')
+            spyOn(@view, 'convertMath')
+
+        it 'produces the correct HTML', ->
+            @view.render()
+            expect(@view.el.innerHTML).toContain('"discussion-flag-abuse notflagged"')
+
+        it 'can be flagged for abuse', ->
+            @response.flagAbuse()
+            expect(@response.get 'abuse_flaggers').toEqual ['123', '567']
+
+        it 'can be unflagged for abuse', ->
+            temp_array = []
+            temp_array.push(window.user.get('id'))
+            @response.set("abuse_flaggers",temp_array)
+            @response.unflagAbuse()
+            expect(@response.get 'abuse_flaggers').toEqual []
--- a/common/static/coffee/spec/logger_spec.coffee
+++ b/common/static/coffee/spec/logger_spec.coffee
@@ -1,6 +1,5 @@
 describe 'Logger', ->
  it 'expose window.log_event', ->
-    jasmine.stubRequests()
    expect(window.log_event).toBe Logger.log

  describe 'log', ->
@@ -12,7 +11,8 @@ describe 'Logger', ->
        event: '"data"'
        page: window.location.href

-  describe 'bind', ->
+  # Broken with commit 9f75e64? Skipping for now.
+  xdescribe 'bind', ->
    beforeEach ->
      Logger.bind()
      Courseware.prefix = '/6002x'
--- a/common/static/coffee/src/discussion/content.coffee
+++ b/common/static/coffee/src/discussion/content.coffee
@@ -88,20 +88,32 @@ if Backbone?
      pinned = @get("pinned")
      @set("pinned",pinned)
      @trigger "change", @
+    
+    flagAbuse: ->
+      temp_array = @get("abuse_flaggers")
+      temp_array.push(window.user.get('id'))
+      @set("abuse_flaggers",temp_array)
+      @trigger "change", @

+    unflagAbuse: ->
+      @get("abuse_flaggers").pop(window.user.get('id'))
+      @trigger "change", @

+    
  class @Thread extends @Content
    urlMappers:
-      'retrieve' : -> DiscussionUtil.urlFor('retrieve_single_thread', @discussion.id, @id)
-      'reply'    : -> DiscussionUtil.urlFor('create_comment', @id)
-      'unvote'   : -> DiscussionUtil.urlFor("undo_vote_for_#{@get('type')}", @id)
-      'upvote'   : -> DiscussionUtil.urlFor("upvote_#{@get('type')}", @id)
-      'downvote' : -> DiscussionUtil.urlFor("downvote_#{@get('type')}", @id)
-      'close'    : -> DiscussionUtil.urlFor('openclose_thread', @id)
-      'update'   : -> DiscussionUtil.urlFor('update_thread', @id)
-      'delete'   : -> DiscussionUtil.urlFor('delete_thread', @id)
-      'follow'   : -> DiscussionUtil.urlFor('follow_thread', @id)
-      'unfollow' : -> DiscussionUtil.urlFor('unfollow_thread', @id)
+      'retrieve'    : -> DiscussionUtil.urlFor('retrieve_single_thread', @discussion.id, @id)
+      'reply'       : -> DiscussionUtil.urlFor('create_comment', @id)
+      'unvote'      : -> DiscussionUtil.urlFor("undo_vote_for_#{@get('type')}", @id)
+      'upvote'      : -> DiscussionUtil.urlFor("upvote_#{@get('type')}", @id)
+      'downvote'    : -> DiscussionUtil.urlFor("downvote_#{@get('type')}", @id)
+      'close'       : -> DiscussionUtil.urlFor('openclose_thread', @id)
+      'update'      : -> DiscussionUtil.urlFor('update_thread', @id)
+      'delete'      : -> DiscussionUtil.urlFor('delete_thread', @id)
+      'follow'      : -> DiscussionUtil.urlFor('follow_thread', @id)
+      'unfollow'    : -> DiscussionUtil.urlFor('unfollow_thread', @id)
+      'flagAbuse'   : -> DiscussionUtil.urlFor("flagAbuse_#{@get('type')}", @id)
+      'unFlagAbuse' : -> DiscussionUtil.urlFor("unFlagAbuse_#{@get('type')}", @id)
      'pinThread'   : -> DiscussionUtil.urlFor("pin_thread", @id)
      'unPinThread' : -> DiscussionUtil.urlFor("un_pin_thread", @id)

@@ -157,6 +169,8 @@ if Backbone?
      'endorse': -> DiscussionUtil.urlFor('endorse_comment', @id)
      'update': -> DiscussionUtil.urlFor('update_comment', @id)
      'delete': -> DiscussionUtil.urlFor('delete_comment', @id)
+      'flagAbuse'   : -> DiscussionUtil.urlFor("flagAbuse_#{@get('type')}", @id)
+      'unFlagAbuse' : -> DiscussionUtil.urlFor("unFlagAbuse_#{@get('type')}", @id)

    getCommentsCount: ->
      count = 0
--- a/common/static/coffee/src/discussion/discussion.coffee
+++ b/common/static/coffee/src/discussion/discussion.coffee
@@ -37,6 +37,9 @@ if Backbone?
          data['commentable_ids'] = options.commentable_ids
        when 'all'
          url = DiscussionUtil.urlFor 'threads'
+        when 'flagged'
+          data['flagged'] = true
+          url = DiscussionUtil.urlFor 'search'
        when 'followed'
          url = DiscussionUtil.urlFor 'followed_threads', options.user_id
      if options['group_id']
--- a/common/static/coffee/src/discussion/utils.coffee
+++ b/common/static/coffee/src/discussion/utils.coffee
@@ -18,8 +18,12 @@ class @DiscussionUtil
  @loadRoles: (roles)->
    @roleIds = roles

+  @loadFlagModerator: (what)->
+    @isFlagModerator = ((what=="True") or (what == 1))
+
  @loadRolesFromContainer: ->
    @loadRoles($("#discussion-container").data("roles"))
+    @loadFlagModerator($("#discussion-container").data("flag-moderator"))

  @isStaff: (user_id) ->
    staff = _.union(@roleIds['Staff'], @roleIds['Moderator'], @roleIds['Administrator'])
@@ -48,9 +52,13 @@ class @DiscussionUtil
      update_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/update"
      create_comment          : "/courses/#{$$course_id}/discussion/threads/#{param}/reply"
      delete_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/delete"
+      flagAbuse_thread        : "/courses/#{$$course_id}/discussion/threads/#{param}/flagAbuse"
+      unFlagAbuse_thread      : "/courses/#{$$course_id}/discussion/threads/#{param}/unFlagAbuse"
+      flagAbuse_comment       : "/courses/#{$$course_id}/discussion/comments/#{param}/flagAbuse"
+      unFlagAbuse_comment     : "/courses/#{$$course_id}/discussion/comments/#{param}/unFlagAbuse"
      upvote_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/upvote"
      downvote_thread         : "/courses/#{$$course_id}/discussion/threads/#{param}/downvote"
-      pin_thread              : "/courses/#{$$course_id}/discussion/threads/#{param}/pin"   
+      pin_thread              : "/courses/#{$$course_id}/discussion/threads/#{param}/pin"
      un_pin_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/unpin"
      undo_vote_for_thread    : "/courses/#{$$course_id}/discussion/threads/#{param}/unvote"
      follow_thread           : "/courses/#{$$course_id}/discussion/threads/#{param}/follow"
@@ -72,7 +80,7 @@ class @DiscussionUtil
      permanent_link_thread   : "/courses/#{$$course_id}/discussion/forum/#{param}/threads/#{param1}"
      permanent_link_comment  : "/courses/#{$$course_id}/discussion/forum/#{param}/threads/#{param1}##{param2}"
      user_profile            : "/courses/#{$$course_id}/discussion/forum/users/#{param}"
-      followed_threads       : "/courses/#{$$course_id}/discussion/forum/users/#{param}/followed"
+      followed_threads        : "/courses/#{$$course_id}/discussion/forum/users/#{param}/followed"
      threads                 : "/courses/#{$$course_id}/discussion/forum"
    }[name]

--- a/common/static/coffee/src/discussion/views/discussion_content_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_content_view.coffee
@@ -1,6 +1,11 @@
 if Backbone?
  class @DiscussionContentView extends Backbone.View

+  
+    events:
+      "click .discussion-flag-abuse": "toggleFlagAbuse"
+  
+  
    attrRenderer:
      endorsed: (endorsed) ->
        if endorsed
@@ -94,7 +99,48 @@ if Backbone?

    setWmdContent: (cls_identifier, text) =>
      DiscussionUtil.setWmdContent @$el, $.proxy(@$, @), cls_identifier, text
+      

    initialize: ->
      @initLocal()
      @model.bind('change', @renderPartialAttrs, @)
+      
+     
+     
+    toggleFlagAbuse: (event) ->
+      event.preventDefault()
+      if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
+        @unFlagAbuse()
+      else
+        @flagAbuse()
+      
+    flagAbuse: ->
+      url = @model.urlFor("flagAbuse")
+      DiscussionUtil.safeAjax
+        $elem: @$(".discussion-flag-abuse")
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+          if textStatus == 'success'
+            ###
+            note, we have to clone the array in order to trigger a change event
+            ###
+            temp_array = _.clone(@model.get('abuse_flaggers'));
+            temp_array.push(window.user.id)
+            @model.set('abuse_flaggers', temp_array)      
+       
+    unFlagAbuse: ->
+      url = @model.urlFor("unFlagAbuse")
+      DiscussionUtil.safeAjax
+        $elem: @$(".discussion-flag-abuse")
+        url: url
+        type: "POST"
+        success: (response, textStatus) =>
+          if textStatus == 'success'
+            temp_array = _.clone(@model.get('abuse_flaggers'));
+            temp_array.pop(window.user.id)
+            # if you're an admin, clear this
+            if DiscussionUtil.isFlagModerator
+                temp_array = []
+
+            @model.set('abuse_flaggers', temp_array)         
--- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
@@ -276,6 +276,11 @@ if Backbone?
          @$(".post-search-field").val("")
          @$('.cohort').show()                    
          @retrieveAllThreads()
+        else if discussionId == "#flagged"
+          @discussionIds = ""
+          @$(".post-search-field").val("")
+          @$('.cohort').hide() 
+          @retrieveFlaggedThreads() 
        else if discussionId == "#following"
          @retrieveFollowed(event)
          @$('.cohort').hide()
@@ -321,6 +326,12 @@ if Backbone?
      @collection.reset()
      @loadMorePages(event)

+    retrieveFlaggedThreads: (event)->
+      @collection.current_page = 0
+      @collection.reset()
+      @mode = 'flagged'
+      @loadMorePages(event)
+
    sortThreads: (event) ->
      @$(".sort-bar a").removeClass("active")
      $(event.target).addClass("active")
--- a/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
@@ -3,6 +3,7 @@ if Backbone?

    events:
      "click .discussion-vote": "toggleVote"
+      "click .discussion-flag-abuse": "toggleFlagAbuse"
      "click .admin-pin": "togglePin"
      "click .action-follow": "toggleFollowing"
      "click .action-edit": "edit"
@@ -25,6 +26,7 @@ if Backbone?
      @delegateEvents()
      @renderDogear()
      @renderVoted()
+      @renderFlagged()
      @renderPinned()
      @renderAttrs()
      @$("span.timeago").timeago()
@@ -42,6 +44,16 @@ if Backbone?
        @$("[data-role=discussion-vote]").addClass("is-cast")
      else
        @$("[data-role=discussion-vote]").removeClass("is-cast")
+        
+    renderFlagged: =>
+      if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
+        @$("[data-role=thread-flag]").addClass("flagged")  
+        @$("[data-role=thread-flag]").removeClass("notflagged")
+        @$(".discussion-flag-abuse .flag-label").html("Misuse Reported")
+      else
+        @$("[data-role=thread-flag]").removeClass("flagged")  
+        @$("[data-role=thread-flag]").addClass("notflagged")      
+        @$(".discussion-flag-abuse .flag-label").html("Report Misuse")

    renderPinned: =>
      if @model.get("pinned")
@@ -56,6 +68,7 @@ if Backbone?

    updateModelDetails: =>
      @renderVoted()
+      @renderFlagged()
      @renderPinned()
      @$("[data-role=discussion-vote] .votes-count-number").html(@model.get("votes")["up_count"])

@@ -96,6 +109,7 @@ if Backbone?
          if textStatus == 'success'
            @model.set(response, {silent: true})

+
    unvote: ->
      window.user.unvote(@model)
      url = @model.urlFor("unvote")
@@ -107,6 +121,7 @@ if Backbone?
          if textStatus == 'success'
            @model.set(response, {silent: true})

+
    edit: (event) ->
      @trigger "thread:edit", event

@@ -182,4 +197,4 @@ if Backbone?
        params = $.extend(params, user:{username: @model.username, user_url: @model.user_url})
      Mustache.render(@template, params)

-     
+     
--- a/common/static/coffee/src/discussion/views/discussion_thread_view.coffee
+++ b/common/static/coffee/src/discussion/views/discussion_thread_view.coffee
@@ -91,7 +91,7 @@ if Backbone?
      body = @getWmdContent("reply-body")
      return if not body.trim().length
      @setWmdContent("reply-body", "")
-      comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), votes: { up_count: 0 }, endorsed: false, user_id: window.user.get("id"))
+      comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), votes: { up_count: 0 }, abuse_flaggers:[], endorsed: false, user_id: window.user.get("id"))
      comment.set('thread', @model.get('thread'))
      @renderResponse(comment)
      @model.addComment()
--- a/common/static/coffee/src/discussion/views/response_comment_show_view.coffee
+++ b/common/static/coffee/src/discussion/views/response_comment_show_view.coffee
@@ -1,8 +1,15 @@
 if Backbone?
  class @ResponseCommentShowView extends DiscussionContentView

+    events:
+      "click .discussion-flag-abuse": "toggleFlagAbuse"
+
    tagName: "li"

+    initialize: ->
+        super()
+        @model.on "change", @updateModelDetails
+
    render: ->
      @template = _.template($("#response-comment-show-template").html())
      params = @model.toJSON()
@@ -11,6 +18,7 @@ if Backbone?
      @initLocal()
      @delegateEvents()
      @renderAttrs()
+      @renderFlagged()
      @markAsStaff()
      @$el.find(".timeago").timeago()
      @convertMath()
@@ -34,3 +42,17 @@ if Backbone?
        @$el.find("a.profile-link").after('<span class="staff-label">staff</span>')
      else if DiscussionUtil.isTA(@model.get("user_id"))
        @$el.find("a.profile-link").after('<span class="community-ta-label">Community&nbsp;&nbsp;TA</span>')
+
+
+    renderFlagged: =>
+      if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
+        @$("[data-role=thread-flag]").addClass("flagged")
+        @$("[data-role=thread-flag]").removeClass("notflagged")
+      else
+        @$("[data-role=thread-flag]").removeClass("flagged")
+        @$("[data-role=thread-flag]").addClass("notflagged")
+
+    updateModelDetails: =>
+      @renderFlagged()
+
+
--- a/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
+++ b/common/static/coffee/src/discussion/views/thread_response_show_view.coffee
@@ -5,6 +5,7 @@ if Backbone?
        "click .action-endorse": "toggleEndorse"
        "click .action-delete": "delete"
        "click .action-edit": "edit"
+        "click .discussion-flag-abuse": "toggleFlagAbuse"

    $: (selector) ->
        @$el.find(selector)
@@ -23,6 +24,7 @@ if Backbone?
      if window.user.voted(@model)
        @$(".vote-btn").addClass("is-cast")
      @renderAttrs()
+      @renderFlagged()
      @$el.find(".posted-details").timeago()
      @convertMath()
      @markAsStaff()
@@ -70,6 +72,7 @@ if Backbone?
        success: (response, textStatus) =>
          if textStatus == 'success'
            @model.set(response)
+            

    edit: (event) ->
        @trigger "response:edit", event
@@ -92,3 +95,17 @@ if Backbone?
        url: url
        data: data
        type: "POST"
+
+            
+    renderFlagged: =>
+      if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
+        @$("[data-role=thread-flag]").addClass("flagged")  
+        @$("[data-role=thread-flag]").removeClass("notflagged")
+        @$(".discussion-flag-abuse .flag-label").html("Misuse Reported")
+      else
+        @$("[data-role=thread-flag]").removeClass("flagged")  
+        @$("[data-role=thread-flag]").addClass("notflagged")      
+        @$(".discussion-flag-abuse .flag-label").html("Report Misuse")   
+        
+    updateModelDetails: =>
+      @renderFlagged()
--- a/common/static/coffee/src/discussion/views/thread_response_view.coffee
+++ b/common/static/coffee/src/discussion/views/thread_response_view.coffee
@@ -77,7 +77,7 @@ if Backbone?
      body = @getWmdContent("comment-body")
      return if not body.trim().length
      @setWmdContent("comment-body", "")
-      comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), user_id: window.user.get("id"), id:"unsaved")
+      comment = new Comment(body: body, created_at: (new Date()).toISOString(), username: window.user.get("username"), abuse_flaggers:[], user_id: window.user.get("id"), id:"unsaved")
      view = @renderComment(comment)
      @hideEditorChrome()
      @trigger "comment:add", comment
--- a/common/static/js/vendor/flot/jquery.timeago.js
+++ b/common/static/js/vendor/flot/jquery.timeago.js
@@ -0,0 +1,152 @@
+/**
+ * Timeago is a jQuery plugin that makes it easy to support automatically
+ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
+ *
+ * @name timeago
+ * @version 0.11.4
+ * @requires jQuery v1.2.3+
+ * @author Ryan McGeary
+ * @license MIT License - http://www.opensource.org/licenses/mit-license.php
+ *
+ * For usage and examples, visit:
+ * http://timeago.yarp.com/
+ *
+ * Copyright (c) 2008-2012, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
+ */
+(function($) {
+  $.timeago = function(timestamp) {
+    if (timestamp instanceof Date) {
+      return inWords(timestamp);
+    } else if (typeof timestamp === "string") {
+      return inWords($.timeago.parse(timestamp));
+    } else if (typeof timestamp === "number") {
+      return inWords(new Date(timestamp));
+    } else {
+      return inWords($.timeago.datetime(timestamp));
+    }
+  };
+  var $t = $.timeago;
+
+  $.extend($.timeago, {
+    settings: {
+      refreshMillis: 60000,
+      allowFuture: false,
+      strings: {
+        prefixAgo: null,
+        prefixFromNow: null,
+        suffixAgo: "ago",
+        suffixFromNow: "from now",
+        seconds: "less than a minute",
+        minute: "about a minute",
+        minutes: "%d minutes",
+        hour: "about an hour",
+        hours: "about %d hours",
+        day: "a day",
+        days: "%d days",
+        month: "about a month",
+        months: "%d months",
+        year: "about a year",
+        years: "%d years",
+        wordSeparator: " ",
+        numbers: []
+      }
+    },
+    inWords: function(distanceMillis) {
+      var $l = this.settings.strings;
+      var prefix = $l.prefixAgo;
+      var suffix = $l.suffixAgo;
+      if (this.settings.allowFuture) {
+        if (distanceMillis < 0) {
+          prefix = $l.prefixFromNow;
+          suffix = $l.suffixFromNow;
+        }
+      }
+
+      var seconds = Math.abs(distanceMillis) / 1000;
+      var minutes = seconds / 60;
+      var hours = minutes / 60;
+      var days = hours / 24;
+      var years = days / 365;
+
+      function substitute(stringOrFunction, number) {
+        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        var value = ($l.numbers && $l.numbers[number]) || number;
+        return string.replace(/%d/i, value);
+      }
+
+      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+        seconds < 90 && substitute($l.minute, 1) ||
+        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
+        minutes < 90 && substitute($l.hour, 1) ||
+        hours < 24 && substitute($l.hours, Math.round(hours)) ||
+        hours < 42 && substitute($l.day, 1) ||
+        days < 30 && substitute($l.days, Math.round(days)) ||
+        days < 45 && substitute($l.month, 1) ||
+        days < 365 && substitute($l.months, Math.round(days / 30)) ||
+        years < 1.5 && substitute($l.year, 1) ||
+        substitute($l.years, Math.round(years));
+
+      var separator = $l.wordSeparator === undefined ?  " " : $l.wordSeparator;
+      return $.trim([prefix, words, suffix].join(separator));
+    },
+    parse: function(iso8601) {
+      var s = $.trim(iso8601);
+      s = s.replace(/\.\d+/,""); // remove milliseconds
+      s = s.replace(/-/,"/").replace(/-/,"/");
+      s = s.replace(/T/," ").replace(/Z/," UTC");
+      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
+      return new Date(s);
+    },
+    datetime: function(elem) {
+      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
+      return $t.parse(iso8601);
+    },
+    isTime: function(elem) {
+      // jQuery's `is()` doesn't play well with HTML5 in IE
+      return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
+    }
+  });
+
+  $.fn.timeago = function() {
+    var self = this;
+    self.each(refresh);
+
+    var $s = $t.settings;
+    if ($s.refreshMillis > 0) {
+      setInterval(function() { self.each(refresh); }, $s.refreshMillis);
+    }
+    return self;
+  };
+
+  function refresh() {
+    var data = prepareData(this);
+    if (!isNaN(data.datetime)) {
+      $(this).text(inWords(data.datetime));
+    }
+    return this;
+  }
+
+  function prepareData(element) {
+    element = $(element);
+    if (!element.data("timeago")) {
+      element.data("timeago", { datetime: $t.datetime(element) });
+      var text = $.trim(element.text());
+      if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
+        element.attr("title", text);
+      }
+    }
+    return element.data("timeago");
+  }
+
+  function inWords(date) {
+    return $t.inWords(distance(date));
+  }
+
+  function distance(date) {
+    return (new Date().getTime() - date.getTime());
+  }
+
+  // fix for IE6 suckage
+  document.createElement("abbr");
+  document.createElement("time");
+}(jQuery));
--- a/common/static/js/vendor/jquery.timeago.js
+++ b/common/static/js/vendor/jquery.timeago.js
@@ -0,0 +1,152 @@
+/**
+ * Timeago is a jQuery plugin that makes it easy to support automatically
+ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
+ *
+ * @name timeago
+ * @version 0.11.4
+ * @requires jQuery v1.2.3+
+ * @author Ryan McGeary
+ * @license MIT License - http://www.opensource.org/licenses/mit-license.php
+ *
+ * For usage and examples, visit:
+ * http://timeago.yarp.com/
+ *
+ * Copyright (c) 2008-2012, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
+ */
+(function($) {
+  $.timeago = function(timestamp) {
+    if (timestamp instanceof Date) {
+      return inWords(timestamp);
+    } else if (typeof timestamp === "string") {
+      return inWords($.timeago.parse(timestamp));
+    } else if (typeof timestamp === "number") {
+      return inWords(new Date(timestamp));
+    } else {
+      return inWords($.timeago.datetime(timestamp));
+    }
+  };
+  var $t = $.timeago;
+
+  $.extend($.timeago, {
+    settings: {
+      refreshMillis: 60000,
+      allowFuture: false,
+      strings: {
+        prefixAgo: null,
+        prefixFromNow: null,
+        suffixAgo: "ago",
+        suffixFromNow: "from now",
+        seconds: "less than a minute",
+        minute: "about a minute",
+        minutes: "%d minutes",
+        hour: "about an hour",
+        hours: "about %d hours",
+        day: "a day",
+        days: "%d days",
+        month: "about a month",
+        months: "%d months",
+        year: "about a year",
+        years: "%d years",
+        wordSeparator: " ",
+        numbers: []
+      }
+    },
+    inWords: function(distanceMillis) {
+      var $l = this.settings.strings;
+      var prefix = $l.prefixAgo;
+      var suffix = $l.suffixAgo;
+      if (this.settings.allowFuture) {
+        if (distanceMillis < 0) {
+          prefix = $l.prefixFromNow;
+          suffix = $l.suffixFromNow;
+        }
+      }
+
+      var seconds = Math.abs(distanceMillis) / 1000;
+      var minutes = seconds / 60;
+      var hours = minutes / 60;
+      var days = hours / 24;
+      var years = days / 365;
+
+      function substitute(stringOrFunction, number) {
+        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        var value = ($l.numbers && $l.numbers[number]) || number;
+        return string.replace(/%d/i, value);
+      }
+
+      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+        seconds < 90 && substitute($l.minute, 1) ||
+        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
+        minutes < 90 && substitute($l.hour, 1) ||
+        hours < 24 && substitute($l.hours, Math.round(hours)) ||
+        hours < 42 && substitute($l.day, 1) ||
+        days < 30 && substitute($l.days, Math.round(days)) ||
+        days < 45 && substitute($l.month, 1) ||
+        days < 365 && substitute($l.months, Math.round(days / 30)) ||
+        years < 1.5 && substitute($l.year, 1) ||
+        substitute($l.years, Math.round(years));
+
+      var separator = $l.wordSeparator === undefined ?  " " : $l.wordSeparator;
+      return $.trim([prefix, words, suffix].join(separator));
+    },
+    parse: function(iso8601) {
+      var s = $.trim(iso8601);
+      s = s.replace(/\.\d+/,""); // remove milliseconds
+      s = s.replace(/-/,"/").replace(/-/,"/");
+      s = s.replace(/T/," ").replace(/Z/," UTC");
+      s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
+      return new Date(s);
+    },
+    datetime: function(elem) {
+      var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
+      return $t.parse(iso8601);
+    },
+    isTime: function(elem) {
+      // jQuery's `is()` doesn't play well with HTML5 in IE
+      return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
+    }
+  });
+
+  $.fn.timeago = function() {
+    var self = this;
+    self.each(refresh);
+
+    var $s = $t.settings;
+    if ($s.refreshMillis > 0) {
+      setInterval(function() { self.each(refresh); }, $s.refreshMillis);
+    }
+    return self;
+  };
+
+  function refresh() {
+    var data = prepareData(this);
+    if (!isNaN(data.datetime)) {
+      $(this).text(inWords(data.datetime));
+    }
+    return this;
+  }
+
+  function prepareData(element) {
+    element = $(element);
+    if (!element.data("timeago")) {
+      element.data("timeago", { datetime: $t.datetime(element) });
+      var text = $.trim(element.text());
+      if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
+        element.attr("title", text);
+      }
+    }
+    return element.data("timeago");
+  }
+
+  function inWords(date) {
+    return $t.inWords(distance(date));
+  }
+
+  function distance(date) {
+    return (new Date().getTime() - date.getTime());
+  }
+
+  // fix for IE6 suckage
+  document.createElement("abbr");
+  document.createElement("time");
+}(jQuery));
--- a/common/templates/jasmine/jasmine_test_runner.html.erb
+++ b/common/templates/jasmine/jasmine_test_runner.html.erb
@@ -10,14 +10,21 @@
  <script type="text/javascript" src="<%= phantom_jasmine_path %>/lib/console-runner.js"></script>
  <script type="text/javascript" src="<%= common_coffee_root %>/ajax_prefix.js"></script>
  <script type="text/javascript" src="<%= common_coffee_root %>/logger.js"></script>
-  <script type="text/javascript" src="<%= common_js_root %>/vendor/jquery.min.js"></script>
  <script type="text/javascript" src="<%= common_js_root %>/vendor/jasmine-jquery.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/RequireJS.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/jquery.min.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/jquery-ui.min.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/jquery.ui.draggable.js"></script>
  <script type="text/javascript" src="<%= common_js_root %>/vendor/jquery.cookie.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/json2.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/underscore-min.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/backbone-min.js"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/jquery.leanModal.min.js"></script>
  <script type="text/javascript" src="<%= common_js_root %>/vendor/CodeMirror/codemirror.js"></script>
  <script type="text/javascript" src="<%= common_js_root %>/vendor/tiny_mce/jquery.tinymce.js"></script>
  <script type="text/javascript" src="<%= common_js_root %>/vendor/tiny_mce/tiny_mce.js"></script>
-  <script type="text/javascript" src="<%= common_js_root %>/vendor/RequireJS.js"></script>
-
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/mathjax-MathJax-c9db6ac/MathJax.js?config=default"></script>
+  <script type="text/javascript" src="<%= common_js_root %>/vendor/jquery.timeago.js"></script>
  <script type="text/javascript">
    AjaxPrefix.addAjaxPrefix(jQuery, function() {
       return "";
@@ -37,10 +44,30 @@
 <body>

 <script type="text/javascript">
+  var jasmineEnv = jasmine.getEnv();
+
+  var htmlReporter = new jasmine.HtmlReporter();
  var console_reporter = new jasmine.ConsoleReporter()
-  jasmine.getEnv().addReporter(new jasmine.TrivialReporter());
-  jasmine.getEnv().addReporter(console_reporter);
-  jasmine.getEnv().execute();
+
+  jasmineEnv.addReporter(htmlReporter);
+  jasmineEnv.addReporter(console_reporter);
+
+  jasmineEnv.specFilter = function(spec) {
+    return htmlReporter.specFilter(spec);
+  };
+
+  var currentWindowOnload = window.onload;
+
+  window.onload = function() {
+    if (currentWindowOnload) {
+      currentWindowOnload();
+    }
+    execJasmine();
+  };
+
+  function execJasmine() {
+    jasmineEnv.execute();
+  }
 </script>

 </body>
--- a/common/test/data/embedded_python/course.xml
+++ b/common/test/data/embedded_python/course.xml
@@ -0,0 +1 @@
+<course org="edX" course="embedded_python" url_name="2013_Spring"/>
--- a/common/test/data/embedded_python/course/2013_Spring.xml
+++ b/common/test/data/embedded_python/course/2013_Spring.xml
@@ -0,0 +1,111 @@
+<course>
+  <chapter url_name="EmbeddedPythonChapter">
+
+    <vertical url_name="Homework1">
+      <problem url_name="schematic_problem">
+          <schematicresponse>
+            <center>
+                <schematic height="500" width="600" parts="g,n,s" analyses="dc,tran"
+                    submit_analyses="{&quot;tran&quot;:[[&quot;Z&quot;,0.0000004,0.0000009,0.0000014,0.0000019,0.0000024,0.0000029,0.0000034,0.000039]]}" 
+                    initial_value="[[&quot;w&quot;,[112,96,128,96]],[&quot;w&quot;,[256,96,240,96]],[&quot;w&quot;,[192,96,240,96]],[&quot;s&quot;,[240,96,0],{&quot;color&quot;:&quot;cyan&quot;,&quot;offset&quot;:&quot;&quot;,&quot;plot offset&quot;:&quot;0&quot;,&quot;_json_&quot;:3},[&quot;Z&quot;]],[&quot;w&quot;,[32,224,192,224]],[&quot;w&quot;,[96,48,192,48]],[&quot;L&quot;,[256,96,3],{&quot;label&quot;:&quot;Z&quot;,&quot;_json_&quot;:6},[&quot;Z&quot;]],[&quot;r&quot;,[192,48,0],{&quot;name&quot;:&quot;Rpullup&quot;,&quot;r&quot;:&quot;10K&quot;,&quot;_json_&quot;:7},[&quot;1&quot;,&quot;Z&quot;]],[&quot;w&quot;,[32,144,32,192]],[&quot;w&quot;,[32,224,32,192]],[&quot;w&quot;,[48,192,32,192]],[&quot;w&quot;,[32,96,32,144]],[&quot;w&quot;,[48,144,32,144]],[&quot;w&quot;,[32,48,32,96]],[&quot;w&quot;,[48,96,32,96]],[&quot;w&quot;,[32,48,48,48]],[&quot;g&quot;,[32,224,0],{&quot;_json_&quot;:16},[&quot;0&quot;]],[&quot;v&quot;,[96,192,1],{&quot;name&quot;:&quot;VC&quot;,&quot;value&quot;:&quot;square(3,0,250K)&quot;,&quot;_json_&quot;:17},[&quot;C&quot;,&quot;0&quot;]],[&quot;v&quot;,[96,144,1],{&quot;name&quot;:&quot;VB&quot;,&quot;value&quot;:&quot;square(3,0,500K)&quot;,&quot;_json_&quot;:18},[&quot;B&quot;,&quot;0&quot;]],[&quot;v&quot;,[96,96,1],{&quot;name&quot;:&quot;VA&quot;,&quot;value&quot;:&quot;square(3,0,1000K)&quot;,&quot;_json_&quot;:19},[&quot;A&quot;,&quot;0&quot;]],[&quot;v&quot;,[96,48,1],{&quot;name&quot;:&quot;Vpwr&quot;,&quot;value&quot;:&quot;dc(3)&quot;,&quot;_json_&quot;:20},[&quot;1&quot;,&quot;0&quot;]],[&quot;L&quot;,[96,96,2],{&quot;label&quot;:&quot;A&quot;,&quot;_json_&quot;:21},[&quot;A&quot;]],[&quot;w&quot;,[96,96,104,96]],[&quot;L&quot;,[96,144,2],{&quot;label&quot;:&quot;B&quot;,&quot;_json_&quot;:23},[&quot;B&quot;]],[&quot;w&quot;,[96,144,104,144]],[&quot;L&quot;,[96,192,2],{&quot;label&quot;:&quot;C&quot;,&quot;_json_&quot;:25},[&quot;C&quot;]],[&quot;w&quot;,[96,192,104,192]],[&quot;w&quot;,[192,96,192,112]],[&quot;s&quot;,[112,96,0],{&quot;color&quot;:&quot;red&quot;,&quot;offset&quot;:&quot;15&quot;,&quot;plot offset&quot;:&quot;0&quot;,&quot;_json_&quot;:28},[&quot;A&quot;]],[&quot;w&quot;,[104,96,112,96]],[&quot;s&quot;,[112,144,0],{&quot;color&quot;:&quot;green&quot;,&quot;offset&quot;:&quot;10&quot;,&quot;plot offset&quot;:&quot;0&quot;,&quot;_json_&quot;:30},[&quot;B&quot;]],[&quot;w&quot;,[104,144,112,144]],[&quot;w&quot;,[128,144,112,144]],[&quot;s&quot;,[112,192,0],{&quot;color&quot;:&quot;blue&quot;,&quot;offset&quot;:&quot;5&quot;,&quot;plot offset&quot;:&quot;0&quot;,&quot;_json_&quot;:33},[&quot;C&quot;]],[&quot;w&quot;,[104,192,112,192]],[&quot;w&quot;,[128,192,112,192]],[&quot;view&quot;,0,0,2,&quot;5&quot;,&quot;10&quot;,&quot;10MEG&quot;,null,&quot;100&quot;,&quot;4us&quot;]]"
+                    />
+            </center>
+            <answer type="loncapa/python">
+# for a schematic response, submission[i] is the json representation
+# of the diagram and analysis results for the i-th schematic tag
+
+def get_tran(json,signal):
+  for element in json:
+    if element[0] == 'transient':
+      return element[1].get(signal,[])
+  return []
+
+def get_value(at,output):
+  for (t,v) in output:
+    if at == t: return v
+  return None
+
+output = get_tran(submission[0],'Z')
+okay = True
+
+# output should be 1, 1, 1, 1, 1, 0, 0, 0
+if get_value(0.0000004,output) &lt; 2.7: okay = False;
+if get_value(0.0000009,output) &lt; 2.7: okay = False;
+if get_value(0.0000014,output) &lt; 2.7: okay = False;
+if get_value(0.0000019,output) &lt; 2.7: okay = False;
+if get_value(0.0000024,output) &lt; 2.7: okay = False;
+if get_value(0.0000029,output) &gt; 0.25: okay = False;
+if get_value(0.0000034,output) &gt; 0.25: okay = False;
+if get_value(0.0000039,output) &gt; 0.25: okay = False;
+
+correct = ['correct' if okay else 'incorrect']
+
+</answer></schematicresponse>
+
+
+
+
+      </problem>
+
+
+
+<problem url_name="cfn_problem">
+  <text>
+    <script type="text/python" system_path="python_lib">
+def test_csv(expect, ans):
+   # Take out all spaces in expected answer
+   expect = [i.strip(' ') for i in str(expect).split(',')]
+   # Take out all spaces in student solution
+   ans = [i.strip(' ') for i in str(ans).split(',')]
+
+   def strip_q(x):
+      # Strip quotes around strings if students have entered them
+      stripped_ans = []
+      for item in x:
+         if item[0] == "'" and item[-1]=="'":
+            item = item.strip("'")
+         elif item[0] == '"' and item[-1] == '"':
+            item = item.strip('"')
+         stripped_ans.append(item)
+      return stripped_ans
+
+   return strip_q(expect) == strip_q(ans)
+</script>
+    <ol class="enumerate">
+      <li>
+        <pre>
+num = 0
+while num &lt;= 5:
+    print(num)
+    num += 1
+
+print("Outside of loop")
+print(num)
+ </pre>
+        <p>
+          <customresponse cfn="test_csv" expect="0, 1, 2, 3, 4, 5, 'Outside of loop', 6">
+            <textline size="50" correct_answer="0, 1, 2, 3, 4, 5, 'Outside of loop', 6"/>
+          </customresponse>
+        </p>
+      </li>
+    </ol>
+  </text>
+</problem>
+
+<problem url_name="computed_answer">
+
+  <customresponse>
+    <textline size="5" correct_answer="Xyzzy"/>
+    <answer type="loncapa/python">
+if submission[0] == "Xyzzy":
+    correct = ['correct']
+else:
+    correct = ['incorrect']
+    </answer>
+  </customresponse>
+
+</problem>
+
+    </vertical>
+  </chapter>
+</course>
--- a/common/test/data/embedded_python/roots/2013_Spring.xml
+++ b/common/test/data/embedded_python/roots/2013_Spring.xml
@@ -0,0 +1 @@
+<course org="edX" course="embedded_python" url_name="2013_Spring"/>
--- a/common/test/data/full/problem/test_files/symbolicresponse.xml
+++ b/common/test/data/full/problem/test_files/symbolicresponse.xml
@@ -19,7 +19,7 @@ from symmath import *
  <text>Compute [mathjax] U = \exp\left( i \theta \left[ \begin{matrix} 0 &amp; 1 \\ 1 &amp; 0 \end{matrix} \right] \right) [/mathjax]
      and give the resulting \(2 \times 2\) matrix. <br/>
      Your input should be typed in as a list of lists, eg <tt>[[1,2],[3,4]]</tt>. <br/>
-       [mathjax]U=[/mathjax] <symbolicresponse cfn="symmath_check" answer="[[cos(theta),I*sin(theta)],[I*sin(theta),cos(theta)]]" options="matrix,imaginaryi" id="filenamedogi0VpEBOWedxsymmathresponse_1" state="unsubmitted">
+       [mathjax]U=[/mathjax] <symbolicresponse cfn="symmath_check" answer="[[cos(theta),i*sin(theta)],[i*sin(theta),cos(theta)]]" options="matrix,imaginary" id="filenamedogi0VpEBOWedxsymmathresponse_1" state="unsubmitted">
          <textline size="80" math="1" response_id="2" answer_id="1" id="filenamedogi0VpEBOWedxsymmathresponse_2_1"/>
        </symbolicresponse>
      <br/>
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -82,6 +82,7 @@ rake test_common/lib/xmodule || TESTS_FAILED=1
 rake phantomjs_jasmine_lms || TESTS_FAILED=1
 rake phantomjs_jasmine_cms || TESTS_FAILED=1
 rake phantomjs_jasmine_common/lib/xmodule || TESTS_FAILED=1
+rake phantomjs_jasmine_discussion || TESTS_FAILED=1

 rake coverage:xml coverage:html

--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -1,6 +1,7 @@
 import json
 import logging
 import pyparsing
+import re
 import sys
 import static_replace

@@ -8,6 +9,7 @@ from functools import partial

 from django.conf import settings
 from django.contrib.auth.models import User
+from django.core.cache import cache
 from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse
 from django.http import Http404
@@ -273,6 +275,14 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours

        statsd.increment("lms.courseware.question_answered", tags=tags)

+    def can_execute_unsafe_code():
+        # To decide if we can run unsafe code, we check the course id against
+        # a list of regexes configured on the server.
+        for regex in settings.COURSES_WITH_UNSAFE_CODE:
+            if re.match(regex, course_id):
+                return True
+        return False
+
    # TODO (cpennington): When modules are shared between courses, the static
    # prefix is going to have to be specific to the module, not the directory
    # that the xml was loaded from
@@ -299,6 +309,8 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
                          course_id=course_id,
                          open_ended_grading_interface=open_ended_grading_interface,
                          s3_interface=s3_interface,
+                          cache=cache,
+                          can_execute_unsafe_code=can_execute_unsafe_code,
                          )
    # pass position specified in URL to module through ModuleSystem
    system.set('position', position)
--- a/lms/djangoapps/courseware/tests/load_tests/README.md
+++ b/lms/djangoapps/courseware/tests/load_tests/README.md
@@ -0,0 +1,4 @@
+# Load Testing
+
+Scripts for load testing the courseware app, 
+mostly using [multimechanize](http://testutils.org/multi-mechanize/)
--- a/lms/djangoapps/courseware/tests/load_tests/custom_response/README.md
+++ b/lms/djangoapps/courseware/tests/load_tests/custom_response/README.md
@@ -0,0 +1,51 @@
+# Custom Response Load Test
+
+## Optional Installations
+
+* [memcached](http://pypi.python.org/pypi/python-memcached/): Install this 
+and make sure it is running, or the Capa problem will not cache results.
+
+* [AppArmor](http://wiki.apparmor.net): Follow the instructions in
+`common/lib/codejail/README` to set up the Python sandbox environment.
+If you do not set up the sandbox, the tests will still execute code in the CustomResponse,
+so you can still run the tests.
+
+* [matplotlib](http://matplotlib.org): Multi-mechanize uses this to create graphs.
+
+
+## Running the Tests
+
+This test simulates student submissions for a custom response problem.
+
+First, clear the cache:
+
+   /etc/init.d/memcached restart 
+
+Then, run the test:
+
+    multimech-run custom_response
+
+You can configure the parameters in `customresponse/config.cfg`,
+and you can change the CustomResponse script and student submissions
+in `customresponse/test_scripts/v_user.py`.
+
+## Components Under Test
+
+Components under test:
+
+* Python sandbox (see `common/lib/codejail`), which uses `AppArmor`
+* Caching (see `common/lib/capa/capa/safe_exec/`), which uses `memcache` in production
+
+Components NOT under test:
+
+* Django views
+* `XModule`
+* gunicorn
+
+This allows us to avoid creating courses in mongo, logging in, using CSRF tokens,
+and other inconveniences.  Instead, we create a capa problem (from the capa package),
+pass it Django's memcache backend, and pass the problem student submissions.
+
+Even though the test uses `capa.capa_problem.LoncapaProblem` directly,
+the `capa` should not depend on Django.  For this reason, we put the
+test in the `courseware` Django app.
--- a/lms/djangoapps/courseware/tests/load_tests/custom_response/config.cfg
+++ b/lms/djangoapps/courseware/tests/load_tests/custom_response/config.cfg
@@ -0,0 +1,22 @@
+
+[global]
+run_time = 240
+rampup = 30
+results_ts_interval = 10
+progress_bar = on
+console_logging = off
+xml_report = off
+
+
+[user_group-1]
+threads = 10
+script = v_user.py
+
+[user_group-2]
+threads = 10
+script = v_user.py
+
+[user_group-3]
+threads = 10
+script = v_user.py
+
--- a/lms/djangoapps/courseware/tests/load_tests/custom_response/test_scripts/v_user.py
+++ b/lms/djangoapps/courseware/tests/load_tests/custom_response/test_scripts/v_user.py
@@ -0,0 +1,115 @@
+""" User script for load testing CustomResponse """
+
+from capa.tests.response_xml_factory import CustomResponseXMLFactory
+import capa.capa_problem as lcp
+from xmodule.x_module import ModuleSystem
+import mock
+import fs.osfs
+import random
+import textwrap
+
+# Use memcache running locally
+CACHE_SETTINGS = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '127.0.0.1:11211'
+    },
+}
+
+# Configure settings so Django will let us import its cache wrapper
+# Caching is the only part of Django being tested
+from django.conf import settings 
+settings.configure(CACHES=CACHE_SETTINGS)
+
+from django.core.cache import cache
+
+# Script to install as the checker for the CustomResponse
+TEST_SCRIPT = textwrap.dedent("""
+        def check_func(expect, answer_given):
+            return {'ok': answer_given == expect, 'msg': 'Message text'}
+""")
+
+# Submissions submitted by the student
+TEST_SUBMISSIONS = [random.randint(-100, 100) for i in range(100)]
+
+class TestContext(object):
+    """ One-time set up for the test that is shared across transactions.
+    Uses a Singleton design pattern."""
+
+    SINGLETON = None
+    NUM_UNIQUE_SEEDS = 20
+
+    @classmethod
+    def singleton(cls):
+        """ Return the singleton, creating one if it does not already exist."""
+
+        # If we haven't created the singleton yet, create it now
+        if cls.SINGLETON is None:
+
+            # Create a mock ModuleSystem, installing our cache
+            system = mock.MagicMock(ModuleSystem)
+            system.render_template = lambda template, context: "<div>%s</div>" % template
+            system.cache = cache
+            system.filestore = mock.MagicMock(fs.osfs.OSFS)
+            system.filestore.root_path = ""
+            system.DEBUG = True
+
+            # Create a custom response problem
+            xml_factory = CustomResponseXMLFactory()
+            xml = xml_factory.build_xml(script=TEST_SCRIPT, cfn="check_func", expect="42")
+
+            # Create and store the context
+            cls.SINGLETON = cls(system, xml)
+
+        else:
+            pass
+
+        # Return the singleton
+        return cls.SINGLETON
+
+    def __init__(self, system, xml):
+        """ Store context needed for the test across transactions """
+        self.system = system
+        self.xml = xml
+
+        # Construct a small pool of unique seeds
+        # To keep our implementation in line with the one capa actually uses,
+        # construct the problems, then use the seeds they generate
+        self.seeds = [lcp.LoncapaProblem(self.xml, 'problem_id', system=self.system).seed
+                      for i in range(self.NUM_UNIQUE_SEEDS)]
+
+    def random_seed(self):
+        """ Return one of a small number of unique random seeds """
+        return random.choice(self.seeds)
+
+    def student_submission(self):
+        """ Return one of a small number of student submissions """
+        return random.choice(TEST_SUBMISSIONS)
+
+class Transaction(object):
+    """ User script that submits a response to a CustomResponse problem """
+
+    def __init__(self):
+        """ Create the problem """
+
+        # Get the context (re-used across transactions)
+        self.context = TestContext.singleton()
+
+        # Create a new custom response problem 
+        # using one of a small number of unique seeds
+        # We're assuming that the capa module is limiting the number
+        # of seeds (currently not the case for certain settings)
+        self.problem = lcp.LoncapaProblem(self.context.xml, 
+                                          '1', 
+                                          state=None, 
+                                          seed=self.context.random_seed(), 
+                                          system=self.context.system)
+
+    def run(self):
+        """ Submit a response to the CustomResponse problem """
+        answers = {'1_2_1': self.context.student_submission()}
+        self.problem.grade_answers(answers)
+
+if __name__ == '__main__':
+    trans = Transaction()
+    trans.run()
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -366,6 +366,7 @@ class TestCoursesLoadTestCase_XmlModulestore(PageLoaderTestCase):
    '''Check that all pages in test courses load properly from XML'''

    def setUp(self):
+        super(TestCoursesLoadTestCase_XmlModulestore, self).setUp()
        self.setup_viewtest_user()
        xmodule.modulestore.django._MODULESTORES = {}

@@ -384,6 +385,7 @@ class TestCoursesLoadTestCase_MongoModulestore(PageLoaderTestCase):
    '''Check that all pages in test courses load properly from Mongo'''

    def setUp(self):
+        super(TestCoursesLoadTestCase_MongoModulestore, self).setUp()
        self.setup_viewtest_user()
        xmodule.modulestore.django._MODULESTORES = {}
        modulestore().collection.drop()
@@ -481,9 +483,6 @@ class TestDraftModuleStore(TestCase):
 class TestViewAuth(LoginEnrollmentTestCase):
    """Check that view authentication works properly"""

-    # NOTE: setUpClass() runs before override_settings takes effect, so
-    # can't do imports there without manually hacking settings.
-
    def setUp(self):
        xmodule.modulestore.django._MODULESTORES = {}

@@ -804,43 +803,85 @@ class TestViewAuth(LoginEnrollmentTestCase):


@override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
-class TestCourseGrader(LoginEnrollmentTestCase):
+class TestSubmittingProblems(LoginEnrollmentTestCase):
    """Check that a course gets graded properly"""

-    # NOTE: setUpClass() runs before override_settings takes effect, so
-    # can't do imports there without manually hacking settings.
+    # Subclasses should specify the course slug
+    course_slug = "UNKNOWN"
+    course_when = "UNKNOWN"

    def setUp(self):
        xmodule.modulestore.django._MODULESTORES = {}
-        courses = modulestore().get_courses()

-        def find_course(course_id):
-            """Assumes the course is present"""
-            return [c for c in courses if c.id == course_id][0]
-
-        self.graded_course = find_course("edX/graded/2012_Fall")
+        course_name = "edX/%s/%s" % (self.course_slug, self.course_when)
+        self.course = modulestore().get_course(course_name)
+        assert self.course, "Couldn't load course %r" % course_name

        # create a test student
        self.student = 'view@test.com'
        self.password = 'foo'
        self.create_account('u1', self.student, self.password)
        self.activate_user(self.student)
-        self.enroll(self.graded_course)
+        self.enroll(self.course)

        self.student_user = get_user(self.student)

        self.factory = RequestFactory()

+    def problem_location(self, problem_url_name):
+        return "i4x://edX/{}/problem/{}".format(self.course_slug, problem_url_name)
+
+    def modx_url(self, problem_location, dispatch):
+        return reverse(
+                    'modx_dispatch',
+                    kwargs={
+                        'course_id': self.course.id,
+                        'location': problem_location,
+                        'dispatch': dispatch,
+                        }
+                    )
+
+    def submit_question_answer(self, problem_url_name, responses):
+        """
+        Submit answers to a question.
+
+        Responses is a dict mapping problem ids (not sure of the right term)
+        to answers:
+            {'2_1': 'Correct', '2_2': 'Incorrect'}
+
+        """
+        problem_location = self.problem_location(problem_url_name)
+        modx_url = self.modx_url(problem_location, 'problem_check')
+        answer_key_prefix = 'input_i4x-edX-{}-problem-{}_'.format(self.course_slug, problem_url_name)
+        resp = self.client.post(modx_url,
+            { (answer_key_prefix + k): v for k,v in responses.items() }
+            )
+        return resp
+
+    def reset_question_answer(self, problem_url_name):
+        '''resets specified problem for current user'''
+        problem_location = self.problem_location(problem_url_name)
+        modx_url = self.modx_url(problem_location, 'problem_reset')
+        resp = self.client.post(modx_url)
+        return resp
+
+
+class TestCourseGrader(TestSubmittingProblems):
+    """Check that a course gets graded properly"""
+
+    course_slug = "graded"
+    course_when = "2012_Fall"
+
    def get_grade_summary(self):
        '''calls grades.grade for current user and course'''
        model_data_cache = ModelDataCache.cache_for_descriptor_descendents(
-            self.graded_course.id, self.student_user, self.graded_course)
+            self.course.id, self.student_user, self.course)

        fake_request = self.factory.get(reverse('progress',
-                                        kwargs={'course_id': self.graded_course.id}))
+                                        kwargs={'course_id': self.course.id}))

        return grades.grade(self.student_user, fake_request,
-                            self.graded_course, model_data_cache)
+                            self.course, model_data_cache)

    def get_homework_scores(self):
        '''get scores for homeworks'''
@@ -849,14 +890,14 @@ class TestCourseGrader(LoginEnrollmentTestCase):
    def get_progress_summary(self):
        '''return progress summary structure for current user and course'''
        model_data_cache = ModelDataCache.cache_for_descriptor_descendents(
-            self.graded_course.id, self.student_user, self.graded_course)
+            self.course.id, self.student_user, self.course)

        fake_request = self.factory.get(reverse('progress',
-                                        kwargs={'course_id': self.graded_course.id}))
+                                        kwargs={'course_id': self.course.id}))

        progress_summary = grades.progress_summary(self.student_user,
                                                   fake_request,
-                                                   self.graded_course,
+                                                   self.course,
                                                   model_data_cache)
        return progress_summary

@@ -865,46 +906,6 @@ class TestCourseGrader(LoginEnrollmentTestCase):
        grade_summary = self.get_grade_summary()
        self.assertEqual(grade_summary['percent'], percent)

-    def submit_question_answer(self, problem_url_name, responses):
-        """
-        The field names of a problem are hard to determine. This method only works
-        for the problems used in the edX/graded course, which has fields named in the
-        following form:
-        input_i4x-edX-graded-problem-H1P3_2_1
-        input_i4x-edX-graded-problem-H1P3_2_2
-        """
-        problem_location = "i4x://edX/graded/problem/%s" % problem_url_name
-
-        modx_url = reverse('modx_dispatch',
-                           kwargs={'course_id': self.graded_course.id,
-                                   'location': problem_location,
-                                   'dispatch': 'problem_check', })
-
-        resp = self.client.post(modx_url, {
-                                'input_i4x-edX-graded-problem-%s_2_1' % problem_url_name: responses[0],
-                                'input_i4x-edX-graded-problem-%s_2_2' % problem_url_name: responses[1],
-                                })
-        print "modx_url", modx_url, "responses", responses
-        print "resp", resp
-
-        return resp
-
-    def problem_location(self, problem_url_name):
-        '''Get location string for problem, assuming hardcoded course_id'''
-        return "i4x://edX/graded/problem/{0}".format(problem_url_name)
-
-    def reset_question_answer(self, problem_url_name):
-        '''resets specified problem for current user'''
-        problem_location = self.problem_location(problem_url_name)
-
-        modx_url = reverse('modx_dispatch',
-                           kwargs={'course_id': self.graded_course.id,
-                                   'location': problem_location,
-                                   'dispatch': 'problem_reset', })
-
-        resp = self.client.post(modx_url)
-        return resp
-
    def test_get_graded(self):
        #### Check that the grader shows we have 0% in the course
        self.check_grade_percent(0)
@@ -922,27 +923,27 @@ class TestCourseGrader(LoginEnrollmentTestCase):
            return [s.earned for s in hw_section['scores']]

        # Only get half of the first problem correct
-        self.submit_question_answer('H1P1', ['Correct', 'Incorrect'])
+        self.submit_question_answer('H1P1', {'2_1': 'Correct', '2_2': 'Incorrect'})
        self.check_grade_percent(0.06)
        self.assertEqual(earned_hw_scores(), [1.0, 0, 0])   # Order matters
        self.assertEqual(score_for_hw('Homework1'), [1.0, 0.0])

        # Get both parts of the first problem correct
        self.reset_question_answer('H1P1')
-        self.submit_question_answer('H1P1', ['Correct', 'Correct'])
+        self.submit_question_answer('H1P1', {'2_1': 'Correct', '2_2': 'Correct'})
        self.check_grade_percent(0.13)
        self.assertEqual(earned_hw_scores(), [2.0, 0, 0])
        self.assertEqual(score_for_hw('Homework1'), [2.0, 0.0])

        # This problem is shown in an ABTest
-        self.submit_question_answer('H1P2', ['Correct', 'Correct'])
+        self.submit_question_answer('H1P2', {'2_1': 'Correct', '2_2': 'Correct'})
        self.check_grade_percent(0.25)
        self.assertEqual(earned_hw_scores(), [4.0, 0.0, 0])
        self.assertEqual(score_for_hw('Homework1'), [2.0, 2.0])

        # This problem is hidden in an ABTest.
        # Getting it correct doesn't change total grade
-        self.submit_question_answer('H1P3', ['Correct', 'Correct'])
+        self.submit_question_answer('H1P3', {'2_1': 'Correct', '2_2': 'Correct'})
        self.check_grade_percent(0.25)
        self.assertEqual(score_for_hw('Homework1'), [2.0, 2.0])

@@ -951,19 +952,85 @@ class TestCourseGrader(LoginEnrollmentTestCase):
        # This problem is also weighted to be 4 points (instead of default of 2)
        # If the problem was unweighted the percent would have been 0.38 so we
        # know it works.
-        self.submit_question_answer('H2P1', ['Correct', 'Correct'])
+        self.submit_question_answer('H2P1', {'2_1': 'Correct', '2_2': 'Correct'})
        self.check_grade_percent(0.42)
        self.assertEqual(earned_hw_scores(), [4.0, 4.0, 0])

        # Third homework
-        self.submit_question_answer('H3P1', ['Correct', 'Correct'])
+        self.submit_question_answer('H3P1', {'2_1': 'Correct', '2_2': 'Correct'})
        self.check_grade_percent(0.42)   # Score didn't change
        self.assertEqual(earned_hw_scores(), [4.0, 4.0, 2.0])

-        self.submit_question_answer('H3P2', ['Correct', 'Correct'])
+        self.submit_question_answer('H3P2', {'2_1': 'Correct', '2_2': 'Correct'})
        self.check_grade_percent(0.5)   # Now homework2 dropped. Score changes
        self.assertEqual(earned_hw_scores(), [4.0, 4.0, 4.0])

        # Now we answer the final question (worth half of the grade)
-        self.submit_question_answer('FinalQuestion', ['Correct', 'Correct'])
+        self.submit_question_answer('FinalQuestion', {'2_1': 'Correct', '2_2': 'Correct'})
        self.check_grade_percent(1.0)   # Hooray! We got 100%
+
+
+@override_settings(MODULESTORE=TEST_DATA_XML_MODULESTORE)
+class TestSchematicResponse(TestSubmittingProblems):
+    """Check that we can submit a schematic response, and it answers properly."""
+
+    course_slug = "embedded_python"
+    course_when = "2013_Spring"
+
+    def test_schematic(self):
+        resp = self.submit_question_answer('schematic_problem',
+            { '2_1': json.dumps(
+                [['transient', {'Z': [
+                [0.0000004, 2.8],
+                [0.0000009, 2.8],
+                [0.0000014, 2.8],
+                [0.0000019, 2.8],
+                [0.0000024, 2.8],
+                [0.0000029, 0.2],
+                [0.0000034, 0.2],
+                [0.0000039, 0.2]
+                ]}]]
+                )
+            })
+        respdata = json.loads(resp.content)
+        self.assertEqual(respdata['success'], 'correct')
+
+        self.reset_question_answer('schematic_problem')
+        resp = self.submit_question_answer('schematic_problem',
+            { '2_1': json.dumps(
+                [['transient', {'Z': [
+                [0.0000004, 2.8],
+                [0.0000009, 0.0],       # wrong.
+                [0.0000014, 2.8],
+                [0.0000019, 2.8],
+                [0.0000024, 2.8],
+                [0.0000029, 0.2],
+                [0.0000034, 0.2],
+                [0.0000039, 0.2]
+                ]}]]
+                )
+            })
+        respdata = json.loads(resp.content)
+        self.assertEqual(respdata['success'], 'incorrect')
+
+    def test_check_function(self):
+        resp = self.submit_question_answer('cfn_problem', {'2_1': "0, 1, 2, 3, 4, 5, 'Outside of loop', 6"})
+        respdata = json.loads(resp.content)
+        self.assertEqual(respdata['success'], 'correct')
+
+        self.reset_question_answer('cfn_problem')
+
+        resp = self.submit_question_answer('cfn_problem', {'2_1': "xyzzy!"})
+        respdata = json.loads(resp.content)
+        self.assertEqual(respdata['success'], 'incorrect')
+
+    def test_computed_answer(self):
+        resp = self.submit_question_answer('computed_answer', {'2_1': "Xyzzy"})
+        respdata = json.loads(resp.content)
+        self.assertEqual(respdata['success'], 'correct')
+
+        self.reset_question_answer('computed_answer')
+
+        resp = self.submit_question_answer('computed_answer', {'2_1': "NO!"})
+        respdata = json.loads(resp.content)
+        self.assertEqual(respdata['success'], 'incorrect')
--- a/lms/djangoapps/debug/init.py
+++ b/lms/djangoapps/debug/init.py
--- a/lms/djangoapps/debug/models.py
+++ b/lms/djangoapps/debug/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
--- a/lms/djangoapps/debug/views.py
+++ b/lms/djangoapps/debug/views.py
@@ -0,0 +1,31 @@
+"""Views for debugging and diagnostics"""
+
+import pprint
+import traceback
+
+from django.http import Http404
+from django.contrib.auth.decorators import login_required
+from django_future.csrf import ensure_csrf_cookie, csrf_exempt
+from mitxmako.shortcuts import render_to_response
+
+from codejail.safe_exec import safe_exec
+
+@login_required
+@ensure_csrf_cookie
+def run_python(request):
+    """A page to allow testing the Python sandbox on a production server."""
+    if not request.user.is_staff:
+        raise Http404
+    c = {}
+    c['code'] = ''
+    c['results'] = None
+    if request.method == 'POST':
+        py_code = c['code'] = request.POST.get('code')
+        g = {}
+        try:
+            safe_exec(py_code, g)
+        except Exception as e:
+            c['results'] = traceback.format_exc()
+        else:
+            c['results'] = pprint.pformat(g)
+    return render_to_response("debug/run_python_form.html", c)
--- a/lms/djangoapps/django_comment_client/base/tests.py
+++ b/lms/djangoapps/django_comment_client/base/tests.py
@@ -0,0 +1,217 @@
+import logging
+
+from django.test.utils import override_settings
+from django.test.client import Client
+from django.contrib.auth.models import User
+from student.tests.factories import CourseEnrollmentFactory
+from xmodule.modulestore.tests.factories import CourseFactory
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
+from django.core.urlresolvers import reverse
+from django.core.management import call_command
+
+from courseware.tests.tests import TEST_DATA_MONGO_MODULESTORE
+from nose.tools import assert_true, assert_equal
+from mock import patch
+
+log = logging.getLogger(__name__)
+
+
+@override_settings(MODULESTORE=TEST_DATA_MONGO_MODULESTORE)
+@patch('comment_client.utils.requests.request')
+class ViewsTestCase(ModuleStoreTestCase):
+    def setUp(self):
+        # create a course
+        self.course = CourseFactory.create(org='MITx', course='999',
+                                           display_name='Robot Super Course')
+        self.course_id = self.course.id
+        # seed the forums permissions and roles
+        call_command('seed_permissions_roles', self.course_id)
+
+        # Patch the comment client user save method so it does not try
+        # to create a new cc user when creating a django user
+        with patch('student.models.cc.User.save'):
+            uname = 'student'
+            email = 'student@edx.org'
+            password = 'test'
+
+            # Create the user and make them active so we can log them in.
+            self.student = User.objects.create_user(uname, email, password)
+            self.student.is_active = True
+            self.student.save()
+
+            # Enroll the student in the course
+            CourseEnrollmentFactory(user=self.student,
+                                    course_id=self.course_id)
+
+            self.client = Client()
+            assert_true(self.client.login(username='student', password='test'))
+
+    def test_create_thread(self, mock_request):
+        mock_request.return_value.status_code = 200
+        mock_request.return_value.text = u'{"title":"Hello",\
+                                            "body":"this is a post",\
+                                            "course_id":"MITx/999/Robot_Super_Course",\
+                                            "anonymous":false,\
+                                            "anonymous_to_peers":false,\
+                                            "commentable_id":"i4x-MITx-999-course-Robot_Super_Course",\
+                                            "created_at":"2013-05-10T18:53:43Z",\
+                                            "updated_at":"2013-05-10T18:53:43Z",\
+                                            "at_position_list":[],\
+                                            "closed":false,\
+                                            "id":"518d4237b023791dca00000d",\
+                                            "user_id":"1","username":"robot",\
+                                            "votes":{"count":0,"up_count":0,\
+                                            "down_count":0,"point":0},\
+                                            "abuse_flaggers":[],"tags":[],\
+                                            "type":"thread","group_id":null,\
+                                            "pinned":false,\
+                                            "endorsed":false,\
+                                            "unread_comments_count":0,\
+                                            "read":false,"comments_count":0}'
+        thread = {"body": ["this is a post"],
+                  "anonymous_to_peers": ["false"],
+                  "auto_subscribe": ["false"],
+                  "anonymous": ["false"],
+                  "title": ["Hello"]
+                  }
+        url = reverse('create_thread', kwargs={'commentable_id': 'i4x-MITx-999-course-Robot_Super_Course',
+                                               'course_id': self.course_id})
+        response = self.client.post(url, data=thread)
+        assert_true(mock_request.called)
+        mock_request.assert_called_with('post',
+                                        'http://localhost:4567/api/v1/i4x-MITx-999-course-Robot_Super_Course/threads',
+                                        data={'body': u'this is a post',
+                                        'anonymous_to_peers': False, 'user_id': 1,
+                                        'title': u'Hello',
+                                        'commentable_id': u'i4x-MITx-999-course-Robot_Super_Course',
+                                        'anonymous': False, 'course_id': u'MITx/999/Robot_Super_Course',
+                                        'api_key': 'PUT_YOUR_API_KEY_HERE'}, timeout=5)
+        assert_equal(response.status_code, 200)
+
+    def test_flag_thread(self, mock_request):
+        mock_request.return_value.status_code = 200
+        mock_request.return_value.text = u'{"title":"Hello",\
+                                            "body":"this is a post",\
+                                            "course_id":"MITx/999/Robot_Super_Course",\
+                                            "anonymous":false,\
+                                            "anonymous_to_peers":false,\
+                                            "commentable_id":"i4x-MITx-999-course-Robot_Super_Course",\
+                                            "created_at":"2013-05-10T18:53:43Z",\
+                                            "updated_at":"2013-05-10T18:53:43Z",\
+                                            "at_position_list":[],\
+                                            "closed":false,\
+                                            "id":"518d4237b023791dca00000d",\
+                                            "user_id":"1","username":"robot",\
+                                            "votes":{"count":0,"up_count":0,\
+                                            "down_count":0,"point":0},\
+                                            "abuse_flaggers":[1],"tags":[],\
+                                            "type":"thread","group_id":null,\
+                                            "pinned":false,\
+                                            "endorsed":false,\
+                                            "unread_comments_count":0,\
+                                            "read":false,"comments_count":0}'
+        url = reverse('flag_abuse_for_thread', kwargs={'thread_id': '518d4237b023791dca00000d', 'course_id': self.course_id})
+        response = self.client.post(url)
+        assert_true(mock_request.called)
+
+        call_list = [(('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'), {'params': {'mark_as_read': True, 'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5}),
+                     (('put', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d/abuse_flag'), {'data': {'api_key': 'PUT_YOUR_API_KEY_HERE', 'user_id': '1'}, 'timeout': 5}),
+                     (('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'), {'params': {'mark_as_read': True, 'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5})]
+
+        assert_equal(call_list, mock_request.call_args_list)
+
+        assert_equal(response.status_code, 200)
+
+    def test_un_flag_thread(self, mock_request):
+        mock_request.return_value.status_code = 200
+        mock_request.return_value.text = u'{"title":"Hello",\
+                                            "body":"this is a post",\
+                                            "course_id":"MITx/999/Robot_Super_Course",\
+                                            "anonymous":false,\
+                                            "anonymous_to_peers":false,\
+                                            "commentable_id":"i4x-MITx-999-course-Robot_Super_Course",\
+                                            "created_at":"2013-05-10T18:53:43Z",\
+                                            "updated_at":"2013-05-10T18:53:43Z",\
+                                            "at_position_list":[],\
+                                            "closed":false,\
+                                            "id":"518d4237b023791dca00000d",\
+                                            "user_id":"1","username":"robot",\
+                                            "votes":{"count":0,"up_count":0,\
+                                            "down_count":0,"point":0},\
+                                            "abuse_flaggers":[],"tags":[],\
+                                            "type":"thread","group_id":null,\
+                                            "pinned":false,\
+                                            "endorsed":false,\
+                                            "unread_comments_count":0,\
+                                            "read":false,"comments_count":0}'
+        url = reverse('un_flag_abuse_for_thread', kwargs={'thread_id': '518d4237b023791dca00000d', 'course_id': self.course_id})
+        response = self.client.post(url)
+        assert_true(mock_request.called)
+
+        call_list = [(('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'), {'params': {'mark_as_read': True, 'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5}),
+                     (('put', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d/abuse_unflag'), {'data': {'api_key': 'PUT_YOUR_API_KEY_HERE', 'user_id': '1'}, 'timeout': 5}),
+                     (('get', 'http://localhost:4567/api/v1/threads/518d4237b023791dca00000d'), {'params': {'mark_as_read': True, 'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5})]
+
+        assert_equal(call_list, mock_request.call_args_list)
+
+        assert_equal(response.status_code, 200)
+
+    def test_flag_comment(self, mock_request):
+        mock_request.return_value.status_code = 200
+        mock_request.return_value.text = u'{"body":"this is a comment",\
+                                            "course_id":"MITx/999/Robot_Super_Course",\
+                                            "anonymous":false,\
+                                            "anonymous_to_peers":false,\
+                                            "commentable_id":"i4x-MITx-999-course-Robot_Super_Course",\
+                                            "created_at":"2013-05-10T18:53:43Z",\
+                                            "updated_at":"2013-05-10T18:53:43Z",\
+                                            "at_position_list":[],\
+                                            "closed":false,\
+                                            "id":"518d4237b023791dca00000d",\
+                                            "user_id":"1","username":"robot",\
+                                            "votes":{"count":0,"up_count":0,\
+                                            "down_count":0,"point":0},\
+                                            "abuse_flaggers":[1],\
+                                            "type":"comment",\
+                                            "endorsed":false}'
+        url = reverse('flag_abuse_for_comment', kwargs={'comment_id': '518d4237b023791dca00000d', 'course_id': self.course_id})
+        response = self.client.post(url)
+        assert_true(mock_request.called)
+
+        call_list = [(('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'), {'params': {'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5}),
+                     (('put', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d/abuse_flag'), {'data': {'api_key': 'PUT_YOUR_API_KEY_HERE', 'user_id': '1'}, 'timeout': 5}),
+                     (('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'), {'params': {'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5})]
+
+        assert_equal(call_list, mock_request.call_args_list)
+
+        assert_equal(response.status_code, 200)
+
+    def test_un_flag_comment(self, mock_request):
+        mock_request.return_value.status_code = 200
+        mock_request.return_value.text = u'{"body":"this is a comment",\
+                                            "course_id":"MITx/999/Robot_Super_Course",\
+                                            "anonymous":false,\
+                                            "anonymous_to_peers":false,\
+                                            "commentable_id":"i4x-MITx-999-course-Robot_Super_Course",\
+                                            "created_at":"2013-05-10T18:53:43Z",\
+                                            "updated_at":"2013-05-10T18:53:43Z",\
+                                            "at_position_list":[],\
+                                            "closed":false,\
+                                            "id":"518d4237b023791dca00000d",\
+                                            "user_id":"1","username":"robot",\
+                                            "votes":{"count":0,"up_count":0,\
+                                            "down_count":0,"point":0},\
+                                            "abuse_flaggers":[],\
+                                            "type":"comment",\
+                                            "endorsed":false}'
+        url = reverse('un_flag_abuse_for_comment', kwargs={'comment_id': '518d4237b023791dca00000d', 'course_id': self.course_id})
+        response = self.client.post(url)
+        assert_true(mock_request.called)
+
+        call_list = [(('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'), {'params': {'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5}),
+                     (('put', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d/abuse_unflag'), {'data': {'api_key': 'PUT_YOUR_API_KEY_HERE', 'user_id': '1'}, 'timeout': 5}),
+                     (('get', 'http://localhost:4567/api/v1/comments/518d4237b023791dca00000d'), {'params': {'api_key': 'PUT_YOUR_API_KEY_HERE'}, 'timeout': 5})]
+
+        assert_equal(call_list, mock_request.call_args_list)
+
+        assert_equal(response.status_code, 200)
--- a/lms/djangoapps/django_comment_client/base/urls.py
+++ b/lms/djangoapps/django_comment_client/base/urls.py
@@ -9,6 +9,8 @@ urlpatterns = patterns('django_comment_client.base.views',  # nopep8
    url(r'threads/(?P<thread_id>[\w\-]+)/delete', 'delete_thread', name='delete_thread'),
    url(r'threads/(?P<thread_id>[\w\-]+)/upvote$', 'vote_for_thread', {'value': 'up'}, name='upvote_thread'),
    url(r'threads/(?P<thread_id>[\w\-]+)/downvote$', 'vote_for_thread', {'value': 'down'}, name='downvote_thread'),
+    url(r'threads/(?P<thread_id>[\w\-]+)/flagAbuse$', 'flag_abuse_for_thread', name='flag_abuse_for_thread'),
+    url(r'threads/(?P<thread_id>[\w\-]+)/unFlagAbuse$', 'un_flag_abuse_for_thread', name='un_flag_abuse_for_thread'),
    url(r'threads/(?P<thread_id>[\w\-]+)/unvote$', 'undo_vote_for_thread', name='undo_vote_for_thread'),
    url(r'threads/(?P<thread_id>[\w\-]+)/pin$', 'pin_thread', name='pin_thread'),
    url(r'threads/(?P<thread_id>[\w\-]+)/unpin$', 'un_pin_thread', name='un_pin_thread'),
@@ -23,7 +25,8 @@ urlpatterns = patterns('django_comment_client.base.views',  # nopep8
    url(r'comments/(?P<comment_id>[\w\-]+)/upvote$', 'vote_for_comment', {'value': 'up'}, name='upvote_comment'),
    url(r'comments/(?P<comment_id>[\w\-]+)/downvote$', 'vote_for_comment', {'value': 'down'}, name='downvote_comment'),
    url(r'comments/(?P<comment_id>[\w\-]+)/unvote$', 'undo_vote_for_comment', name='undo_vote_for_comment'),
-
+    url(r'comments/(?P<comment_id>[\w\-]+)/flagAbuse$', 'flag_abuse_for_comment', name='flag_abuse_for_comment'),
+    url(r'comments/(?P<comment_id>[\w\-]+)/unFlagAbuse$', 'un_flag_abuse_for_comment', name='un_flag_abuse_for_comment'),
    url(r'^(?P<commentable_id>[\w\-.]+)/threads/create$', 'create_thread', name='create_thread'),
    # TODO should we search within the board?
    url(r'^(?P<commentable_id>[\w\-.]+)/threads/search_similar$', 'search_similar_threads', name='search_similar_threads'),
--- a/lms/djangoapps/django_comment_client/base/views.py
+++ b/lms/djangoapps/django_comment_client/base/views.py
@@ -19,14 +19,15 @@ from django.core.files.storage import get_storage_class
 from django.utils.translation import ugettext as _
 from django.contrib.auth.models import User

-from mitxmako.shortcuts import render_to_response, render_to_string
-from courseware.courses import get_course_with_access
+from mitxmako.shortcuts import render_to_string
+from courseware.courses import get_course_with_access, get_course_by_id
 from course_groups.cohorts import get_cohort_id, is_commentable_cohorted

 from django_comment_client.utils import JsonResponse, JsonError, extract, get_courseware_context

 from django_comment_client.permissions import check_permissions_by_view, cached_has_permission
 from django_comment_client.models import Role
+from courseware.access import has_access

 log = logging.getLogger(__name__)

@@ -68,6 +69,10 @@ def ajax_content_response(request, course_id, content, template_name):
@login_required
@permitted
 def create_thread(request, course_id, commentable_id):
+    """
+    Given a course and commentble ID, create the thread
+    """
+    
    log.debug("Creating new thread in %r, id %r", course_id, commentable_id)
    course = get_course_with_access(request.user, course_id, 'load')
    post = request.POST
@@ -119,7 +124,7 @@ def create_thread(request, course_id, commentable_id):
    #patch for backward compatibility to comments service
    if not 'pinned' in thread.attributes:
        thread['pinned'] = False
-    
+
    if post.get('auto_subscribe', 'false').lower() == 'true':
        user = cc.User.from_django_user(request.user)
        user.follow(thread)
@@ -137,6 +142,9 @@ def create_thread(request, course_id, commentable_id):
@login_required
@permitted
 def update_thread(request, course_id, thread_id):
+    """
+    Given a course id and thread id, update a existing thread, used for both static and ajax submissions
+    """
    thread = cc.Thread.find(thread_id)
    thread.update_attributes(**extract(request.POST, ['body', 'title', 'tags']))
    thread.save()
@@ -147,6 +155,10 @@ def update_thread(request, course_id, thread_id):


 def _create_comment(request, course_id, thread_id=None, parent_id=None):
+    """
+    given a course_id, thread_id, and parent_id, create a comment,
+    called from create_comment to do the actual creation
+    """
    post = request.POST
    comment = cc.Comment(**extract(post, ['body']))

@@ -183,6 +195,10 @@ def _create_comment(request, course_id, thread_id=None, parent_id=None):
@login_required
@permitted
 def create_comment(request, course_id, thread_id):
+    """
+    given a course_id and thread_id, test for comment depth. if not too deep,
+    call _create_comment to create the actual comment.
+    """
    if cc_settings.MAX_COMMENT_DEPTH is not None:
        if cc_settings.MAX_COMMENT_DEPTH < 0:
            return JsonError("Comment level too deep")
@@ -193,6 +209,10 @@ def create_comment(request, course_id, thread_id):
@login_required
@permitted
 def delete_thread(request, course_id, thread_id):
+    """
+    given a course_id and thread_id, delete this thread
+    this is ajax only
+    """
    thread = cc.Thread.find(thread_id)
    thread.delete()
    return JsonResponse(utils.safe_content(thread.to_dict()))
@@ -202,6 +222,10 @@ def delete_thread(request, course_id, thread_id):
@login_required
@permitted
 def update_comment(request, course_id, comment_id):
+    """
+    given a course_id and comment_id, update the comment with payload attributes
+    handles static and ajax submissions
+    """
    comment = cc.Comment.find(comment_id)
    comment.update_attributes(**extract(request.POST, ['body']))
    comment.save()
@@ -215,6 +239,10 @@ def update_comment(request, course_id, comment_id):
@login_required
@permitted
 def endorse_comment(request, course_id, comment_id):
+    """
+    given a course_id and comment_id, toggle the endorsement of this comment,
+    ajax only
+    """
    comment = cc.Comment.find(comment_id)
    comment.endorsed = request.POST.get('endorsed', 'false').lower() == 'true'
    comment.save()
@@ -225,6 +253,10 @@ def endorse_comment(request, course_id, comment_id):
@login_required
@permitted
 def openclose_thread(request, course_id, thread_id):
+    """
+    given a course_id and thread_id, toggle the status of this thread
+    ajax only
+    """
    thread = cc.Thread.find(thread_id)
    thread.closed = request.POST.get('closed', 'false').lower() == 'true'
    thread.save()
@@ -239,6 +271,10 @@ def openclose_thread(request, course_id, thread_id):
@login_required
@permitted
 def create_sub_comment(request, course_id, comment_id):
+    """
+    given a course_id and comment_id, create a response to a comment
+    after checking the max depth allowed, if allowed
+    """
    if cc_settings.MAX_COMMENT_DEPTH is not None:
        if cc_settings.MAX_COMMENT_DEPTH <= cc.Comment.find(comment_id).depth:
            return JsonError("Comment level too deep")
@@ -249,6 +285,10 @@ def create_sub_comment(request, course_id, comment_id):
@login_required
@permitted
 def delete_comment(request, course_id, comment_id):
+    """
+    given a course_id and comment_id delete this comment
+    ajax only
+    """
    comment = cc.Comment.find(comment_id)
    comment.delete()
    return JsonResponse(utils.safe_content(comment.to_dict()))
@@ -258,6 +298,9 @@ def delete_comment(request, course_id, comment_id):
@login_required
@permitted
 def vote_for_comment(request, course_id, comment_id, value):
+    """
+    given a course_id and comment_id,
+    """
    user = cc.User.from_django_user(request.user)
    comment = cc.Comment.find(comment_id)
    user.vote(comment, value)
@@ -268,6 +311,10 @@ def vote_for_comment(request, course_id, comment_id, value):
@login_required
@permitted
 def undo_vote_for_comment(request, course_id, comment_id):
+    """
+    given a course id and comment id, remove vote
+    ajax only
+    """
    user = cc.User.from_django_user(request.user)
    comment = cc.Comment.find(comment_id)
    user.unvote(comment)
@@ -278,34 +325,112 @@ def undo_vote_for_comment(request, course_id, comment_id):
@login_required
@permitted
 def vote_for_thread(request, course_id, thread_id, value):
+    """
+    given a course id and thread id vote for this thread
+    ajax only
+    """
    user = cc.User.from_django_user(request.user)
    thread = cc.Thread.find(thread_id)
    user.vote(thread, value)
    return JsonResponse(utils.safe_content(thread.to_dict()))


+@require_POST
+@login_required
+@permitted
+def flag_abuse_for_thread(request, course_id, thread_id):
+    """
+    given a course_id and thread_id flag this thread for abuse
+    ajax only
+    """
+    user = cc.User.from_django_user(request.user)
+    thread = cc.Thread.find(thread_id)
+    thread.flagAbuse(user, thread)
+    return JsonResponse(utils.safe_content(thread.to_dict()))
+
+
+@require_POST
+@login_required
+@permitted
+def un_flag_abuse_for_thread(request, course_id, thread_id):
+    """
+    given a course id and thread id, remove abuse flag for this thread
+    ajax only
+    """
+    user = cc.User.from_django_user(request.user)
+    course = get_course_by_id(course_id)
+    thread = cc.Thread.find(thread_id)
+    removeAll = cached_has_permission(request.user, 'openclose_thread', course_id) or has_access(request.user, course, 'staff')
+    thread.unFlagAbuse(user, thread, removeAll)
+    return JsonResponse(utils.safe_content(thread.to_dict()))
+
+
+@require_POST
+@login_required
+@permitted
+def flag_abuse_for_comment(request, course_id, comment_id):
+    """
+    given a course and comment id, flag comment for abuse
+    ajax only
+    """
+    user = cc.User.from_django_user(request.user)
+    comment = cc.Comment.find(comment_id)
+    comment.flagAbuse(user, comment)
+    return JsonResponse(utils.safe_content(comment.to_dict()))
+
+
+@require_POST
+@login_required
+@permitted
+def un_flag_abuse_for_comment(request, course_id, comment_id):
+    """
+    given a course_id and comment id, unflag comment for abuse
+    ajax only
+    """
+    user = cc.User.from_django_user(request.user)
+    course = get_course_by_id(course_id)
+    removeAll = cached_has_permission(request.user, 'openclose_thread', course_id) or has_access(request.user, course, 'staff')
+    comment = cc.Comment.find(comment_id)
+    comment.unFlagAbuse(user, comment, removeAll)
+    return JsonResponse(utils.safe_content(comment.to_dict()))
+
+
@require_POST
@login_required
@permitted
 def undo_vote_for_thread(request, course_id, thread_id):
+    """
+    given a course id and thread id, remove users vote for thread
+    ajax only
+    """
    user = cc.User.from_django_user(request.user)
    thread = cc.Thread.find(thread_id)
    user.unvote(thread)
    return JsonResponse(utils.safe_content(thread.to_dict()))

+
@require_POST
@login_required
@permitted
 def pin_thread(request, course_id, thread_id):
+    """
+    given a course id and thread id, pin this thread
+    ajax only
+    """
    user = cc.User.from_django_user(request.user)
    thread = cc.Thread.find(thread_id)
-    thread.pin(user,thread_id)
+    thread.pin(user, thread_id)
    return JsonResponse(utils.safe_content(thread.to_dict()))

+
 def un_pin_thread(request, course_id, thread_id):
+    """
+    given a course id and thread id, remove pin from this thread
+    ajax only
+    """
    user = cc.User.from_django_user(request.user)
    thread = cc.Thread.find(thread_id)
-    thread.un_pin(user,thread_id)
+    thread.un_pin(user, thread_id)
    return JsonResponse(utils.safe_content(thread.to_dict()))


@@ -323,6 +448,10 @@ def follow_thread(request, course_id, thread_id):
@login_required
@permitted
 def follow_commentable(request, course_id, commentable_id):
+    """
+    given a course_id and commentable id, follow this commentable
+    ajax only
+    """
    user = cc.User.from_django_user(request.user)
    commentable = cc.Commentable.find(commentable_id)
    user.follow(commentable)
@@ -343,6 +472,10 @@ def follow_user(request, course_id, followed_user_id):
@login_required
@permitted
 def unfollow_thread(request, course_id, thread_id):
+    """
+    given a course id and thread id, stop following this thread
+    ajax only
+    """
    user = cc.User.from_django_user(request.user)
    thread = cc.Thread.find(thread_id)
    user.unfollow(thread)
@@ -353,6 +486,10 @@ def unfollow_thread(request, course_id, thread_id):
@login_required
@permitted
 def unfollow_commentable(request, course_id, commentable_id):
+    """
+    given a course id and commentable id stop following commentable
+    ajax only
+    """
    user = cc.User.from_django_user(request.user)
    commentable = cc.Commentable.find(commentable_id)
    user.unfollow(commentable)
@@ -363,6 +500,10 @@ def unfollow_commentable(request, course_id, commentable_id):
@login_required
@permitted
 def unfollow_user(request, course_id, followed_user_id):
+    """
+    given a course id and user id, stop following this user
+    ajax only
+    """
    user = cc.User.from_django_user(request.user)
    followed_user = cc.User.find(followed_user_id)
    user.unfollow(followed_user)
@@ -373,6 +514,10 @@ def unfollow_user(request, course_id, followed_user_id):
@login_required
@permitted
 def update_moderator_status(request, course_id, user_id):
+    """
+    given a course id and user id, check if the user has moderator
+    and send back a user profile
+    """
    is_moderator = request.POST.get('is_moderator', '').lower()
    if is_moderator not in ["true", "false"]:
        return JsonError("Must provide is_moderator as boolean value")
@@ -402,6 +547,10 @@ def update_moderator_status(request, course_id, user_id):

@require_GET
 def search_similar_threads(request, course_id, commentable_id):
+    """
+    given a course id and commentable id, run query given in text get param
+    of request
+    """
    text = request.GET.get('text', None)
    if text:
        query_params = {
@@ -452,16 +601,11 @@ def upload(request, course_id):  # ajax upload file to a question or answer
        if not file_extension in cc_settings.ALLOWED_UPLOAD_FILE_TYPES:
            file_types = "', '".join(cc_settings.ALLOWED_UPLOAD_FILE_TYPES)
            msg = _("allowed file types are '%(file_types)s'") % \
-                    {'file_types': file_types}
+                {'file_types': file_types}
            raise exceptions.PermissionDenied(msg)

        # generate new file name
-        new_file_name = str(
-                            time.time()
-                        ).replace(
-                            '.',
-                            str(random.randint(0, 100000))
-                        ) + file_extension
+        new_file_name = str(time.time()).replace('.', str(random.randint(0, 100000))) + file_extension

        file_storage = get_storage_class()()
        # use default storage to store file
@@ -472,14 +616,14 @@ def upload(request, course_id):  # ajax upload file to a question or answer
        if size > cc_settings.MAX_UPLOAD_FILE_SIZE:
            file_storage.delete(new_file_name)
            msg = _("maximum upload file size is %(file_size)sK") % \
-                    {'file_size': cc_settings.MAX_UPLOAD_FILE_SIZE}
+                {'file_size': cc_settings.MAX_UPLOAD_FILE_SIZE}
            raise exceptions.PermissionDenied(msg)

-    except exceptions.PermissionDenied, e:
+    except exceptions.PermissionDenied, err:
        error = unicode(e)
-    except Exception, e:
-        print e
-        logging.critical(unicode(e))
+    except Exception, err:
+        print err
+        logging.critical(unicode(err))
        error = _('Error uploading file. Please contact the site administrator. Thank you.')

    if error == '':
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -7,9 +7,9 @@ from django.http import Http404
 from django.core.context_processors import csrf
 from django.contrib.auth.models import User

-from mitxmako.shortcuts import render_to_response, render_to_string
+from mitxmako.shortcuts import render_to_response
 from courseware.courses import get_course_with_access
-from course_groups.cohorts import (is_course_cohorted, get_cohort_id, is_commentable_cohorted, 
+from course_groups.cohorts import (is_course_cohorted, get_cohort_id, is_commentable_cohorted,
                                   get_cohorted_commentables, get_course_cohorts, get_cohort_by_id)
 from courseware.access import has_access

@@ -79,7 +79,7 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG
                              strip_none(extract(request.GET,
                                                 ['page', 'sort_key',
                                                  'sort_order', 'text',
-                                                  'tags', 'commentable_ids'])))
+                                                  'tags', 'commentable_ids', 'flagged'])))

    threads, page, num_pages = cc.Thread.search(query_params)

@@ -92,7 +92,7 @@ def get_threads(request, course_id, discussion_id=None, per_page=THREADS_PER_PAG
        else:
            thread['group_name'] = ""
            thread['group_string'] = "This post visible to everyone."
-    
+
        #patch for backward compatibility to comments service
        if not 'pinned' in thread:
            thread['pinned'] = False
@@ -108,7 +108,6 @@ def inline_discussion(request, course_id, discussion_id):
    """
    Renders JSON for DiscussionModules
    """
-
    course = get_course_with_access(request.user, course_id, 'load')

    try:
@@ -219,6 +218,7 @@ def forum_form_discussion(request, course_id):
            'threads': saxutils.escape(json.dumps(threads), escapedict),
            'thread_pages': query_params['num_pages'],
            'user_info': saxutils.escape(json.dumps(user_info), escapedict),
+            'flag_moderator': cached_has_permission(request.user, 'openclose_thread', course.id) or has_access(request.user, course, 'staff'),
            'annotated_content_info': saxutils.escape(json.dumps(annotated_content_info), escapedict),
            'course_id': course.id,
            'category_map': category_map,
@@ -241,19 +241,12 @@ def single_thread(request, course_id, discussion_id, thread_id):

    try:
        thread = cc.Thread.find(thread_id).retrieve(recursive=True, user_id=request.user.id)
-
-        #patch for backward compatibility with comments service
-        if not 'pinned' in thread.attributes:
-            thread['pinned'] = False
-
    except (cc.utils.CommentClientError, cc.utils.CommentClientUnknownError) as err:
        log.error("Error loading single thread.")
        raise Http404

    if request.is_ajax():
-
        courseware_context = get_courseware_context(thread, course)
-
        annotated_content_info = utils.get_annotated_content_infos(course_id, thread, request.user, user_info=user_info)
        context = {'thread': thread.to_dict(), 'course_id': course_id}
        # TODO: Remove completely or switch back to server side rendering
@@ -325,6 +318,7 @@ def single_thread(request, course_id, discussion_id, thread_id):
            'thread_pages': query_params['num_pages'],
            'is_course_cohorted': is_course_cohorted(course_id),
            'is_moderator': cached_has_permission(request.user, "see_all_cohorts", course_id),
+            'flag_moderator': cached_has_permission(request.user, 'openclose_thread', course.id) or has_access(request.user, course, 'staff'),
            'cohorts': cohorts,
            'user_cohort': get_cohort_id(request.user, course_id),
            'cohorted_commentables': cohorted_commentables
@@ -400,7 +394,7 @@ def followed_threads(request, course_id, user_id):
                'discussion_data': map(utils.safe_content, threads),
                'page': query_params['page'],
                'num_pages': query_params['num_pages'],
-                })
+            })
        else:

            context = {
--- a/lms/djangoapps/django_comment_client/management/commands/assign_role.py
+++ b/lms/djangoapps/django_comment_client/management/commands/assign_role.py
@@ -12,7 +12,7 @@ class Command(BaseCommand):
                    dest='remove',
                    default=False,
                    help='Remove the role instead of adding it'),
-        )
+    )

    args = '<user|email> <role> <course_id>'
    help = 'Assign a discussion forum role to a user '
--- a/lms/djangoapps/django_comment_client/management/commands/reload_forum_users.py
+++ b/lms/djangoapps/django_comment_client/management/commands/reload_forum_users.py
@@ -1,15 +1,16 @@
 """
 Reload forum (comment client) users from existing users.
 """
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand

 from django.contrib.auth.models import User
 import comment_client as cc

+
 class Command(BaseCommand):
    help = 'Reload forum (comment client) users from existing users'

-    def adduser(self,user):
+    def adduser(self, user):
        print user
        try:
            cc_user = cc.User.from_django_user(user)
@@ -22,8 +23,6 @@ class Command(BaseCommand):
            uset = [User.objects.get(username=x) for x in args]
        else:
            uset = User.objects.all()
-            
+
        for user in uset:
            self.adduser(user)
-        
-                
--- a/lms/djangoapps/django_comment_client/management/commands/show_permissions.py
+++ b/lms/djangoapps/django_comment_client/management/commands/show_permissions.py
@@ -1,5 +1,4 @@
 from django.core.management.base import BaseCommand, CommandError
-from django_comment_client.models import Permission, Role
 from django.contrib.auth.models import User


--- a/lms/djangoapps/django_comment_client/models.py
+++ b/lms/djangoapps/django_comment_client/models.py
@@ -38,7 +38,7 @@ class Role(models.Model):
    def inherit_permissions(self, role):   # TODO the name of this method is a little bit confusing,
                                         # since it's one-off and doesn't handle inheritance later
        if role.course_id and role.course_id != self.course_id:
-            logging.warning("%s cannot inherit permissions from %s due to course_id inconsistency", \
+            logging.warning("%s cannot inherit permissions from %s due to course_id inconsistency",
                            self, role)
        for per in role.permissions.all():
            self.add_permission(per)
--- a/lms/djangoapps/django_comment_client/permissions.py
+++ b/lms/djangoapps/django_comment_client/permissions.py
@@ -73,7 +73,6 @@ def check_conditions_permissions(user, permissions, course_id, **kwargs):
                return True in results
            elif operator == "and":
                return not False in results
-
    return test(user, permissions, operator="or")


@@ -89,6 +88,10 @@ VIEW_PERMISSIONS = {
    'vote_for_comment'  :       [['vote', 'is_open']],
    'undo_vote_for_comment':    [['unvote', 'is_open']],
    'vote_for_thread'   :       [['vote', 'is_open']],
+    'flag_abuse_for_thread':    [['vote', 'is_open']],
+    'un_flag_abuse_for_thread':    [['vote', 'is_open']],
+    'flag_abuse_for_comment':    [['vote', 'is_open']],
+    'un_flag_abuse_for_comment':    [['vote', 'is_open']],
    'undo_vote_for_thread':     [['unvote', 'is_open']],
    'pin_thread':    ['create_comment'],
    'un_pin_thread':    ['create_comment'],
--- a/lms/djangoapps/django_comment_client/tests.py
+++ b/lms/djangoapps/django_comment_client/tests.py
@@ -21,9 +21,9 @@ class PermissionsTestCase(TestCase):
        self.student_role = Role.objects.get_or_create(name="Student", course_id=self.course_id)[0]

        self.student = User.objects.create(username=self.random_str(),
-                            password="123456", email="john@yahoo.com")
+                                           password="123456", email="john@yahoo.com")
        self.moderator = User.objects.create(username=self.random_str(),
-                            password="123456", email="staff@edx.org")
+                                             password="123456", email="staff@edx.org")
        self.moderator.is_staff = True
        self.moderator.save()
        self.student_enrollment = CourseEnrollment.objects.create(user=self.student, course_id=self.course_id)
--- a/lms/djangoapps/django_comment_client/tests/factories.py
+++ b/lms/djangoapps/django_comment_client/tests/factories.py
@@ -0,0 +1,13 @@
+from factory import DjangoModelFactory
+from django_comment_client.models import Role, Permission
+
+
+class RoleFactory(DjangoModelFactory):
+    FACTORY_FOR = Role
+    name = 'Student'
+    course_id = 'edX/toy/2012_Fall'
+
+
+class PermissionFactory(DjangoModelFactory):
+    FACTORY_FOR = Permission
+    name = 'create_comment'
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`This directory is in the Python path for sandboxed Python execution.`
				`@@ -0,0 +1 @@`
				`<course org="edX" course="embedded_python" url_name="2013_Spring"/>`