Browse Source

Fix Django 1.7 regressions when moving receivers

My fix in 5f23648 forgot to change the receiver registration in the app
config.
Also removed an unused import, and a deprecation warning in the tests.
master
Maik Hoepfel 11 years ago
parent
commit
40f7214bbb
4 changed files with 2 additions and 6 deletions
  1. 1
    1
      oscar/apps/customer/config.py
  2. 0
    1
      oscar/apps/customer/history.py
  3. 1
    1
      tests/unit/core/prices_tests.py
  4. 0
    3
      tox.ini

+ 1
- 1
oscar/apps/customer/config.py View File

@@ -8,5 +8,5 @@ class CustomerConfig(AppConfig):
8 8
     verbose_name = _('Customer')
9 9
 
10 10
     def ready(self):
11
-        from oscar.apps.customer import history  # noqa
11
+        from . import receivers  # noqa
12 12
         from .alerts import receivers  # noqa

+ 0
- 1
oscar/apps/customer/history.py View File

@@ -2,7 +2,6 @@ import json
2 2
 
3 3
 from django.conf import settings
4 4
 from oscar.core.loading import get_model
5
-from django.dispatch import receiver
6 5
 
7 6
 from oscar.core.loading import get_class
8 7
 

+ 1
- 1
tests/unit/core/prices_tests.py View File

@@ -33,7 +33,7 @@ class TestPriceObject(TestCase):
33 33
     def test_price_equals_currency_matters(self):
34 34
         price1 = Price(currency='EUR', excl_tax=D('10.00'), tax=D('2.00'))
35 35
         price2 = Price(currency='USD', excl_tax=D('10.00'), tax=D('2.00'))
36
-        self.assertNotEquals(price1, price2)
36
+        self.assertNotEqual(price1, price2)
37 37
         
38 38
     def test_price_equals_transitivity(self):
39 39
         prices = (

+ 0
- 3
tox.ini View File

@@ -7,9 +7,6 @@
7 7
 exclude = migrations,south_migrations
8 8
 max-complexity = 10
9 9
 
10
-[tox]
11
-envlist = py27-1.6, py27-1.7, py33-1.6, py33-1.7, py34-1.6, py34-1.7
12
-
13 10
 [testenv]
14 11
 commands = python runtests.py []
15 12
 

Loading…
Cancel
Save