Merge pull request #10 from yannik-ammann/master

update get_user_model

compat/__init__.py

@@ -152,21 +152,9 @@ def python_2_unicode_compatible(klass):
 
 user_model_label = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 
-"""
-try:
-    from django.contrib.auth import get_user_model
-except ImportError:
-    from django.contrib.auth.models import User
-    get_user_model = lambda: User
-"""
-try:
-    get_user_model = lambda: settings.AUTH_USER_MODEL
-except:
-    try:
-        from django.contrib.auth import get_user_model
-    except ImportError:
-        from django.contrib.auth.models import User
-        get_user_model = lambda: User
+
+
+
 
 
 # get_username_field
@@ -176,6 +164,12 @@ def get_username_field():
 else:
     def get_username_field():
             return 'username'
+
+try:
+    from django.contrib.auth import get_user_model
+except ImportError:
+    from django.contrib.auth.models import User
+    get_user_model = lambda: User
 
 
 def get_user_model_path():