Merge pull request #1101 from iElectric/nothandledclass

Report correct class when raising NotHandled
django-haystack · Jan 14, 2015 · d5c5325 · d5c5325
2 parents 3249597 + 6c9024c
commit d5c5325
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/haystack/utils/loading.py b/haystack/utils/loading.py
@@ -289,7 +289,7 @@ def get_index(self, model_klass):
             self.build()
 
         if model_klass not in self.indexes:
-            raise NotHandled('The model %s is not registered' % model_klass.__class__)
+            raise NotHandled('The model %s is not registered' % model_klass)
 
         return self.indexes[model_klass]
 

diff --git a/test_haystack/test_loading.py b/test_haystack/test_loading.py
@@ -220,6 +220,10 @@ def setUp(self):
 
     def test_get_index(self):
         self.assertRaises(NotHandled, self.ui.get_index, MockModel)
+        try:
+            self.ui.get_index(MockModel)
+        except NotHandled as e:
+            self.assertTrue(MockModel.__name__ in str(e))
 
         self.ui.build(indexes=[BasicMockModelSearchIndex()])
         self.assertTrue(isinstance(self.ui.get_index(MockModel), indexes.BasicSearchIndex))