Ticket #5968: allowiterable.diff

django/contrib/databrowse/sites.py

@@ -3 +3 @@
 from django.contrib.databrowse.datastructures import EasyModel, EasyChoice
 from django.shortcuts import render_to_response
 from django.utils.safestring import mark_safe
+import types
 
 class AlreadyRegistered(Exception):
     pass
@@ -85 +86 @@
         If a model is already registered, this will raise AlreadyRegistered.
         """
         databrowse_class = databrowse_class or DefaultModelDatabrowse
-        if issubclass(model_or_iterable, models.Model):
+        if isinstance(model_or_iterable, types.TypeType) and issubclass(model_or_iterable, models.Model):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
             if model in self.registry:
@@ -98 +99 @@
 
         If a model isn't already registered, this will raise NotRegistered.
         """
-        if issubclass(model_or_iterable, models.Model):
+        if isinstance(model_or_iterable, types.TypeType) and issubclass(model_or_iterable, models.Model):
             model_or_iterable = [model_or_iterable]
         for model in model_or_iterable:
             if model not in self.registry: