mitxmako => edxmako

cms/djangoapps/contentstore/views/assets.py

@@ -7,7 +7,7 @@
 from django_future.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_POST
 
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 from cache_toolbox.core import del_cached_content
 
 from xmodule.contentstore.django import contentstore

cms/djangoapps/contentstore/views/checklist.py

@@ -6,7 +6,7 @@
 from django.contrib.auth.decorators import login_required
 from django.views.decorators.http import require_http_methods
 from django_future.csrf import ensure_csrf_cookie
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 from django.http import HttpResponseNotFound
 from django.core.exceptions import PermissionDenied
 from xmodule.modulestore.django import loc_mapper

cms/djangoapps/contentstore/views/component.py

@@ -9,7 +9,7 @@
 from django_future.csrf import ensure_csrf_cookie
 from django.conf import settings
 from xmodule.modulestore.exceptions import ItemNotFoundError
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 
 from xmodule.modulestore.django import modulestore
 from xmodule.util.date_utils import get_default_time_display

cms/djangoapps/contentstore/views/course.py

@@ -16,7 +16,7 @@
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from util.json_request import JsonResponse
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 
 from xmodule.error_module import ErrorDescriptor
 from xmodule.modulestore.django import modulestore, loc_mapper

cms/djangoapps/contentstore/views/dev.py

@@ -4,7 +4,7 @@
 in a 404 error.
 """
 # pylint: disable=W0613
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 
 
 def dev_mode(request):

cms/djangoapps/contentstore/views/error.py

@@ -2,7 +2,7 @@
 
 from django.http import (HttpResponse, HttpResponseServerError,
                          HttpResponseNotFound)
-from mitxmako.shortcuts import render_to_string, render_to_response
+from edxmako.shortcuts import render_to_string, render_to_response
 import functools
 import json
 

cms/djangoapps/contentstore/views/helpers.py

@@ -1,6 +1,6 @@
 from django.http import HttpResponse
 from django.shortcuts import redirect
-from mitxmako.shortcuts import render_to_string, render_to_response
+from edxmako.shortcuts import render_to_string, render_to_response
 
 __all__ = ['edge', 'event', 'landing']
 

cms/djangoapps/contentstore/views/import_export.py

@@ -21,7 +21,7 @@
 from django.views.decorators.http import require_http_methods, require_GET
 from django.utils.translation import ugettext as _
 
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 from auth.authz import create_all_course_groups
 
 from xmodule.modulestore.xml_importer import import_from_xml

cms/djangoapps/contentstore/views/item.py

@@ -30,7 +30,7 @@
 from django.http import HttpResponseBadRequest
 from xblock.fields import Scope
 from preview import handler_prefix, get_preview_html
-from mitxmako.shortcuts import render_to_response, render_to_string
+from edxmako.shortcuts import render_to_response, render_to_string
 from models.settings.course_grading import CourseGradingModel
 
 __all__ = ['orphan_handler', 'xblock_handler']

cms/djangoapps/contentstore/views/preview.py

@@ -5,7 +5,7 @@
 from django.core.urlresolvers import reverse
 from django.http import Http404, HttpResponseBadRequest
 from django.contrib.auth.decorators import login_required
-from mitxmako.shortcuts import render_to_response, render_to_string
+from edxmako.shortcuts import render_to_response, render_to_string
 
 from xmodule_modifiers import replace_static_urls, wrap_xblock
 from xmodule.error_module import ErrorDescriptor

cms/djangoapps/contentstore/views/public.py

@@ -6,7 +6,7 @@
 from django.shortcuts import redirect
 from django.conf import settings
 
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 
 from external_auth.views import ssl_login_shortcut
 

cms/djangoapps/contentstore/views/tabs.py

@@ -9,7 +9,7 @@
 from django.core.exceptions import PermissionDenied
 from django_future.csrf import ensure_csrf_cookie
 from django.views.decorators.http import require_http_methods
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 from xmodule.modulestore import Location
 from xmodule.modulestore.inheritance import own_metadata
 from xmodule.modulestore.django import modulestore

cms/djangoapps/contentstore/views/user.py

@@ -7,7 +7,7 @@
 from django.utils.translation import ugettext as _
 from django.views.decorators.http import require_POST
 from django_future.csrf import ensure_csrf_cookie
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 
 from xmodule.modulestore.django import modulestore, loc_mapper
 from util.json_request import JsonResponse

cms/djangoapps/course_creators/admin.py

@@ -8,7 +8,7 @@
 from ratelimitbackend import admin
 from django.conf import settings
 from django.dispatch import receiver
-from mitxmako.shortcuts import render_to_string
+from edxmako.shortcuts import render_to_string
 from django.core.mail import send_mail
 from smtplib import SMTPException
 

cms/envs/acceptance.py

@@ -34,7 +34,7 @@ def seed():
 MODULESTORE_OPTIONS = {
     'default_class': 'xmodule.raw_module.RawDescriptor',
     'fs_root': TEST_ROOT / "data",
-    'render_template': 'mitxmako.shortcuts.render_to_string',
+    'render_template': 'edxmako.shortcuts.render_to_string',
 }
 
 MODULESTORE = {

cms/envs/common.py

@@ -161,7 +161,7 @@
 
     'django.contrib.messages.middleware.MessageMiddleware',
     'track.middleware.TrackMiddleware',
-    'mitxmako.middleware.MakoMiddleware',
+    'edxmako.middleware.MakoMiddleware',
 
     # Detects user-requested locale from 'accept-language' header in http request
     'django.middleware.locale.LocaleMiddleware',
@@ -393,7 +393,7 @@
     'datadog',
 
     # For asset pipelining
-    'mitxmako',
+    'edxmako',
     'pipeline',
     'staticfiles',
     'static_replace',

cms/envs/dev.py

@@ -30,7 +30,7 @@
 modulestore_options = {
     'default_class': 'xmodule.raw_module.RawDescriptor',
     'fs_root': GITHUB_REPO_ROOT,
-    'render_template': 'mitxmako.shortcuts.render_to_string',
+    'render_template': 'edxmako.shortcuts.render_to_string',
 }
 
 MODULESTORE = {

cms/envs/test.py

@@ -60,7 +60,7 @@
 MODULESTORE_OPTIONS = {
     'default_class': 'xmodule.raw_module.RawDescriptor',
     'fs_root': TEST_ROOT / "data",
-    'render_template': 'mitxmako.shortcuts.render_to_string',
+    'render_template': 'edxmako.shortcuts.render_to_string',
 }
 
 MODULESTORE = {

common/djangoapps/course_groups/views.py

@@ -9,7 +9,7 @@
 import re
 
 from courseware.courses import get_course_with_access
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 
 from . import cohorts
 

common/djangoapps/course_modes/views.py

@@ -13,7 +13,7 @@
 from django.contrib.auth.decorators import login_required
 from django.utils.decorators import method_decorator
 
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 
 from course_modes.models import CourseMode
 from courseware.access import has_access

common/djangoapps/mitxmako/makoloader.py → common/djangoapps/edxmako/makoloader.py

@@ -6,7 +6,7 @@
 from django.template.loaders.filesystem import Loader as FilesystemLoader
 from django.template.loaders.app_directories import Loader as AppDirectoriesLoader
 
-from mitxmako.template import Template
+from edxmako.template import Template
 
 import tempdir
 

common/djangoapps/mitxmako/shortcuts.py → common/djangoapps/edxmako/shortcuts.py

@@ -16,8 +16,8 @@
 from django.http import HttpResponse
 import logging
 
-import mitxmako
-import mitxmako.middleware
+import edxmako
+import edxmako.middleware
 from django.conf import settings
 from django.core.urlresolvers import reverse
 log = logging.getLogger(__name__)
@@ -81,15 +81,15 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'):
     context_instance['marketing_link'] = marketing_link
 
     # In various testing contexts, there might not be a current request context.
-    if mitxmako.middleware.requestcontext is not None:
-        for d in mitxmako.middleware.requestcontext:
+    if edxmako.middleware.requestcontext is not None:
+        for d in edxmako.middleware.requestcontext:
             context_dictionary.update(d)
     for d in context_instance:
         context_dictionary.update(d)
     if context:
         context_dictionary.update(context)
     # fetch and render template
-    template = mitxmako.lookup[namespace].get_template(template_name)
+    template = edxmako.lookup[namespace].get_template(template_name)
     return template.render_unicode(**context_dictionary)
 
 

common/djangoapps/mitxmako/startup.py → common/djangoapps/edxmako/startup.py

@@ -6,7 +6,7 @@
 from django.conf import settings
 from mako.lookup import TemplateLookup
 
-import mitxmako
+import edxmako
 
 
 def run():
@@ -30,4 +30,4 @@ def run():
             encoding_errors='replace',
         )
 
-    mitxmako.lookup = lookup
+    edxmako.lookup = lookup

common/djangoapps/mitxmako/template.py → common/djangoapps/edxmako/template.py

@@ -14,10 +14,10 @@
 
 from django.conf import settings
 from mako.template import Template as MakoTemplate
-from mitxmako.shortcuts import marketing_link
+from edxmako.shortcuts import marketing_link
 
-import mitxmako
-import mitxmako.middleware
+import edxmako
+import edxmako.middleware
 
 django_variables = ['lookup', 'output_encoding', 'encoding_errors']
 
@@ -34,7 +34,7 @@ class Template(MakoTemplate):
     def __init__(self, *args, **kwargs):
         """Overrides base __init__ to provide django variable overrides"""
         if not kwargs.get('no_django', False):
-            overrides = dict([(k, getattr(mitxmako, k, None),) for k in django_variables])
+            overrides = dict([(k, getattr(edxmako, k, None),) for k in django_variables])
             overrides['lookup'] = overrides['lookup']['main']
             kwargs.update(overrides)
         super(Template, self).__init__(*args, **kwargs)
@@ -48,8 +48,8 @@ def render(self, context_instance):
         context_dictionary = {}
 
         # In various testing contexts, there might not be a current request context.
-        if mitxmako.middleware.requestcontext is not None:
-            for d in mitxmako.middleware.requestcontext:
+        if edxmako.middleware.requestcontext is not None:
+            for d in edxmako.middleware.requestcontext:
                 context_dictionary.update(d)
         for d in context_instance:
             context_dictionary.update(d)

common/djangoapps/mitxmako/tests.py → common/djangoapps/edxmako/tests.py

@@ -1,14 +1,14 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 from django.core.urlresolvers import reverse
-from mitxmako.shortcuts import marketing_link
+from edxmako.shortcuts import marketing_link
 from mock import patch
 from util.testing import UrlResetMixin
 
 
 class ShortcutsTests(UrlResetMixin, TestCase):
     """
-    Test the mitxmako shortcuts file
+    Test the edxmako shortcuts file
     """
     @override_settings(MKTG_URLS={'ROOT': 'dummy-root', 'ABOUT': '/about-us'})
     @override_settings(MKTG_URL_LINK_MAP={'ABOUT': 'login'})

common/djangoapps/external_auth/views.py

@@ -28,7 +28,7 @@
 from django.shortcuts import redirect
 from django.utils.translation import ugettext as _
 
-from mitxmako.shortcuts import render_to_response, render_to_string
+from edxmako.shortcuts import render_to_response, render_to_string
 try:
     from django.views.decorators.csrf import csrf_exempt
 except ImportError:

common/djangoapps/pipeline_js/views.py

@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.http import HttpResponse
 from staticfiles.storage import staticfiles_storage
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 
 
 def get_xmodule_urls():

common/djangoapps/pipeline_mako/__init__.py

@@ -1,4 +1,4 @@
-from mitxmako.shortcuts import render_to_string
+from edxmako.shortcuts import render_to_string
 
 from pipeline.conf import settings
 from pipeline.packager import Packager

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

@@ -1,7 +1,7 @@
 from django.core.management.base import BaseCommand
 from django.contrib.auth.models import User
 
-import mitxmako
+import edxmako
 
 
 class Command(BaseCommand):
@@ -15,8 +15,8 @@ def handle(self, *args, **options):
         #text = open(args[0]).read()
         #subject = open(args[1]).read()
         users = User.objects.all()
-        text = mitxmako.lookup['main'].get_template('email/' + args[0] + ".txt").render()
-        subject = mitxmako.lookup['main'].get_template('email/' + args[0] + "_subject.txt").render().strip()
+        text = edxmako.lookup['main'].get_template('email/' + args[0] + ".txt").render()
+        subject = edxmako.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,7 +4,7 @@
 from django.core.management.base import BaseCommand
 from django.conf import settings
 
-import mitxmako
+import edxmako
 
 from django.core.mail import send_mass_mail
 import sys
@@ -39,8 +39,8 @@ def handle(self, *args, **options):
 
         users = [u.strip() for u in open(user_file).readlines()]
 
-        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()
+        message = edxmako.lookup['main'].get_template('emails/' + message_base + "_body.txt").render()
+        subject = edxmako.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/views.py

@@ -35,7 +35,7 @@
 
 from ratelimitbackend.exceptions import RateLimitException
 
-from mitxmako.shortcuts import render_to_response, render_to_string
+from edxmako.shortcuts import render_to_response, render_to_string
 
 from course_modes.models import CourseMode
 from student.models import (

common/djangoapps/track/views.py

@@ -9,7 +9,7 @@
 
 from django_future.csrf import ensure_csrf_cookie
 
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 
 from track import tracker
 from track import contexts

common/djangoapps/util/views.py

@@ -9,7 +9,7 @@
 from django.http import (Http404, HttpResponse, HttpResponseNotAllowed,
                          HttpResponseServerError)
 from dogapi import dog_stats_api
-from mitxmako.shortcuts import render_to_response
+from edxmako.shortcuts import render_to_response
 import zendesk
 
 import calc

common/djangoapps/xmodule_modifiers.py

@@ -9,7 +9,7 @@
 
 from django.conf import settings
 from django.utils.timezone import UTC
-from mitxmako.shortcuts import render_to_string
+from edxmako.shortcuts import render_to_string
 from xblock.fragment import Fragment
 
 from xmodule.seq_module import SequenceModule