diff --git a/djangotoolbox/db/utils.py b/djangotoolbox/db/utils.py index 9cf4271..5e7cd11 100644 --- a/djangotoolbox/db/utils.py +++ b/djangotoolbox/db/utils.py @@ -1,4 +1,7 @@ -from django.db.backends.util 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): 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')