From f24c94914fd310f877df2d6827e1b6c357fa467f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=B5=D0=BD=D0=BA?=
 =?UTF-8?q?=D0=BE=20=D0=9E=D0=BB=D1=8C=D0=B3=D0=B0?=
 <stepanenko_olga@mail.ru>
Date: Thu, 6 May 2021 12:43:44 +0300
Subject: [PATCH] Change User to get_user_model - fix problems

---
 access_controller/auth.py | 10 +++++-----
 main/extra_func.py        |  6 ++----
 main/views.py             |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/access_controller/auth.py b/access_controller/auth.py
index be707e1..00b43a2 100644
--- a/access_controller/auth.py
+++ b/access_controller/auth.py
@@ -1,19 +1,19 @@
 from django.contrib.auth.backends import ModelBackend
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 
 
 class EmailAuthBackend(ModelBackend):
     def authenticate(self, request, username=None, password=None, **kwargs):
         try:
-            user = User.objects.get(email=username)
+            user = get_user_model().objects.get(email=username)
             if user.check_password(password):
                 return user
             return None
-        except User.DoesNotExist:
+        except get_user_model().DoesNotExist:
             return None
 
     def get_user(self, user_id):
         try:
-            return User.objects.get(pk=user_id)
-        except User.DoesNotExist:
+            return get_user_model().objects.get(pk=user_id)
+        except get_user_model().DoesNotExist:
             return None
diff --git a/main/extra_func.py b/main/extra_func.py
index 3c796be..10ed367 100644
--- a/main/extra_func.py
+++ b/main/extra_func.py
@@ -292,8 +292,7 @@ class StatisticData:
             stat = self._use_display(stat)
             stat = self._use_interval(stat)
             return stat
-        else:
-            return None
+        return None
 
     def is_valid_statistic(self) -> bool:
         """
@@ -335,8 +334,7 @@ class StatisticData:
         """
         if self.is_valid_data():
             return self.data
-        else:
-            return None
+        return None
 
     def is_valid_data(self) -> bool:
         """
diff --git a/main/views.py b/main/views.py
index 4a7567b..fe31416 100644
--- a/main/views.py
+++ b/main/views.py
@@ -109,10 +109,10 @@ class CustomRegistrationView(RegistrationView):
                     'html_email_template_name': None,
                     'extra_email_context': None,
                 }
-                user = User.objects.create_user(
+                user = get_user_model().objects.create_user(
                     username=form.data['email'],
                     email=form.data['email'],
-                    password=User.objects.make_random_password(length=50)
+                    password=get_user_model().objects.make_random_password(length=50)
                 )
                 try:
                     update_profile(user.userprofile)