auto cleanup sources

Author: AlwinEgger

django/cohiva/tests/test_utils_countries.py

@@ -45,7 +45,9 @@ def test_get_country_choices_prioritizes_and_localizes(self):
             patch("cohiva.utils.countries.pycountry.countries", fake_countries),
             patch("cohiva.utils.countries._current_language", return_value="de"),
             patch("cohiva.utils.countries.locale.strxfrm", side_effect=lambda value: value),
-            patch("cohiva.utils.countries.gettext.translation", return_value=translation) as translation_mock,
+            patch(
+                "cohiva.utils.countries.gettext.translation", return_value=translation
+            ) as translation_mock,
         ):
             choices = countries.get_country_choices()
 
@@ -96,8 +98,13 @@ def test_country_name_from_code_returns_localized_name(self):
         translation = DummyTranslation({"Germany": "Deutschland"})
         with (
             patch("cohiva.utils.countries._current_language", return_value="de"),
-            patch("cohiva.utils.countries.gettext.translation", return_value=translation) as translation_mock,
-            patch("cohiva.utils.countries.pycountry.countries.get", return_value=SimpleNamespace(name="Germany")),
+            patch(
+                "cohiva.utils.countries.gettext.translation", return_value=translation
+            ) as translation_mock,
+            patch(
+                "cohiva.utils.countries.pycountry.countries.get",
+                return_value=SimpleNamespace(name="Germany"),
+            ),
         ):
             self.assertEqual(countries.country_name_from_code("de"), "Deutschland")
         translation_mock.assert_called_once()
@@ -124,7 +131,10 @@ def fake_search_fuzzy(value):
 
         with (
             patch("cohiva.utils.countries.pycountry.countries.get", side_effect=fake_get),
-            patch("cohiva.utils.countries.pycountry.countries.search_fuzzy", side_effect=fake_search_fuzzy),
+            patch(
+                "cohiva.utils.countries.pycountry.countries.search_fuzzy",
+                side_effect=fake_search_fuzzy,
+            ),
         ):
             self.assertEqual(countries.normalize_country_code(""), "")
             self.assertEqual(countries.normalize_country_code("   "), "")

django/cohiva/utils/countries.py

@@ -3,11 +3,12 @@
 This centralizes ISO alpha-2 codes and helps translate between
 legacy free-text values and normalized codes.
 """
-from functools import lru_cache
 
-import pycountry
 import gettext
 import locale
+from functools import lru_cache
+
+import pycountry
 
 DEFAULT_COUNTRY_CODE = "CH"
 PRIORITY_CODES = ["CH", "DE", "AT", "FR", "IT"]
@@ -118,5 +119,3 @@ def normalize_country_code(value: str) -> str:
     except LookupError:
         return ""
     return match.alpha_2
-
-

django/geno/billing.py

@@ -26,6 +26,7 @@
 from svglib.svglib import svg2rlg
 
 import geno.settings as geno_settings
+from cohiva.utils.countries import normalize_country_code
 from cohiva.utils.pdf import PdfGenerator
 from cohiva.utils.strings import pluralize
 from cohiva.views.admin import CohivaAdminViewMixin, ResponseVariant
@@ -38,7 +39,6 @@
     Split,
     Transaction,
 )
-from cohiva.utils.countries import normalize_country_code
 
 from .models import (
     Address,

django/geno/migrations/0021_address_country_iso_codes.py

@@ -5,7 +5,6 @@
     get_default_country_code,
     normalize_country_code,
 )
-
 from geno.utils import send_info_mail
 
 COUNTRY_CHOICES = get_country_choices()
@@ -16,21 +15,27 @@ def migrate_country_to_iso(apps, schema_editor):
     for address in Address.objects.all():
         code = normalize_country_code(address.country)
         if code is None:
-            send_info_mail(f"Problem migrating Address.country to code", f"Could not normalize country code '{address.country}' for Address {address.pk} (setting to empty)")
+            send_info_mail(
+                "Problem migrating Address.country to code",
+                f"Could not normalize country code '{address.country}' for Address {address.pk} (setting to empty)",
+            )
             code = ""
         address.country = code
         address.save(update_fields=["country"])
     Building = apps.get_model("geno", "Building")
     for building in Building.objects.all():
         code = normalize_country_code(building.country)
         if code is None:
-            send_info_mail(f"Problem migrating Building.country to code", f"Could not normalize country code '{building.country}' for Building {building.pk} (setting to empty)")
+            send_info_mail(
+                "Problem migrating Building.country to code",
+                f"Could not normalize country code '{building.country}' for Building {building.pk} (setting to empty)",
+            )
             code = ""
         building.country = code
         building.save(update_fields=["country"])
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
         ("geno", "0020_alter_registrationevent_enable_telephone"),
     ]
@@ -60,4 +65,3 @@ class Migration(migrations.Migration):
             ),
         ),
     ]
-

django/geno/models.py

@@ -22,6 +22,10 @@
 from filer.fields.file import FilerFileField
 
 import geno.settings as geno_settings
+from cohiva.utils.countries import (
+    get_country_choices,
+    get_default_country_code,
+)
 from cohiva.utils.settings import (
     get_default_email,
     get_default_formal_choice,
@@ -34,11 +38,6 @@
     nformat,
     sanitize_filename,
 )  # , send_info_mail, send_error_mail
-from cohiva.utils.countries import (
-    country_name_from_code,
-    get_country_choices,
-    get_default_country_code,
-)
 
 logger = logging.getLogger("access_portal")
 

django/geno/tests/test_billing.py

@@ -13,7 +13,6 @@
     add_invoice_obj,
     build_structured_qrbill_address,
     create_qrbill,
-    get_reference_nr,
     transform_qrbill_country,
 )
 from geno.models import (