Merge pull request #380 from jazzband/annotations

Use postponed evaluation of annotations

payments/__init__.py

@@ -1,6 +1,7 @@
-from decimal import Decimal
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 from typing import NamedTuple
-from typing import Optional
 
 from django.apps import apps
 from django.conf import settings
@@ -9,6 +10,9 @@
 
 from payments import version  # type: ignore[attr-defined]
 
+if TYPE_CHECKING:
+    from decimal import Decimal
+
 __version__ = version.version
 
 
@@ -20,7 +24,7 @@ class PurchasedItem(NamedTuple):
     price: Decimal
     currency: str
     sku: str
-    tax_rate: Optional[Decimal] = None
+    tax_rate: Decimal | None = None
 
 
 class PaymentStatus:

payments/authorizenet/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import requests
 from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpResponseForbidden

payments/authorizenet/forms.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from payments import PaymentStatus
 from payments.forms import CreditCardPaymentForm
 

payments/authorizenet/test_authorizenet.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import date
 from unittest import TestCase
 from unittest.mock import MagicMock

payments/braintree/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import braintree
 from django.core.exceptions import ImproperlyConfigured
 

payments/braintree/forms.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import braintree
 
 from payments import PaymentStatus

payments/braintree/test_braintree.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from datetime import date
 from unittest import TestCase
 from unittest.mock import MagicMock

payments/coinbase/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import hashlib
 import hmac
 import json

payments/coinbase/test_coinbase.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import hashlib
 import json
 from decimal import Decimal

payments/core.py

@@ -1,20 +1,20 @@
+from __future__ import annotations
+
 import re
 from typing import TYPE_CHECKING
-from typing import Dict
-from typing import Optional
-from typing import Tuple
 from urllib.parse import urlencode
 from urllib.parse import urljoin
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
-from django.http import HttpRequest
 from django.utils.module_loading import import_string
 
 if TYPE_CHECKING:
+    from django.http import HttpRequest
+
     from .models import BasePayment
 
-PAYMENT_VARIANTS: Dict[str, Tuple[str, Dict]] = {
+PAYMENT_VARIANTS: dict[str, tuple[str, dict]] = {
     "default": ("payments.dummy.DummyProvider", {})
 }
 
@@ -156,7 +156,7 @@ def refund(self, payment, amount=None):
 PROVIDER_CACHE = {}
 
 
-def _default_provider_factory(variant: str, payment: Optional["BasePayment"] = None):
+def _default_provider_factory(variant: str, payment: BasePayment | None = None):
     """Return the provider instance based on ``variant``.
 
     :arg variant: The name of a variant defined in ``PAYMENT_VARIANTS``.
@@ -194,7 +194,7 @@ def _default_provider_factory(variant: str, payment: Optional["BasePayment"] = N
 ]
 
 
-def get_credit_card_issuer(number: str) -> Tuple[Optional[str], Optional[str]]:
+def get_credit_card_issuer(number: str) -> tuple[str | None, str | None]:
     for regexp, card_type, name in CARD_TYPES:
         if re.match(regexp, number):
             return card_type, name

payments/cybersource/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import datetime
 import os.path

payments/cybersource/forms.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from uuid import uuid4
 
 from django import forms

payments/cybersource/test_cybersource.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 from datetime import date
 from decimal import Decimal
-from typing import Dict
 from unittest import TestCase
 from unittest.mock import MagicMock
 from unittest.mock import Mock
@@ -43,7 +44,7 @@ class Payment(Mock):
 
     class attrs:
         fingerprint_session_id = "fake"
-        merchant_defined_data: Dict[str, str] = {}
+        merchant_defined_data: dict[str, str] = {}
 
     def get_process_url(self):
         return "http://example.com"

payments/dotpay/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from decimal import Decimal
 
 from django.core.exceptions import ImproperlyConfigured
@@ -50,7 +52,7 @@ def __init__(
         lang="pl",
         lock=False,
         type=2,
-        **kwargs
+        **kwargs,
     ):
         self.seller_id = seller_id
         self.pin = pin

payments/dotpay/forms.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import hashlib
 
 from django import forms

payments/dotpay/test_dotpay.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import hashlib
 from unittest import TestCase
 from unittest.mock import MagicMock

payments/dummy/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from urllib.error import URLError
 from urllib.parse import urlencode
 

payments/dummy/forms.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django import forms
 
 from payments import FraudStatus

payments/dummy/test_dummy.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from unittest import TestCase
 from unittest.mock import MagicMock
 from urllib.error import URLError

payments/fields.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import re
 from calendar import monthrange
 from datetime import date

payments/forms.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections import OrderedDict
 
 from django import forms

payments/mercadopago/__init__.py

@@ -1,6 +1,9 @@
+from __future__ import annotations
+
 import json
 import logging
 import re
+from typing import TYPE_CHECKING
 from uuid import uuid4
 
 from django.http import HttpRequest
@@ -12,7 +15,9 @@
 from payments import PaymentStatus
 from payments import RedirectNeeded
 from payments.core import BasicProvider
-from payments.models import BasePayment
+
+if TYPE_CHECKING:
+    from payments.models import BasePayment
 
 logger = logging.getLogger(__name__)
 

payments/mercadopago/test_mercadopago.py

@@ -1,17 +1,21 @@
-from typing import Optional
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 from unittest.mock import Mock
 from unittest.mock import call
 from unittest.mock import patch
 
 import pytest
-from django.test import RequestFactory
 
 from payments import PaymentError
 from payments import PaymentStatus
 from payments import PurchasedItem
 from payments import RedirectNeeded
 from payments.mercadopago import MercadoPagoProvider
 
+if TYPE_CHECKING:
+    from django.test import RequestFactory
+
 
 class Payment(Mock):
     id = 1
@@ -23,7 +27,7 @@ class Payment(Mock):
     tax = 10
     total = 100
     captured_amount = 0
-    transaction_id: Optional[str] = None
+    transaction_id: str | None = None
     billing_email = "[email protected]"
 
     def change_status(self, status, message=""):

payments/models.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 import json
 from typing import Iterable
-from typing import Union
 from uuid import uuid4
 
 from django.db import models
@@ -87,7 +88,7 @@ class BasePayment(models.Model):
     class Meta:
         abstract = True
 
-    def change_status(self, status: Union[PaymentStatus, str], message=""):
+    def change_status(self, status: PaymentStatus | str, message=""):
         """
         Updates the Payment status and sends the status_changed signal.
         """

payments/paypal/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import logging
 from datetime import timedelta

payments/paypal/forms.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from requests.exceptions import HTTPError
 
 from payments import PaymentStatus

payments/paypal/test_paypal.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from datetime import date
 from decimal import Decimal

payments/sagepay/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import binascii
 
 from cryptography.hazmat.backends import default_backend

payments/sagepay/test_sagepay.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from unittest import TestCase
 from unittest.mock import MagicMock
 from unittest.mock import Mock

payments/signals.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.dispatch import Signal
 
 # Signal sent whenever status is changed for a Payment. This usually happens

payments/sofort/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 
 import requests

payments/sofort/test_sofort.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 from unittest import TestCase
 from unittest.mock import MagicMock

payments/stripe/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import warnings
 from decimal import Decimal

payments/stripe/forms.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 
 import stripe

payments/stripe/providers.py

@@ -1,9 +1,10 @@
+from __future__ import annotations
+
 import json
 from dataclasses import asdict
 from dataclasses import dataclass
 from dataclasses import field
 from typing import Any
-from typing import Optional
 
 import stripe
 from django.http import JsonResponse
@@ -18,28 +19,28 @@
 @dataclass
 class StripeProductData:
     name: str
-    description: Optional[str] = field(init=False, repr=False, default=None)
-    images: Optional[str] = field(init=False, repr=False, default=None)
-    metadata: Optional[dict] = field(init=False, repr=False, default=None)
-    tax_code: Optional[str] = field(init=False, repr=False, default=None)
+    description: str | None = field(init=False, repr=False, default=None)
+    images: str | None = field(init=False, repr=False, default=None)
+    metadata: dict | None = field(init=False, repr=False, default=None)
+    tax_code: str | None = field(init=False, repr=False, default=None)
 
 
 @dataclass
 class StripePriceData:
     currency: str
     product_data: StripeProductData
     unit_amount: int
-    recurring: Optional[dict] = field(init=False, repr=False, default=None)
-    tax_behavior: Optional[str] = field(init=False, repr=False, default=None)
+    recurring: dict | None = field(init=False, repr=False, default=None)
+    tax_behavior: str | None = field(init=False, repr=False, default=None)
 
 
 @dataclass
 class StripeLineItem:
     price_data: StripePriceData
     quantity: int
-    adjustable_quantity: Optional[dict] = field(init=False, repr=False, default=None)
-    dynamic_tax_rates: Optional[dict] = field(init=False, repr=False, default=None)
-    tax_rates: Optional[str] = field(init=False, repr=False, default=None)
+    adjustable_quantity: dict | None = field(init=False, repr=False, default=None)
+    dynamic_tax_rates: dict | None = field(init=False, repr=False, default=None)
+    tax_rates: str | None = field(init=False, repr=False, default=None)
 
 
 zero_decimal_currency: list = [

payments/stripe/test_stripe.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from contextlib import contextmanager
 from unittest import TestCase
 from unittest.mock import Mock