Merge pull request #811 from cpennington/initialize-mitxmako-at-startup

Move mitxmako initialization to a startup module

common/djangoapps/student/management/commands/6002exportusers.py

@@ -16,10 +16,6 @@ from django.contrib.auth.models import User
 
 from student.models import UserProfile
 
-import mitxmako.middleware as middleware
-
-middleware.MakoMiddleware()
-
 
 class Command(BaseCommand):
     help = \

common/djangoapps/student/management/commands/6002importusers.py

@@ -12,10 +12,6 @@ from django.contrib.auth.models import User
 
 from student.models import UserProfile
 
-import mitxmako.middleware as middleware
-
-middleware.MakoMiddleware()
-
 
 def import_user(u):
     user_info = u['u']

common/djangoapps/student/management/commands/assigngroups.py

@@ -1,7 +1,6 @@
 from django.core.management.base import BaseCommand
 from django.contrib.auth.models import User
 
-import mitxmako.middleware as middleware
 from student.models import UserTestGroup
 
 import random
@@ -11,8 +10,6 @@ import datetime
 import json
 from pytz import UTC
 
-middleware.MakoMiddleware()
-
 
 def group_from_value(groups, v):
     ''' Given group: (('a',0.3),('b',0.4),('c',0.3)) And random value

common/djangoapps/student/management/commands/emaillist.py

@@ -1,10 +1,6 @@
 from django.core.management.base import BaseCommand
 from django.contrib.auth.models import User
 
-import mitxmako.middleware as middleware
-
-middleware.MakoMiddleware()
-
 
 class Command(BaseCommand):
     help = \

common/djangoapps/student/management/commands/massemail.py

@@ -1,9 +1,7 @@
 from django.core.management.base import BaseCommand
 from django.contrib.auth.models import User
 
-import mitxmako.middleware as middleware
-
-middleware.MakoMiddleware()
+import mitxmako
 
 
 class Command(BaseCommand):
@@ -17,8 +15,8 @@ body, and an _subject.txt for the subject. '''
         #text = open(args[0]).read()
         #subject = open(args[1]).read()
         users = User.objects.all()
-        text = middleware.lookup['main'].get_template('email/' + args[0] + ".txt").render()
-        subject = middleware.lookup['main'].get_template('email/' + args[0] + "_subject.txt").render().strip()
+        text = mitxmako.lookup['main'].get_template('email/' + args[0] + ".txt").render()
+        subject = mitxmako.lookup['main'].get_template('email/' + args[0] + "_subject.txt").render().strip()
         for user in users:
             if user.is_active:
                 user.email_user(subject, text)

common/djangoapps/student/management/commands/massemailtxt.py

@@ -4,15 +4,13 @@ import time
 from django.core.management.base import BaseCommand
 from django.conf import settings
 
-import mitxmako.middleware as middleware
+import mitxmako
 
 from django.core.mail import send_mass_mail
 import sys
 
 import datetime
 
-middleware.MakoMiddleware()
-
 
 def chunks(l, n):
     """ Yield successive n-sized chunks from l.
@@ -41,8 +39,8 @@ rate -- messages per second
 
         users = [u.strip() for u in open(user_file).readlines()]
 
-        message = middleware.lookup['main'].get_template('emails/' + message_base + "_body.txt").render()
-        subject = middleware.lookup['main'].get_template('emails/' + message_base + "_subject.txt").render().strip()
+        message = mitxmako.lookup['main'].get_template('emails/' + message_base + "_body.txt").render()
+        subject = mitxmako.lookup['main'].get_template('emails/' + message_base + "_subject.txt").render().strip()
         rate = int(ratestr)
 
         self.log_file = open(logfilename, "a+", buffering=0)

common/djangoapps/student/management/commands/userinfo.py

@@ -1,13 +1,10 @@
 from django.core.management.base import BaseCommand
 from django.contrib.auth.models import User
 
-import mitxmako.middleware as middleware
 import json
 
 from student.models import UserProfile
 
-middleware.MakoMiddleware()
-
 
 class Command(BaseCommand):
     help = \