Fixed a bug where a different style of import could confuse the collection of indexes. Thanks to groovecoder for the report.

Author: toastdriven

haystack/utils/loading.py

@@ -139,6 +139,8 @@ def __init__(self):
         self._facet_fieldnames = {}
 
     def collect_indexes(self):
+        from haystack.indexes import SearchIndex, BasicSearchIndex, ModelSearchIndex
+        base_classes = [Indexable, SearchIndex, BasicSearchIndex, ModelSearchIndex]
         indexes = []
 
         for app in settings.INSTALLED_APPS:
@@ -148,7 +150,7 @@ def collect_indexes(self):
                 continue
 
             for item_name, item in inspect.getmembers(search_index_module, inspect.isclass):
-                if item != Indexable and issubclass(item, Indexable):
+                if not item in base_classes and issubclass(item, Indexable):
                     # We've got an index. Check if we should be ignoring it.
                     class_path = "%s.search_indexes.%s" % (app, item_name)
 

tests/multipleindex/search_indexes.py

@@ -9,6 +9,10 @@ def get_model(self):
         return Foo
 
 
+# Import the old way & make sure things don't explode.
+from haystack.indexes import SearchIndex
+
+
 class BarIndex(indexes.SearchIndex):
     text = indexes.CharField(document=True)