Merge pull request #1097 from MITx/diana/fix-open-ended-input

Diana/fix open ended input

common/lib/capa/capa/xqueue_interface.py

@@ -81,7 +81,11 @@ class XQueueInterface(object):
 
         # Log in, then try again
         if error and (msg == 'login_required'):
-            self._login()
+            (error, content) = self._login()
+            if error != 0:
+                # when the login fails
+                log.debug("Failed to login to queue: %s", content)
+                return (error, content)
             if files_to_upload is not None:
                 # Need to rewind file pointers
                 for f in files_to_upload:

common/lib/xmodule/xmodule/capa_module.py

@@ -149,7 +149,7 @@ class CapaModule(XModule):
         # Need the problem location in openendedresponse to send out.  Adding
         # it to the system here seems like the least clunky way to get it
         # there.
-        self.system.set('location', self.location)
+        self.system.set('location', self.location.url())
 
         try:
             # TODO (vshnayder): move as much as possible of this work and error