Assume no tenant specific model can be created until a tenant model i…

…s correctly configured.
charettes · Nov 25, 2014 · 0bdabb5 · 0bdabb5
1 parent 537248d
commit 0bdabb5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tenancy/models.py b/tenancy/models.py
@@ -179,7 +179,12 @@ class TenantSpecificModel(with_metaclass(ABCMeta)):
     @classmethod
     def __subclasshook__(cls, subclass):
         if isinstance(subclass, TenantModelBase):
-            tenant_model = get_tenant_model(False)
+            try:
+                tenant_model = get_tenant_model(False)
+            except ImproperlyConfigured:
+                # If the tenant model is not configured yet we can assume
+                # no specific models have been defined so far.
+                return False
             tenant = getattr(subclass, tenant_model.ATTR_NAME, None)
             return isinstance(tenant, tenant_model)
         return NotImplemented