Add in mitx libraries folder

anserv/mitx_libraries/__init__.py

+

anserv/modules/course_stats/course_stats.py

@@ -23,13 +23,7 @@ import re
 import os
 from django.http import HttpResponse
 
-if settings.IMPORT_MITX_MODULES:
-    LMS_PATH = "{0}/{1}/{2}".format(settings.MITX_PATH, "lms", "djangoapps")
-    sys.path.append(LMS_PATH)
-    from courseware.models import StudentModule
-else:
-    from courseware_old.models import StudentModule
-    StudentModule._meta.app_label = "courseware"
+from courseware.models import StudentModule
 
 from mitxmako.shortcuts import render_to_response, render_to_string
 

anserv/modules/tasks.py

@@ -12,17 +12,11 @@ from dateutil import parser
 log=logging.getLogger(__name__)
 
 if settings.IMPORT_MITX_MODULES:
-    sys.path.append(settings.DJANGOAPPS_PATH)
-    sys.path.append(settings.COMMON_PATH)
-    sys.path.append(settings.LMS_LIB_PATH)
-
     from courseware import grades
-    from courseware.models import StudentModule
     from courseware.courses import get_course_with_access
     from courseware.model_data import ModelDataCache, LmsKeyValueStore
-else:
-    from courseware_old.models import StudentModule
-    StudentModule._meta.app_label = "courseware"
+
+from courseware.models import StudentModule
 
 from django.contrib.auth.models import User
 import re

anserv/modules/user_stats/user_stats.py

@@ -13,13 +13,7 @@ log=logging.getLogger(__name__)
 import re
 import sys
 
-if settings.IMPORT_MITX_MODULES:
-    LMS_PATH = "{0}/{1}/{2}".format(settings.MITX_PATH, "lms", "djangoapps")
-    sys.path.append(LMS_PATH)
-    from courseware.models import StudentModule
-else:
-    from courseware_old.models import StudentModule
-    StudentModule._meta.app_label = "courseware"
+from courseware.models import StudentModule
 
 from mitxmako.shortcuts import render_to_response, render_to_string
 

anserv/settings.py

@@ -5,12 +5,6 @@ import sys
 from path import path
 import datetime
 
-IMPORT_MITX_MODULES = False
-MITX_PATH = os.path.abspath("../../mitx/")
-DJANGOAPPS_PATH = "{0}/{1}/{2}".format(MITX_PATH, "lms", "djangoapps")
-LMS_LIB_PATH = "{0}/{1}/{2}".format(MITX_PATH, "lms", "lib")
-COMMON_PATH = "{0}/{1}/{2}".format(MITX_PATH, "common", "djangoapps")
-
 TIME_BETWEEN_DATA_REGENERATION = datetime.timedelta(minutes=1)
 
 #Initialize celery
@@ -23,10 +17,24 @@ ROOT_PATH = path(__file__).dirname()
 REPO_PATH = ROOT_PATH.dirname()
 ENV_ROOT = REPO_PATH.dirname()
 
-IMPORT_GIT_MODULES = False
-GIT_CLONE_URL = "git@github.com:MITx/{0}.git"
-COURSE_FILE_PATH = os.path.abspath(os.path.join(ENV_ROOT, "data"))
-COURSE_CONFIG_PATH = os.path.abspath(os.path.join(REPO_PATH, "course_listings.json"))
+IMPORT_MITX_MODULES = True
+if IMPORT_MITX_MODULES:
+    MITX_PATH = os.path.abspath("../../mitx/")
+    DJANGOAPPS_PATH = "{0}/{1}/{2}".format(MITX_PATH, "lms", "djangoapps")
+    LMS_LIB_PATH = "{0}/{1}/{2}".format(MITX_PATH, "lms", "lib")
+    COMMON_PATH = "{0}/{1}/{2}".format(MITX_PATH, "common", "djangoapps")
+
+    sys.path.append(MITX_PATH)
+    sys.path.append(DJANGOAPPS_PATH)
+    sys.path.append(LMS_LIB_PATH)
+    sys.path.append(COMMON_PATH)
+
+    IMPORT_GIT_MODULES = False
+    GIT_CLONE_URL = "git@github.com:MITx/{0}.git"
+    COURSE_FILE_PATH = os.path.abspath(os.path.join(ENV_ROOT, "data"))
+    COURSE_CONFIG_PATH = os.path.abspath(os.path.join(REPO_PATH, "course_listings.json"))
+else:
+    sys.path.append(ROOT_PATH / "mitx_libraries")
 
 DUMMY_MODE = False
 
@@ -183,8 +191,6 @@ INSTALLED_APPS = (
     'frontend',
     'pipeline',
     'staticfiles',
-    'courseware_old',
-    'student_old',
     'pipeline',
 )