Change User to get_user_model - fix problems

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)
+            return get_user_model().objects.get(pk=user_id)
-        except User.DoesNotExist:
+        except get_user_model().DoesNotExist:
             return None

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:
         """

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)