diff --git a/djangoapps/courseware/content_parser.py b/djangoapps/courseware/content_parser.py index 967f7008c93a15004023203eb800b1ae6ad1243e..a44c0fbd1da74171c1de5f5cc0ab4ac93ee1d718 100644 --- a/djangoapps/courseware/content_parser.py +++ b/djangoapps/courseware/content_parser.py @@ -1,5 +1,4 @@ import hashlib -import json import logging import os import re @@ -14,7 +13,7 @@ try: # This lets us do __name__ == ='__main__' from student.models import UserProfile from student.models import UserTestGroup - from mitxmako.shortcuts import render_to_response, render_to_string + from mitxmako.shortcuts import render_to_string from util.cache import cache except: settings = None @@ -97,20 +96,9 @@ def item(l, default="", process=lambda x:x): def id_tag(course): ''' Tag all course elements with unique IDs ''' - old_ids = {'video':'youtube', - 'problem':'filename', - 'sequential':'id', - 'html':'filename', - 'vertical':'id', - 'tab':'id', - 'schematic':'id', - 'book' : 'id'} import courseware.modules default_ids = courseware.modules.get_default_ids() - #print default_ids, old_ids - #print default_ids == old_ids - # Tag elements with unique IDs elements = course.xpath("|".join(['//'+c for c in default_ids])) for elem in elements: diff --git a/djangoapps/courseware/module_render.py b/djangoapps/courseware/module_render.py index 38f9e0211b7796d04eb4da4a2ce69dc300842f31..a1a7de12f60f9ce495742f07985705c5ae57ed20 100644 --- a/djangoapps/courseware/module_render.py +++ b/djangoapps/courseware/module_render.py @@ -1,31 +1,12 @@ -import StringIO -import json import logging -import os -import sys -import sys -import urllib -import uuid from lxml import etree -from django.conf import settings -from django.contrib.auth.models import User -from django.core.context_processors import csrf -from django.db import connection -from django.http import Http404 -from django.http import HttpResponse -from django.shortcuts import redirect -from django.template import Context -from django.template import Context, loader -from mitxmako.shortcuts import render_to_response, render_to_string +from mitxmako.shortcuts import render_to_string from models import StudentModule -from student.models import UserProfile import track.views -import courseware.content_parser as content_parser - import courseware.modules log = logging.getLogger("mitx.courseware") diff --git a/djangoapps/courseware/views.py b/djangoapps/courseware/views.py index f7d1ba9293f3e68cf53a8b356fc02ddaa426f746..05ef35307efc4808257383556937fe35b2c75ccb 100644 --- a/djangoapps/courseware/views.py +++ b/djangoapps/courseware/views.py @@ -1,21 +1,13 @@ -import json import logging -import os -import random -import sys -import StringIO import urllib -import uuid 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 mitxmako.shortcuts import render_to_response, render_to_string #from django.views.decorators.csrf import ensure_csrf_cookie -from django.db import connection from django.views.decorators.cache import cache_control from lxml import etree diff --git a/djangoapps/simplewiki/views.py b/djangoapps/simplewiki/views.py index 7d743139bae021c40efacb14a331a3afbe054f9c..8b776eb75b347d7b727a0a3b1d2f282d2df2316d 100644 --- a/djangoapps/simplewiki/views.py +++ b/djangoapps/simplewiki/views.py @@ -4,21 +4,12 @@ import types from django.conf import settings from django.contrib.auth.decorators import login_required from django.core.context_processors import csrf -from django.core.urlresolvers import get_callable from django.core.urlresolvers import reverse from django.db.models import Q -from django.http import Http404, HttpResponse, HttpResponseRedirect, HttpResponseServerError, HttpResponseForbidden, HttpResponseNotAllowed -from django.http import HttpResponse -from django.shortcuts import get_object_or_404 -from django.shortcuts import redirect -from django.template import Context -from django.template import RequestContext, Context, loader +from django.http import HttpResponse, HttpResponseRedirect from django.utils import simplejson from django.utils.translation import ugettext_lazy as _ -from mitxmako.shortcuts import render_to_response, render_to_string -from mako.lookup import TemplateLookup -from mako.template import Template -import mitxmako.middleware +from mitxmako.shortcuts import render_to_response from models import * # TODO: Clean up from settings import * diff --git a/djangoapps/staticbook/views.py b/djangoapps/staticbook/views.py index f7ad8fab63f2324bd85931ba90695663a548e6e4..2a5b67b3c0e05efd82d9807115eb9f5aa240ed2c 100644 --- a/djangoapps/staticbook/views.py +++ b/djangoapps/staticbook/views.py @@ -1,10 +1,5 @@ -# Create your views here. -import os - -from django.conf import settings -from django.http import Http404 -from django.shortcuts import redirect -from mitxmako.shortcuts import render_to_response, render_to_string +from django.contrib.auth.decorators import login_required +from mitxmako.shortcuts import render_to_response def index(request, page=0): if not request.user.is_authenticated(): diff --git a/djangoapps/student/views.py b/djangoapps/student/views.py index a7b02b5bb16eaaac582e680909dc708a715211b2..652cea9bea38ec05b61f477afb3afa5564ac765d 100644 --- a/djangoapps/student/views.py +++ b/djangoapps/student/views.py @@ -10,14 +10,13 @@ from django.conf import settings from django.contrib.auth import logout, authenticate, login from django.contrib.auth.forms import PasswordResetForm from django.contrib.auth.models import User +from django.contrib.auth.decorators import login_required from django.core.context_processors import csrf from django.core.mail import send_mail from django.core.validators import validate_email, validate_slug, ValidationError -from django.db import connection from django.http import HttpResponse, Http404 from django.shortcuts import redirect from mitxmako.shortcuts import render_to_response, render_to_string -from mako import exceptions from django_future.csrf import ensure_csrf_cookie