Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
reverted settings removal
  • Loading branch information
auvipy committed Jun 7, 2016
commit 2c0bcc6275b76c89be8fa674df199b4f73725cf1
1 change: 1 addition & 0 deletions rest_framework/authtoken/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import binascii
import os

from django.conf import settings
from django.contrib.auth.models import User
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this remove the ability to use a custom user ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then should stick with AUTH_USER_MODEL instead?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

from django.db import models
from django.utils.encoding import python_2_unicode_compatible
Expand Down