From 363c138ed25f364a45e77810bec390993e500af7 Mon Sep 17 00:00:00 2001 From: Michael Henson Date: Sun, 23 Jun 2013 14:13:11 -0700 Subject: [PATCH] Fix User model compatibility shim so it uses the django-provided mechanism --- rest_framework/compat.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/rest_framework/compat.py b/rest_framework/compat.py index a19bd778b..3e9de407d 100644 --- a/rest_framework/compat.py +++ b/rest_framework/compat.py @@ -82,11 +82,8 @@ def get_concrete_model(model_cls): # Django 1.5 add support for custom auth user model if django.VERSION >= (1, 5): - from django.conf import settings - if hasattr(settings, 'AUTH_USER_MODEL'): - User = settings.AUTH_USER_MODEL - else: - from django.contrib.auth.models import User + from django.contrib.auth import get_user_model + User = get_user_model() else: try: from django.contrib.auth.models import User