Commit b8087c10 by David Ormsbee

rearrange imports

parent 01fbbb9f
from django.http import HttpResponse import json
from django.template import Context, loader import logging
from djangomako.shortcuts import render_to_response, render_to_string import os
import json, os, sys import sys
from django.core.context_processors import csrf
from django.template import Context
from django.contrib.auth.models import User
from auth.models import UserProfile
from django.shortcuts import redirect
import StringIO import StringIO
from django.http import Http404
from models import StudentModule
import urllib import urllib
import uuid
from django.conf import settings from django.conf import settings
from django.core.context_processors import csrf
from django.contrib.auth.models import User
from django.http import HttpResponse, Http404
from django.shortcuts import redirect
from django.template import Context, loader
from djangomako.shortcuts import render_to_response, render_to_string
from lxml import etree
import content_parser from auth.models import UserProfile
from models import StudentModule
import uuid
from module_render import * from module_render import *
import content_parser
from lxml import etree
etree.set_default_parser(etree.XMLParser(dtd_validation=False, load_dtd=False, etree.set_default_parser(etree.XMLParser(dtd_validation=False, load_dtd=False,
remove_comments = True)) remove_comments = True))
...@@ -37,7 +30,7 @@ def profile(request): ...@@ -37,7 +30,7 @@ def profile(request):
We need to allow the user to change some of these settings .''' We need to allow the user to change some of these settings .'''
if not request.user.is_authenticated(): if not request.user.is_authenticated():
return redirect('/') return redirect('/')
dom=content_parser.course_file(request.user) dom=content_parser.course_file(request.user)
hw=[] hw=[]
course = dom.xpath('//course/@name')[0] course = dom.xpath('//course/@name')[0]
...@@ -62,7 +55,7 @@ def profile(request): ...@@ -62,7 +55,7 @@ def profile(request):
correct=response.grade correct=response.grade
else: else:
correct=0 correct=0
total=courseware.modules.capa_module.LoncapaModule(etree.tostring(p), "id").max_score() # TODO: Add state. Not useful now, but maybe someday problems will have randomized max scores? total=capa_module.LoncapaModule(etree.tostring(p), "id").max_score() # TODO: Add state. Not useful now, but maybe someday problems will have randomized max scores?
scores.append((int(correct),total)) scores.append((int(correct),total))
score={'course':course, score={'course':course,
'section':s.get("name"), 'section':s.get("name"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment