Sourcery refactored master branch

accounts/auth_backends.py

@@ -4,17 +4,10 @@
 
 class UserEmailBackend(ModelBackend):
     def authenticate(self, request, username=None, password=None):
-        if '@' in username:
-            kwargs = {'email': username}
-        else:
-            kwargs = {'username': username}
-
+        kwargs = {'email': username} if '@' in username else {'username': username}
         try:
             user = User.objects.get(**kwargs)
-            if user.check_password(password):
-                return user
-            else:
-                return None
+            return user if user.check_password(password) else None
         except User.DoesNotExist:
             return None
 

orders/models.py

@@ -23,7 +23,7 @@ class Meta:
         verbose_name_plural = 'Заказы(ов)'
 
     def __str__(self):
-        return 'Order {}'.format(self.id)
+        return f'Order {self.id}'
 
     def get_total_cost(self):
         return sum(item.get_cost() for item in self.items.all())
@@ -41,7 +41,7 @@ class Meta:
         verbose_name_plural = 'Заказанные товары'
 
     def __str__(self):
-        return '{}'.format(self.id)
+        return f'{self.id}'
 
     def get_cost(self):
         return self.price * self.quantity

orders/views.py

@@ -6,8 +6,8 @@
 
 def order_create(request):
     cart = Cart(request)
+    user = request.user
     if request.method == 'POST':
-        user = request.user
         if user.is_authenticated:
             data = {"last_name": user.last_name, "first_name": user.first_name, "email": user.email}
             form = OrderCreateForm(request.POST, initial=data)
@@ -26,7 +26,6 @@ def order_create(request):
             cart.clear()
             return render(request, 'orders/created.html', {'order': order})
     else:
-        user = request.user
         data = {}
         if user.is_authenticated:
             data["last_name"] = user.last_name