Moved data_layer ItemTermException to taxonomies

django/website/data_layer/exceptions.py

-class ItemTermException(Exception):
-    pass

django/website/data_layer/models.py

@@ -2,7 +2,7 @@ from django.db import models
 from django.dispatch.dispatcher import receiver
 
 from taxonomies.models import Term
-from exceptions import ItemTermException
+from taxonomies.exceptions import TermException
 
 
 class DataLayerModel(models.Model):
@@ -42,12 +42,12 @@ class Message(DataLayerModel):
         taxonomy = terms[0].taxonomy
 
         if not all(t.taxonomy == taxonomy for t in terms):
-            raise ItemTermException("Terms cannot be applied from different taxonomies")
+            raise TermException("Terms cannot be applied from different taxonomies")
 
         if not taxonomy.is_multiple:
             if len(terms) > 1:
                 message = "Taxonomy '%s' does not support multiple terms" % taxonomy
-                raise ItemTermException(message)
+                raise TermException(message)
 
             self.delete_all_terms(taxonomy)
 

django/website/data_layer/tests/item_tests.py

@@ -6,7 +6,7 @@ from django.utils import timezone
 
 from factories import ItemFactory
 from ..models import Item
-from ..exceptions import ItemTermException
+from taxonomies.exceptions import TermException
 from taxonomies.tests.factories import TermFactory, TaxonomyFactory
 
 
@@ -167,7 +167,7 @@ def test_applying_multiple_terms_raises_exception_if_not_multiple():
     term1 = TermFactory(taxonomy=taxonomy)
     term2 = TermFactory(taxonomy=taxonomy)
 
-    with pytest.raises(ItemTermException) as excinfo:
+    with pytest.raises(TermException) as excinfo:
         item.apply_terms((term1, term2))
 
     expected_message = "Taxonomy '%s' does not support multiple terms" % (
@@ -185,7 +185,7 @@ def test_applied_terms_must_be_from_same_taxonomy():
 
     term3 = TermFactory(taxonomy=taxonomy1)
 
-    with pytest.raises(ItemTermException) as excinfo:
+    with pytest.raises(TermException) as excinfo:
         item.apply_terms((term1, term2, term3))
 
     expected_message = "Terms cannot be applied from different taxonomies"

django/website/taxonomies/exceptions.py

+class TermException(Exception):
+    pass