Ticket #5968: 5968-4.patch

docs/ref/contrib/databrowse.txt

@@ -33 +33 @@
 2. Register a number of models with the Databrowse site::
 
        from django.contrib import databrowse
-       from myapp.models import SomeModel, SomeOtherModel
+       from myapp.models import SomeModel, SomeOtherModel, YetAnotherModel
 
        databrowse.site.register(SomeModel)
-       databrowse.site.register(SomeOtherModel)
+       databrowse.site.register(SomeOtherModel, YetAnotherModel)
 
    Note that you should register the model *classes*, not instances.
 
+   .. versionchanged:: 1.4
+
+   Since Django 1.4, it is possible to register several models in the same
+   call to :func:`~databrowse.site.register`.
+
    It doesn't matter where you put this, as long as it gets executed at some
    point. A good place for it is in your :doc:`URLconf file
    </topics/http/urls>` (``urls.py``).

tests/runtests.py

@@ -4 +4 @@
 import subprocess
 import sys
 import tempfile
+import warnings
 
 from django import contrib
 
+# databrowse is deprecated, but we still want to run its tests
+warnings.filterwarnings('ignore', "The Databrowse contrib app is deprecated",
+                        PendingDeprecationWarning, 'django.contrib.databrowse')
 
 CONTRIB_DIR_NAME = 'django.contrib'
 MODEL_TESTS_DIR_NAME = 'modeltests'
@@ -34 +38 @@
     'django.contrib.comments',
     'django.contrib.admin',
     'django.contrib.admindocs',
+    'django.contrib.databrowse',
     'django.contrib.staticfiles',
     'django.contrib.humanize',
     'regressiontests.staticfiles_tests',

django/contrib/databrowse/tests.py

@@ +1 @@
+from django.contrib import databrowse
+from django.db import models
+from django.test import TestCase
+
+
+class SomeModel(models.Model):
+    some_field = models.CharField(max_length=50)
+
+    def __unicode__(self):
+        return self.some_field
+
+
+class SomeOtherModel(models.Model):
+    some_other_field = models.CharField(max_length=50)
+
+    def __unicode__(self):
+        return self.some_other_field
+
+
+class YetAnotherModel(models.Model):
+    yet_another_field = models.CharField(max_length=50)
+
+    def __unicode__(self):
+        return self.yet_another_field
+
+
+class DatabrowseTests(TestCase):
+
+    def test_databrowse_register_unregister(self):
+        databrowse.site.register(SomeModel)
+        self.assertTrue(SomeModel in databrowse.site.registry)
+        databrowse.site.register(SomeOtherModel, YetAnotherModel)
+        self.assertTrue(SomeOtherModel in databrowse.site.registry)
+        self.assertTrue(YetAnotherModel in databrowse.site.registry)
+
+        self.assertRaisesMessage(
+            databrowse.sites.AlreadyRegistered,
+            'The model SomeModel is already registered',
+            databrowse.site.register, SomeModel, SomeOtherModel
+        )
+
+        databrowse.site.unregister(SomeOtherModel)
+        self.assertFalse(SomeOtherModel in databrowse.site.registry)
+        databrowse.site.unregister(SomeModel, YetAnotherModel)
+        self.assertFalse(SomeModel in databrowse.site.registry)
+        self.assertFalse(YetAnotherModel in databrowse.site.registry)
+
+        self.assertRaisesMessage(
+            databrowse.sites.NotRegistered,
+            'The model SomeModel is not registered',
+            databrowse.site.unregister, SomeModel, SomeOtherModel
+        )
+
+        self.assertRaisesMessage(
+            databrowse.sites.AlreadyRegistered,
+            'The model SomeModel is already registered',
+            databrowse.site.register, SomeModel, SomeModel
+        )

django/contrib/databrowse/models.py

@@ +1 @@
+# Empty models.py to allow for specifying databrowse as a test label.

django/contrib/databrowse/sites.py

@@ -73 +73 @@
         self.registry = {} # model_class -> databrowse_class
         self.root_url = None
 
-    def register(self, model_or_iterable, databrowse_class=None, **options):
+    def register(self, *model_list, **options):
         """
         Registers the given model(s) with the given databrowse site.
 
@@ -84 +84 @@
 
         If a model is already registered, this will raise AlreadyRegistered.
         """
-        databrowse_class = databrowse_class or DefaultModelDatabrowse
-        if issubclass(model_or_iterable, models.Model):
-            model_or_iterable = [model_or_iterable]
-        for model in model_or_iterable:
+        databrowse_class = options.pop('databrowse_class', DefaultModelDatabrowse)
+        for model in model_list:
             if model in self.registry:
                 raise AlreadyRegistered('The model %s is already registered' % model.__name__)
             self.registry[model] = databrowse_class
 
-    def unregister(self, model_or_iterable):
+    def unregister(self, *model_list):
         """
         Unregisters the given model(s).
 
         If a model isn't already registered, this will raise NotRegistered.
         """
-        if issubclass(model_or_iterable, models.Model):
-            model_or_iterable = [model_or_iterable]
-        for model in model_or_iterable:
+        for model in model_list:
             if model not in self.registry:
                 raise NotRegistered('The model %s is not registered' % model.__name__)
             del self.registry[model]