Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]

openedx/core/djangoapps/user_api/accounts/tests/test_views.py

@@ -8,7 +8,6 @@ import hashlib
 import json
 
 import unittest
-from collections import OrderedDict
 from copy import deepcopy
 from mock import patch
 from nose.plugins.attrib import attr
@@ -30,7 +29,7 @@ from openedx.core.djangolib.testing.utils import CacheIsolationTestCase, skip_un
 from openedx.core.lib.token_utils import JwtBuilder
 from student.models import UserProfile, LanguageProficiency, PendingEmailChange
 from student.tests.factories import (
-    AdminFactory, ContentTypeFactory, TEST_PASSWORD, PermissionFactory, SuperuserFactory, UserFactory
+    ContentTypeFactory, TEST_PASSWORD, PermissionFactory, SuperuserFactory, UserFactory
 )
 
 TEST_PROFILE_IMAGE_UPLOADED_AT = datetime.datetime(2002, 1, 9, 15, 43, 01, tzinfo=UTC)

openedx/core/djangoapps/user_api/preferences/api.py

@@ -15,14 +15,13 @@ from django.utils.translation import ugettext_noop
 from openedx.core.lib.time_zone_utils import get_display_time_zone
 from pytz import common_timezones, common_timezones_set, country_timezones
 from student.models import User, UserProfile
-from request_cache import get_request_or_stub
 from ..errors import (
     UserAPIInternalError, UserAPIRequestError, UserNotFound, UserNotAuthorized,
     PreferenceValidationError, PreferenceUpdateError, CountryCodeError
 )
 from ..helpers import intercept_errors, serializer_is_dirty
 from ..models import UserOrgTag, UserPreference
-from ..serializers import UserSerializer, RawUserPreferenceSerializer
+from ..serializers import RawUserPreferenceSerializer
 
 log = logging.getLogger(__name__)
 

openedx/core/djangoapps/user_api/serializers.py

@@ -6,7 +6,6 @@ from django.utils.timezone import now
 from rest_framework import serializers
 
 from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
-from student.models import UserProfile
 
 from .models import UserPreference