diff options
| author | Jonas Liljestrand | 2012-11-17 20:35:15 +0100 |
|---|---|---|
| committer | Jonas Liljestrand | 2012-11-17 20:35:15 +0100 |
| commit | 8eb4bb8090a84282c3537641e8ecb5c38a33fc41 (patch) | |
| tree | 3509516f388c5541313669a04cd560d7039d7deb /rest_framework/authtoken/models.py | |
| parent | cd482c0ad22bbb810378c61e02a790e5e3796aa7 (diff) | |
| download | django-rest-framework-8eb4bb8090a84282c3537641e8ecb5c38a33fc41.tar.bz2 | |
Moved function for getting correct user model to compat.py
Diffstat (limited to 'rest_framework/authtoken/models.py')
| -rw-r--r-- | rest_framework/authtoken/models.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index 3b8bffeb..4da2aa62 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -1,29 +1,16 @@ import uuid import hmac from hashlib import sha1 +from rest_framework.compat import User from django.db import models -from django import VERSION -if VERSION[:2] in ((1, 5,),): - from django.conf import settings - if hasattr(settings, 'AUTH_USER_MODEL'): - user_model = settings.AUTH_USER_MODEL - else: - from django.contrib.auth.models import User as user_model -else: - try: - from django.db.models.auth import User as user_model - except ImportError: - raise ImportError('User model is not to be found.') - - class Token(models.Model): """ The default authorization token model. """ key = models.CharField(max_length=40, primary_key=True) - user = models.OneToOneField(user_model, related_name='auth_token') + user = models.OneToOneField(User, related_name='auth_token') created = models.DateTimeField(auto_now_add=True) def save(self, *args, **kwargs): |
