diff options
| author | Jonas Liljestrand | 2012-11-17 17:46:16 +0100 | 
|---|---|---|
| committer | Jonas Liljestrand | 2012-11-17 17:46:16 +0100 | 
| commit | f0d4232c1de2c3154535312d1d48c59854ffa162 (patch) | |
| tree | da0fb473f5422cbc566bcb939455ff7fa3e94b8f /rest_framework | |
| parent | 346a79b170b0a25fd28354de765c5aa5aca9a119 (diff) | |
| download | django-rest-framework-f0d4232c1de2c3154535312d1d48c59854ffa162.tar.bz2 | |
Django 1.5 support, and awareness for AUTH_USER_MODEL
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/authtoken/models.py | 16 | 
1 files changed, 15 insertions, 1 deletions
| diff --git a/rest_framework/authtoken/models.py b/rest_framework/authtoken/models.py index 5b3071aa..610de8d8 100644 --- a/rest_framework/authtoken/models.py +++ b/rest_framework/authtoken/models.py @@ -2,14 +2,28 @@ import uuid  import hmac  from hashlib import sha1  from django.db import models +from django import VERSION +try: +    from django.db.models.auth import User +        user_model = User +    except ImportError: +        raise ImportError +    else: +        raise + +if VERSION[:2] in ((1, 5,),): +    from django.conf import settings +    if hasattr(settings, AUTH_USER_MODEL): +        user_model = settings.AUTH_USER_MODEL +      class Token(models.Model):      """      The default authorization token model.      """      key = models.CharField(max_length=40, primary_key=True) -    user = models.OneToOneField('auth.User', related_name='auth_token') +    user = models.OneToOneField(user_model, related_name='auth_token')      created = models.DateTimeField(auto_now_add=True)      def save(self, *args, **kwargs): | 
