From 936a260511d2cbe65d4a66763d09bef4efb1dcb9 Mon Sep 17 00:00:00 2001 From: Simion Baws Date: Wed, 13 Jan 2016 12:13:00 +0200 Subject: [PATCH 1/3] Django 1.9 compatibility --- djangotoolbox/db/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangotoolbox/db/utils.py b/djangotoolbox/db/utils.py index 9cf4271..092d11c 100644 --- a/djangotoolbox/db/utils.py +++ b/djangotoolbox/db/utils.py @@ -1,4 +1,4 @@ -from django.db.backends.util import format_number +from django.db.backends.utils import format_number def decimal_to_string(value, max_digits=16, decimal_places=0): From ef9eafaffb2b2a811ae30ff4d8ef9c9d86221743 Mon Sep 17 00:00:00 2001 From: Simion Baws Date: Wed, 13 Jan 2016 12:18:17 +0200 Subject: [PATCH 2/3] Backwards compatibility --- djangotoolbox/db/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/djangotoolbox/db/utils.py b/djangotoolbox/db/utils.py index 092d11c..5e7cd11 100644 --- a/djangotoolbox/db/utils.py +++ b/djangotoolbox/db/utils.py @@ -1,4 +1,7 @@ -from django.db.backends.utils import format_number +try: + from django.db.backends.utils import format_number +except ImportError: + from django.db.backends.util import format_number def decimal_to_string(value, max_digits=16, decimal_places=0): From 77d93f2d418a4d738af894d359a3b2f79d957d2d Mon Sep 17 00:00:00 2001 From: Simion Baws Date: Mon, 15 Feb 2016 09:30:23 +0200 Subject: [PATCH 3/3] Fixed import_module / import_string --- djangotoolbox/fields.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/djangotoolbox/fields.py b/djangotoolbox/fields.py index c4e877b..eb35f82 100644 --- a/djangotoolbox/fields.py +++ b/djangotoolbox/fields.py @@ -1,12 +1,15 @@ # All fields except for BlobField written by Jonas Haag from django.core.exceptions import ValidationError -from django.utils.importlib import import_module from django.db import models from django.db.models.fields.subclassing import Creator from django.db.utils import IntegrityError from django.db.models.fields.related import add_lazy_relation +try: + from django.utils.module_loading import import_string as import_module +except ImportError: + from django.utils.importlib import import_module __all__ = ('RawField', 'ListField', 'SetField', 'DictField', 'EmbeddedModelField', 'BlobField')