aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-09-17 15:49:27 +0100
committerTom Christie2014-09-17 15:49:27 +0100
commit543c6c8e3504b6d715052dac844039934de76f2a (patch)
treefccf38e417ba96a01c80af3b4e78a04dfa08b413
parent92fb08bc6d66c33e7b4ea6689b300cf83e0b06d8 (diff)
parentde5fbf7d63245e9d14844e66fdf16f88dbfae2e5 (diff)
downloaddjango-rest-framework-543c6c8e3504b6d715052dac844039934de76f2a.tar.bz2
Merge pull request #1883 from jpadilla/master
Update authtoken latest Django 1.7 migration
-rw-r--r--rest_framework/authtoken/migrations/0001_initial.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/rest_framework/authtoken/migrations/0001_initial.py b/rest_framework/authtoken/migrations/0001_initial.py
index 2e5d6b47..769f6202 100644
--- a/rest_framework/authtoken/migrations/0001_initial.py
+++ b/rest_framework/authtoken/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
@@ -15,12 +15,11 @@ class Migration(migrations.Migration):
migrations.CreateModel(
name='Token',
fields=[
- ('key', models.CharField(max_length=40, serialize=False, primary_key=True)),
- ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, to_field='id')),
+ ('key', models.CharField(primary_key=True, serialize=False, max_length=40)),
('created', models.DateTimeField(auto_now_add=True)),
+ ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, related_name='auth_token')),
],
options={
- 'abstract': False,
},
bases=(models.Model,),
),