Only register receivers in models.py for Django < 1.7

In Django >= 1.7 this will be done via the AppConfig

oscar/apps/analytics/models.py

@@ -1,3 +1,5 @@
+import django
+
 from oscar.apps.analytics.abstract_models import (
     AbstractProductRecord, AbstractUserRecord,
     AbstractUserProductView, AbstractUserSearch)
@@ -19,4 +21,5 @@ class UserSearch(AbstractUserSearch):
     pass
 
 
-from .receivers import *  # noqa
+if django.VERSION < (1, 7):
+    from . import receivers  # noqa

oscar/apps/catalogue/models.py

@@ -1,3 +1,5 @@
+import django
+
 """
 Vanilla product models
 """
@@ -48,4 +50,5 @@ class ProductImage(AbstractProductImage):
     pass
 
 
-from .receivers import *  # noqa
+if django.VERSION < (1, 7):
+    from . import receivers

oscar/apps/customer/models.py

@@ -1,3 +1,5 @@
+import django
+
 from oscar.apps.customer import abstract_models
 
 
@@ -17,5 +19,6 @@ class ProductAlert(abstract_models.AbstractProductAlert):
     pass
 
 
-from oscar.apps.customer.history import *  # noqa
-from oscar.apps.customer.alerts.receivers import *  # noqa
+if django.VERSION < (1, 7):
+    from oscar.apps.customer.history import *  # noqa
+    from .alerts import receivers  # noqa

oscar/apps/order/models.py

@@ -2,7 +2,6 @@ from oscar.apps.order.abstract_models import *  # noqa
 from oscar.apps.address.abstract_models import (AbstractShippingAddress,
                                                 AbstractBillingAddress)
 
-
 class Order(AbstractOrder):
     pass
 

oscar/apps/partner/models.py

@@ -1,22 +1,30 @@
+import django
+
+from oscar.core.loading import model_registered
 from oscar.apps.address.abstract_models import AbstractPartnerAddress
 from oscar.apps.partner.abstract_models import (
     AbstractPartner, AbstractStockRecord, AbstractStockAlert)
 
 
-class Partner(AbstractPartner):
-    pass
+if not model_registered('partner', 'Partner'):
+    class Partner(AbstractPartner):
+        pass
 
 
-class PartnerAddress(AbstractPartnerAddress):
-    pass
+if not model_registered('partner', 'PartnerAddress'):
+    class PartnerAddress(AbstractPartnerAddress):
+        pass
 
 
-class StockRecord(AbstractStockRecord):
-    pass
+if not model_registered('partner', 'StockRecord'):
+    class StockRecord(AbstractStockRecord):
+        pass
 
 
-class StockAlert(AbstractStockAlert):
-    pass
+if not model_registered('partner', 'StockAlert'):
+    class StockAlert(AbstractStockAlert):
+        pass
 
 
-from oscar.apps.partner.receivers import *  # noqa
+if django.VERSION < (1, 7):
+    from . import receivers  # noqa

oscar/apps/voucher/__init__.py

@@ -1 +0,0 @@
-from . import receivers  # noqa

oscar/apps/voucher/models.py

@@ -1,3 +1,5 @@
+import django
+
 from oscar.apps.voucher.abstract_models import (
     AbstractVoucher, AbstractVoucherApplication)
 
@@ -8,3 +10,7 @@ class Voucher(AbstractVoucher):
 
 class VoucherApplication(AbstractVoucherApplication):
     pass
+
+
+if django.VERSION < (1, 7):
+    from . import receivers  # noqa