From 2189ef7c50bd22d11f1027cf203e8615c8f5b41c Mon Sep 17 00:00:00 2001 From: muzaffaryousaf Date: Wed, 28 Jan 2015 15:01:40 +0500 Subject: [PATCH] Fixing the library tests. TNL-836 --- common/djangoapps/xblock_django/user_service.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/djangoapps/xblock_django/user_service.py b/common/djangoapps/xblock_django/user_service.py index 7b9e290492..3c54eb61e4 100644 --- a/common/djangoapps/xblock_django/user_service.py +++ b/common/djangoapps/xblock_django/user_service.py @@ -2,10 +2,8 @@ Support for converting a django user to an XBlock user """ from django.contrib.auth.models import User - -from xblock.reference.user_service import XBlockUser, UserService -from student.models import anonymous_id_for_user, get_user_by_username_or_email from opaque_keys.edx.locations import SlashSeparatedCourseKey +from xblock.reference.user_service import XBlockUser, UserService ATTR_KEY_IS_AUTHENTICATED = 'edx-platform.is_authenticated' ATTR_KEY_USER_ID = 'edx-platform.user_id' @@ -42,6 +40,9 @@ class DjangoXBlockUserService(UserService): if not self._user_is_staff: return None + # If we import these in start, it causes the contentstore library tests failed. + from student.models import anonymous_id_for_user, get_user_by_username_or_email + try: user = get_user_by_username_or_email(username_or_email=username) except User.DoesNotExist: