encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 17:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed migration to support django 1.5

Browse Source
This commit is contained in:
Jonas Liljestrand 2012-11-18 21:12:06 +01:00
parent 9f378d0dd4
commit 91c0249c9d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/authtoken/migrations/0001_initial.py
View File

@ -3,6 +3,7 @@ import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
from rest_framework.compat import User
class Migration(SchemaMigration):
@ -11,7 +12,7 @@ class Migration(SchemaMigration):
# Adding model 'Token'
db.create_table('authtoken_token', (
('key', self.gf('django.db.models.fields.CharField')(max_length=40, primary_key=True)),
('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='auth_token', unique=True, to=orm['auth.User'])),
('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='auth_token', unique=True, to=orm["%s.%s" % (User._meta.app_label, User._meta.object_name)])),
('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
))
db.send_create_signal('authtoken', ['Token'])

2
rest_framework/compat.py
View File

@ -38,7 +38,7 @@ else:
try:
from django.contrib.auth.models import User
except ImportError:
raise ImportError('User model is not to be found.')
raise ImportError(u"User model is not to be found.")
# First implementation of Django class-based views did not include head method