Add more Ruff rules (#891)

* ruff: apply rule F

* ruff: apply rule E

* ruff: apply rule SIM

* ruff: apply rule TCH

* ruff: apply rule ERA

* ruff: apply rule PLW

* ruff: apply rule FLY

* ruff: apply rule PERF

* ruff: apply rules FURB & RUF

eboutic/admin.py

@@ -13,8 +13,9 @@
 #
 #
 from django.contrib import admin
+from django.db.models import F, Sum
 
-from eboutic.models import *
+from eboutic.models import Basket, BasketItem, Invoice, InvoiceItem
 
 
 @admin.register(Basket)

eboutic/forms.py

@@ -117,9 +117,7 @@ class BasketForm:
         """
         if not self.error_messages and not self.correct_items:
             self.clean()
-        if self.error_messages:
-            return False
-        return True
+        return not self.error_messages
 
     @cached_property
     def errors(self) -> list[str]:

eboutic/schemas.py

@@ -2,8 +2,6 @@ from typing import Annotated
 
 from ninja import ModelSchema, Schema
 from pydantic import Field, NonNegativeInt, PositiveInt, TypeAdapter
-
-# from phonenumber_field.phonenumber import PhoneNumber
 from pydantic_extra_types.phone_numbers import PhoneNumber, PhoneNumberValidator
 
 from counter.models import BillingInfo

eboutic/tests/test_crypto.py

@@ -7,11 +7,11 @@
 
 import base64
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 import pytest
 from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPublicKey
 from cryptography.hazmat.primitives.hashes import SHA1
 from cryptography.hazmat.primitives.serialization import (
     load_pem_private_key,
@@ -19,6 +19,12 @@ from cryptography.hazmat.primitives.serialization import (
 )
 from django.conf import settings
 
+if TYPE_CHECKING:
+    from cryptography.hazmat.primitives.asymmetric.rsa import (
+        RSAPrivateKey,
+        RSAPublicKey,
+    )
+
 
 def test_signature_valid():
     """Test that data sent to the bank is correctly signed."""

eboutic/tests/tests.py

@@ -24,9 +24,9 @@
 import base64
 import json
 import urllib
+from typing import TYPE_CHECKING
 
 from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
 from cryptography.hazmat.primitives.hashes import SHA1
 from cryptography.hazmat.primitives.serialization import load_pem_private_key
 from django.conf import settings
@@ -38,6 +38,9 @@ from core.models import User
 from counter.models import Counter, Customer, Product, Selling
 from eboutic.models import Basket, BasketItem
 
+if TYPE_CHECKING:
+    from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
+
 
 class TestEboutic(TestCase):
     @classmethod

eboutic/urls.py

@@ -25,7 +25,14 @@
 from django.urls import path, register_converter
 
 from eboutic.converters import PaymentResultConverter
-from eboutic.views import *
+from eboutic.views import (
+    EbouticCommand,
+    EtransactionAutoAnswer,
+    e_transaction_data,
+    eboutic_main,
+    pay_with_sith,
+    payment_result,
+)
 
 register_converter(PaymentResultConverter, "res")
 

eboutic/views.py

@@ -17,11 +17,11 @@ import base64
 import json
 from datetime import datetime
 from enum import Enum
+from typing import TYPE_CHECKING
 
 import sentry_sdk
 from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
 from cryptography.hazmat.primitives.hashes import SHA1
 from cryptography.hazmat.primitives.serialization import load_pem_public_key
 from django.conf import settings
@@ -47,6 +47,9 @@ from eboutic.models import (
 )
 from eboutic.schemas import PurchaseItemList, PurchaseItemSchema
 
+if TYPE_CHECKING:
+    from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
+
 
 @login_required
 @require_GET
@@ -221,7 +224,7 @@ class EtransactionAutoAnswer(View):
         # Payment authorized:
         # * 'Error' is '00000'
         # * 'Auto' is in the request
-        if request.GET["Error"] == "00000" and "Auto" in request.GET.keys():
+        if request.GET["Error"] == "00000" and "Auto" in request.GET:
             try:
                 with transaction.atomic():
                     b = (