from django.conf import settings
import django

__all__ = ['User', 'AUTH_USER_MODEL']

AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.USER')

# Django 1.5+ compatibility
if django.VERSION >= (1, 5):
    from django.contrib.auth import get_user_model
    User = get_user_model()
else:
    from django.contrib.auth.models import User


@@ -210,59 +210,8 @@
 5):%0A
-    from django.contrib.auth import get_user_model%0A
     
@@ -221,24 +221,32 @@
 r = 
-get_user_model()
+settings.AUTH_USER_MODEL
 %0Aels

use settings.AUTH_USER_MODEL instead of get_user_model