Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6208 from edx/clintonb/release-fix

Browse Source 
Corrected Import Statement
This commit is contained in:
Ben Patterson
2014-12-09 21:29:46 -05:00
parent c6f991fc8f 6e1471edc4
commit cdca3fcbc2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/djangoapps/third_party_auth/pipeline.py
View File

@@ -101,7 +101,7 @@ from . import provider
# `AUTH_ENROLL_COURSE_ID_KEY` provides the course ID that a student # `AUTH_ENROLL_COURSE_ID_KEY` provides the course ID that a student
# is trying to enroll in, used to generate analytics events # is trying to enroll in, used to generate analytics events
# and auto-enroll students. # and auto-enroll students.
from user_api.api import profile from openedx.core.djangoapps.user_api.api import profile
AUTH_ENTRY_KEY = 'auth_entry' AUTH_ENTRY_KEY = 'auth_entry'
AUTH_REDIRECT_KEY = 'next' AUTH_REDIRECT_KEY = 'next'

2
common/djangoapps/third_party_auth/tests/test_change_enrollment.py
View File

@@ -19,7 +19,7 @@ from student.models import CourseEnrollment
from xmodule.modulestore.tests.django_utils import ( from xmodule.modulestore.tests.django_utils import (
ModuleStoreTestCase, mixed_store_config ModuleStoreTestCase, mixed_store_config
) )
from user_api.models import UserOrgTag from openedx.core.djangoapps.user_api.models import UserOrgTag
MODULESTORE_CONFIG = mixed_store_config(settings.COMMON_TEST_DATA_ROOT, {}, include_xml=False) MODULESTORE_CONFIG = mixed_store_config(settings.COMMON_TEST_DATA_ROOT, {}, include_xml=False)