diff options
| author | Tom Christie | 2014-03-06 20:33:27 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-03-06 20:33:27 +0000 |
| commit | 2090f452b224e60853b40e73d1d0e9aad58cd24a (patch) | |
| tree | 9550083d51dce99acf2e744e85d891dd803d645c /rest_framework/tests/test_authentication.py | |
| parent | ef94861c2d31592c3760a0c0758beb084f452c03 (diff) | |
| parent | 34887ed75625a58d00c986b3ea5526877f4724b2 (diff) | |
| download | django-rest-framework-2090f452b224e60853b40e73d1d0e9aad58cd24a.tar.bz2 | |
Merge pull request #1455 from ericbuehl/master
don't implicitly import provider.oauth2
Diffstat (limited to 'rest_framework/tests/test_authentication.py')
| -rw-r--r-- | rest_framework/tests/test_authentication.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rest_framework/tests/test_authentication.py b/rest_framework/tests/test_authentication.py index f072b81b..8caeb081 100644 --- a/rest_framework/tests/test_authentication.py +++ b/rest_framework/tests/test_authentication.py @@ -19,7 +19,7 @@ from rest_framework.authentication import ( ) from rest_framework.authtoken.models import Token from rest_framework.compat import patterns, url, include -from rest_framework.compat import oauth2_provider, oauth2_provider_models, oauth2_provider_scope +from rest_framework.compat import oauth2_provider, oauth2_provider_scope from rest_framework.compat import oauth, oauth_provider from rest_framework.test import APIRequestFactory, APIClient from rest_framework.views import APIView @@ -488,7 +488,7 @@ class OAuth2Tests(TestCase): self.ACCESS_TOKEN = "access_token" self.REFRESH_TOKEN = "refresh_token" - self.oauth2_client = oauth2_provider_models.Client.objects.create( + self.oauth2_client = oauth2_provider.oauth2.models.Client.objects.create( client_id=self.CLIENT_ID, client_secret=self.CLIENT_SECRET, redirect_uri='', @@ -497,12 +497,12 @@ class OAuth2Tests(TestCase): user=None, ) - self.access_token = oauth2_provider_models.AccessToken.objects.create( + self.access_token = oauth2_provider.oauth2.models.AccessToken.objects.create( token=self.ACCESS_TOKEN, client=self.oauth2_client, user=self.user, ) - self.refresh_token = oauth2_provider_models.RefreshToken.objects.create( + self.refresh_token = oauth2_provider.oauth2.models.RefreshToken.objects.create( user=self.user, access_token=self.access_token, client=self.oauth2_client |
