Ticket #26086: model_empty_list_registration_unregistration.diff

django/contrib/admin/sites.py

@@ -74 +74 @@
         admin options). If keyword arguments are given -- e.g., list_display --
         they'll be applied as options to the admin class.
 
+        If a model is empty, this will raise ValueError.
+
         If a model is already registered, this will raise AlreadyRegistered.
 
         If a model is abstract, this will raise ImproperlyConfigured.
         """
         if not admin_class:
             admin_class = ModelAdmin
-
+        if not model_or_iterable:
+            raise ValueError('At least one model must be passed to register.')
         if isinstance(model_or_iterable, ModelBase):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
@@ -113 +116 @@
     def unregister(self, model_or_iterable):
         """
         Unregisters the given model(s).
+ 
+        If a model is empty, this will raise ValueError.
 
         If a model isn't already registered, this will raise NotRegistered.
         """
+        if not model_or_iterable:
+            raise ValueError('At least one model must be passed to unregister.')
         if isinstance(model_or_iterable, ModelBase):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:

tests/admin_registration/tests.py

@@ -70 +70 @@
         """
         self.assertRaises(ImproperlyConfigured, self.site.register, Location)
 
+    def test_empty_models_list_registration(self):
+        with self.assertRaisesMessage(ValueError, 'At least one model must be passed to register.'):self.site.register(())
+
     def test_is_registered_model(self):
         "Checks for registered models should return true."
         self.site.register(Person)
@@ -79 +82 @@
         "Checks for unregistered models should return false."
         self.assertFalse(self.site.is_registered(Person))
 
+    def test_empty_models_list_unregistration(self):
+        with self.assertRaisesMessage(ValueError, 'At least one model must be passed to unregister.'):self.site.unregister(())
+
 
 class TestRegistrationDecorator(SimpleTestCase):
     """