Merge pull request #858 from jdufresne/all-dj

Remove workaround for older unsupported Djangos

import_export/admin.py

@@ -21,6 +21,7 @@ except ImportError:  # Django<2.0
     from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.utils.decorators import method_decorator
+from django.utils.encoding import force_text
 from django.views.decorators.http import require_POST
 
 from .forms import (
@@ -37,10 +38,6 @@ from .results import RowResult
 from .tmp_storages import TempFolderStorage
 from .signals import post_export, post_import
 
-try:
-    from django.utils.encoding import force_text
-except ImportError:
-    from django.utils.encoding import force_unicode as force_text
 
 SKIP_ADMIN_LOG = getattr(settings, 'IMPORT_EXPORT_SKIP_ADMIN_LOG', False)
 TMP_STORAGE_CLASS = getattr(settings, 'IMPORT_EXPORT_TMP_STORAGE_CLASS',

import_export/resources.py

@@ -18,6 +18,7 @@ from django.db.models.query import QuerySet
 from django.db.transaction import TransactionManagementError
 from django.utils import six
 from django.utils.safestring import mark_safe
+from django.utils.encoding import force_text
 
 from . import widgets
 from .fields import Field
@@ -33,10 +34,6 @@ except ImportError:
 
 from django.db.models.fields.related import ForeignObjectRel
 
-try:
-    from django.utils.encoding import force_text
-except ImportError:
-    from django.utils.encoding import force_unicode as force_text
 
 logger = logging.getLogger(__name__)
 # Set default logging handler to avoid "No handler found" warnings.

import_export/widgets.py

@@ -4,18 +4,13 @@ from __future__ import unicode_literals
 from decimal import Decimal
 from datetime import datetime, date
 from django.utils import datetime_safe, timezone, six
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_text, force_text
 from django.utils.dateparse import parse_duration
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 import json
 import ast
 
-try:
-    from django.utils.encoding import force_text
-except ImportError:
-    from django.utils.encoding import force_unicode as force_text
-
 
 class Widget(object):
     """

tests/core/tests/test_base_formats.py

@@ -4,11 +4,7 @@ from __future__ import unicode_literals
 import os
 
 from django.test import TestCase
-
-try:
-    from django.utils.encoding import force_text
-except ImportError:
-    from django.utils.encoding import force_unicode as force_text
+from django.utils.encoding import force_text
 
 from import_export.formats import base_formats
 

tests/core/tests/test_resources.py

@@ -14,6 +14,7 @@ from django.db.models import Count
 from django.db.models.fields import FieldDoesNotExist
 from django.test import TestCase, TransactionTestCase, skipUnlessDBFeature
 from django.utils.html import strip_tags
+from django.utils.encoding import force_text
 
 from import_export import fields, resources, results, widgets
 from import_export.instance_loaders import ModelInstanceLoader
@@ -24,11 +25,6 @@ from ..models import (
     WithFloatField, Person, Role
 )
 
-try:
-    from django.utils.encoding import force_text
-except ImportError:
-    from django.utils.encoding import force_unicode as force_text
-
 
 class MyResource(resources.Resource):
     name = fields.Field()