From aa532494f17f728cd81589db9070b14f5a151f44 Mon Sep 17 00:00:00 2001 From: Charlie Date: Fri, 13 Feb 2015 13:56:03 +0700 Subject: [PATCH 1/3] +added compatibility for django 1.5 - 1.7.x for models/managers.py --- money/contrib/django/models/managers.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/money/contrib/django/models/managers.py b/money/contrib/django/models/managers.py index 4feb992..9e83c17 100644 --- a/money/contrib/django/models/managers.py +++ b/money/contrib/django/models/managers.py @@ -9,7 +9,11 @@ class QuerysetWithMoney(QuerySet): def _update_params(self, kwargs): - from django.db.models.sql.constants import LOOKUP_SEP + #add support for django 1.5 - 1.7.x + try: + from django.db.models.sql.constants import LOOKUP_SEP + except ImportError: + from django.db.models.constants import LOOKUP_SEP from money import Money to_append = {} for name, value in kwargs.items(): From ee7a0e4b5a8db7343c6413fbd61877571f9fc272 Mon Sep 17 00:00:00 2001 From: Yohanes Adhi Date: Fri, 20 Feb 2015 16:35:37 +0700 Subject: [PATCH 2/3] Change LOOKUP_SEP location in managers.py and fix migration in fields.py line 76. --- money/contrib/django/models/fields.py | 2 +- money/contrib/django/models/managers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/money/contrib/django/models/fields.py b/money/contrib/django/models/fields.py index 956f1ca..efeeb66 100644 --- a/money/contrib/django/models/fields.py +++ b/money/contrib/django/models/fields.py @@ -75,7 +75,7 @@ class MoneyField(models.DecimalField): def __init__(self, verbose_name=None, name=None, max_digits=None, decimal_places=None, - default=None, default_currency=None, blank=True, **kwargs): + default=None, default_currency=None, blank=True, null=True, **kwargs): # We add the currency field except when using frozen south orm. See introspection rules below. self.add_currency_field = not kwargs.pop('no_currency_field', False) if isinstance(default, Money): diff --git a/money/contrib/django/models/managers.py b/money/contrib/django/models/managers.py index 9e83c17..774c026 100644 --- a/money/contrib/django/models/managers.py +++ b/money/contrib/django/models/managers.py @@ -11,7 +11,7 @@ class QuerysetWithMoney(QuerySet): def _update_params(self, kwargs): #add support for django 1.5 - 1.7.x try: - from django.db.models.sql.constants import LOOKUP_SEP + from django.db.models.constants import LOOKUP_SEP except ImportError: from django.db.models.constants import LOOKUP_SEP from money import Money From 265089e3ec77f794832ae53d965229eeb0a350b6 Mon Sep 17 00:00:00 2001 From: Yohanes Adhi Date: Fri, 20 Feb 2015 16:42:00 +0700 Subject: [PATCH 3/3] fix managers.py on import LOOKUP_SEP --- money/contrib/django/models/managers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/money/contrib/django/models/managers.py b/money/contrib/django/models/managers.py index 774c026..d21d700 100644 --- a/money/contrib/django/models/managers.py +++ b/money/contrib/django/models/managers.py @@ -13,7 +13,7 @@ def _update_params(self, kwargs): try: from django.db.models.constants import LOOKUP_SEP except ImportError: - from django.db.models.constants import LOOKUP_SEP + from django.db.models.sql.constants import LOOKUP_SEP from money import Money to_append = {} for name, value in kwargs.items():