Skip to content

Commit 9411ddc

Browse files
committed
Compatibility with swappable User model in Django 1.5
1 parent a7c6d07 commit 9411ddc

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

piston/models.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import urllib, time, urlparse
22

33
# Django imports
4+
from django.conf import settings
45
from django.db.models.signals import post_save, post_delete
56
from django.db import models
67
from django.contrib.auth.models import User
@@ -21,6 +22,10 @@
2122
('rejected', 'Rejected')
2223
)
2324

25+
26+
AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
27+
28+
2429
def generate_random(length=SECRET_SIZE):
2530
return User.objects.make_random_password(length=length)
2631

@@ -41,7 +46,8 @@ class Consumer(models.Model):
4146
secret = models.CharField(max_length=SECRET_SIZE)
4247

4348
status = models.CharField(max_length=16, choices=CONSUMER_STATES, default='pending')
44-
user = models.ForeignKey(User, null=True, blank=True, related_name='consumers')
49+
user = models.ForeignKey(AUTH_USER_MODEL,
50+
null=True, blank=True, related_name='consumers')
4551

4652
objects = ConsumerManager()
4753

@@ -82,7 +88,8 @@ class Token(models.Model):
8288
timestamp = models.IntegerField(default=long(time.time()))
8389
is_approved = models.BooleanField(default=False)
8490

85-
user = models.ForeignKey(User, null=True, blank=True, related_name='tokens')
91+
user = models.ForeignKey(AUTH_USER_MODEL,
92+
null=True, blank=True, related_name='tokens')
8693
consumer = models.ForeignKey(Consumer)
8794

8895
callback = models.CharField(max_length=255, null=True, blank=True)

0 commit comments

Comments
 (0)