Merge pull request #5942 from edx/cohorted-courseware

Cohorted courseware

common/djangoapps/student/tests/test_create_account.py

@@ -12,7 +12,7 @@ from django.test import TestCase, TransactionTestCase
 
 import mock
 
-from user_api.models import UserPreference
+from openedx.core.djangoapps.user_api.models import UserPreference
 from lang_pref import LANGUAGE_KEY
 
 from edxmako.tests import mako_middleware_process_request

common/djangoapps/student/tests/test_enrollment.py

@@ -106,7 +106,7 @@ class EnrollmentTest(ModuleStoreTestCase):
         self.assertFalse(CourseEnrollment.is_enrolled(self.user, self.course.id))
 
     @patch.dict(settings.FEATURES, {'ENABLE_MKTG_EMAIL_OPT_IN': True})
-    @patch('user_api.api.profile.update_email_opt_in')
+    @patch('openedx.core.djangoapps.user_api.api.profile.update_email_opt_in')
     @ddt.data(
         ([], 'true'),
         ([], 'false'),

common/djangoapps/student/views.py

@@ -79,7 +79,7 @@ import external_auth.views
 from bulk_email.models import Optout, CourseAuthorization
 import shoppingcart
 from shoppingcart.models import DonationConfiguration
-from user_api.models import UserPreference
+from openedx.core.djangoapps.user_api.models import UserPreference
 from lang_pref import LANGUAGE_KEY
 
 import track.views
@@ -105,7 +105,7 @@ from student.helpers import (
 )
 from xmodule.error_module import ErrorDescriptor
 from shoppingcart.models import CourseRegistrationCode
-from user_api.api import profile as profile_api
+from openedx.core.djangoapps.user_api.api import profile as profile_api
 
 import analytics
 from eventtracking import tracker