Merge pull request #460 from foutrelis/fix-type-error-in-country-filter

Fix TypeError in CountryFilter.choices()

django_countries/filters.py

@@ -24,7 +24,7 @@ def choices(self, changelist):
         }
         for lookup, title in self.lookup_choices(changelist):
             if django.VERSION >= (5, 0):
-                selected = force_str(lookup) in value
+                selected = value is not None and force_str(lookup) in value
             else:
                 selected = force_str(lookup) == value
             yield {

django_countries/tests/test_admin_filters.py

@@ -6,7 +6,7 @@
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from django_countries import filters
+from django_countries import countries, filters
 from django_countries.tests import models
 
 test_site = admin.AdminSite(name="test-admin")
@@ -51,13 +51,26 @@ def test_filter_country(self):
             list(cl.result_list), list(models.Person.objects.exclude(country="AU"))
         )
 
-    def test_choices(self):
-        request = RequestFactory().get("/person/", data={"country": "NZ"})
+    def _test_choices(self, selected_country_code="NZ"):
+        request_params = {}
+        selected_country = "All"
+
+        if selected_country_code:
+            request_params["country"] = selected_country_code
+            selected_country = countries.name(selected_country_code)
+
+        request = RequestFactory().get("/person/", data=request_params)
         request.user = AnonymousUser()
         cl = ChangeList(request, **self.get_changelist_kwargs())
         choices = list(cl.filter_specs[0].choices(cl))
         self.assertEqual(
             [c["display"] for c in choices], ["All", "Australia", "New Zealand"]
         )
         for choice in choices:
-            self.assertEqual(choice["selected"], choice["display"] == "New Zealand")
+            self.assertEqual(choice["selected"], choice["display"] == selected_country)
+
+    def test_choices(self):
+        return self._test_choices()
+
+    def test_choices_empty_selection(self):
+        return self._test_choices(selected_country_code=None)