more on future compatibility

src/fobi/contrib/plugins/form_handlers/db_store/fobi_form_handlers.py

@@ -2,9 +2,10 @@ import datetime
 
 import simplejson as json
 
-from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 
+from nine.versions import DJANGO_GTE_1_10
+
 from fobi.base import (
     # General
     get_processed_form_data,
@@ -24,6 +25,11 @@ from fobi.helpers import get_form_element_entries_for_form_wizard_entry
 from . import UID
 from .models import SavedFormDataEntry, SavedFormWizardDataEntry
 
+if DJANGO_GTE_1_10:
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 __title__ = 'fobi.contrib.plugins.form_handlers.db_store.fobi_form_handlers'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2017 Artur Barseghyan'

src/fobi/contrib/plugins/form_importers/mailchimp_importer/views.py

@@ -1,16 +1,22 @@
 import logging
 
-import mailchimp
-
 from django.contrib import messages
-from django.core.urlresolvers import reverse
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
 
+import mailchimp
+
 from fobi.wizard import SessionWizardView
 
+from nine.versions import DJANGO_GTE_1_10
+
 from .forms import MailchimpAPIKeyForm, MailchimpListIDForm
 
+if DJANGO_GTE_1_10:
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 __title__ = 'fobi.contrib.plugins.form_importers.mailchimp_importer.views'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2017 Artur Barseghyan'

src/fobi/dynamic.py

@@ -1,21 +1,28 @@
-from six import with_metaclass
-
-from django.core.urlresolvers import reverse
 from django.forms.forms import BaseForm
 from django.forms.widgets import media_property
 from django.http import HttpResponseRedirect
 
-from nine.versions import DJANGO_GTE_1_7, DJANGO_GTE_1_8
+from nine.versions import (
+    DJANGO_GTE_1_7,
+    DJANGO_GTE_1_8,
+    DJANGO_GTE_1_10,
+)
+
+from six import with_metaclass
 
 from .constants import WIZARD_TYPE_COOKIE, WIZARD_TYPE_SESSION
 
 if DJANGO_GTE_1_8:
     from formtools.wizard.views import (
-        WizardView, SessionWizardView, CookieWizardView
+        CookieWizardView,
+        SessionWizardView,
+        WizardView,
     )
 else:
     from django.contrib.formtools.wizard.views import (
-        WizardView, SessionWizardView, CookieWizardView
+        CookieWizardView,
+        SessionWizardView,
+        WizardView,
     )
 
 if DJANGO_GTE_1_7:
@@ -23,6 +30,11 @@ if DJANGO_GTE_1_7:
 else:
     from django.utils.datastructures import SortedDict as OrderedDict
 
+if DJANGO_GTE_1_10:
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 __title__ = 'fobi.dynamic'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2017 Artur Barseghyan'

src/fobi/form_importers.py

@@ -1,12 +1,17 @@
-from six import text_type
+from nine.versions import DJANGO_GTE_1_10
 
 import simplejson as json
 
-from django.core.urlresolvers import reverse
+from six import text_type
 
 from .base import BaseRegistry
 from .discover import autodiscover
 
+if DJANGO_GTE_1_10:
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 __title__ = 'fobi.form_importers'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2017 Artur Barseghyan'

src/fobi/helpers.py

@@ -3,47 +3,50 @@ Helpers module. This module can be safely imported from any fobi (sub)module,
 since it never imports from any of the fobi (sub)modules (except for the
 `fobi.constants` and `fobi.exceptions` modules).
 """
-import os
 import glob
 import logging
-import uuid
+import os
 import shutil
-
-from six import text_type, PY3
-
-import simplejson as json
-
-from django.conf import settings
-from django.core.urlresolvers import reverse
-from django.core.files.base import File
-from django.contrib.contenttypes.models import ContentType
-from django.db.utils import DatabaseError
-from django.utils.encoding import force_text
-from django.utils.html import format_html_join
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-from django.contrib.auth.models import AnonymousUser
-from django.test.client import RequestFactory
-from django.http import HttpResponse
+import uuid
 
 from autoslug.settings import slugify
 
-from nine.user import User
-from nine.versions import DJANGO_GTE_1_7
+from django import forms
+from django.conf import settings
+from django.contrib.auth.models import AnonymousUser
+from django.contrib.contenttypes.models import ContentType
+from django.core.files.base import File
+from django.db.utils import DatabaseError
+from django.http import HttpResponse
+from django.test.client import RequestFactory
+from django.utils.encoding import force_text
+from django.utils.html import format_html_join
+from django.utils.translation import ugettext_lazy as _
 
-from fobi.constants import (
-    SUBMIT_VALUE_AS_VAL,
+from nine.user import User
+from nine.versions import DJANGO_GTE_1_7, DJANGO_GTE_1_10
+
+import simplejson as json
+
+from six import text_type, PY3
+
+from .constants import (
+    SUBMIT_VALUE_AS_MIX,
     SUBMIT_VALUE_AS_REPR,
-    SUBMIT_VALUE_AS_MIX
+    SUBMIT_VALUE_AS_VAL,
 )
-from fobi.exceptions import ImproperlyConfigured
+from .exceptions import ImproperlyConfigured
 
 if DJANGO_GTE_1_7:
     import django.apps
-
 else:
     from django.db import models
 
+if DJANGO_GTE_1_10:
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 __title__ = 'fobi.helpers'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2017 Artur Barseghyan'

src/fobi/models.py

@@ -2,13 +2,14 @@ from __future__ import absolute_import
 
 import logging
 
+from autoslug import AutoSlugField
+
 from django.conf import settings
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from autoslug import AutoSlugField
+from nine.versions import DJANGO_GTE_1_10
 
 from six import python_2_unicode_compatible
 
@@ -18,10 +19,15 @@ from .base import (
     form_wizard_handler_plugin_registry,
     get_registered_form_element_plugins,
     get_registered_form_handler_plugins,
-    get_registered_form_wizard_handler_plugins
+    get_registered_form_wizard_handler_plugins,
 )
 from .constants import WIZARD_TYPES, DEFAULT_WIZARD_TYPE
 
+if DJANGO_GTE_1_10:
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 __title__ = 'fobi.models'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2017 Artur Barseghyan'

src/fobi/tests/test_browser_build_dynamic_forms.py

@@ -11,12 +11,13 @@ from selenium.webdriver.support.wait import WebDriverWait
 from selenium.common.exceptions import WebDriverException
 
 from django.core.management import call_command
-from django.core.urlresolvers import reverse
 from django.test import LiveServerTestCase
 from django.conf import settings
 
 from fobi.models import FormEntry
 
+from nine.versions import DJANGO_GTE_1_10
+
 from . import constants
 from .base import print_info, skip
 from .data import (
@@ -31,6 +32,10 @@ from .helpers import (
     phantom_js_clean_up
 )
 
+if DJANGO_GTE_1_10:
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
 
 __title__ = 'fobi.tests.test_browser_build_dynamic_forms'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'

src/fobi/utils.py

@@ -3,18 +3,19 @@ Another helper module. This module can NOT be safely imported from any fobi
 (sub)module - thus should be imported carefully.
 """
 import datetime
-import os
 import logging
-
-from six import PY3
+import os
 
 from django.conf import settings
 from django.contrib import messages
-from django.core.urlresolvers import reverse
 from django.forms.widgets import TextInput
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext, ugettext_lazy as _
 
+from nine.versions import DJANGO_GTE_1_10
+
+from six import PY3
+
 from .base import (
     form_element_plugin_registry,
     form_handler_plugin_registry,
@@ -42,6 +43,11 @@ from .models import (
 )
 from .settings import RESTRICT_PLUGIN_ACCESS, DEBUG, WIZARD_FILES_UPLOAD_DIR
 
+if DJANGO_GTE_1_10:
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 __title__ = 'fobi.utils'
 __author__ = 'Artur Barseghyan <artur.barseghyan@gmail.com>'
 __copyright__ = '2014-2017 Artur Barseghyan'

src/fobi/views.py

@@ -87,7 +87,9 @@ from .wizard import DynamicSessionWizardView, DynamicCookieWizardView
 
 if versions.DJANGO_GTE_1_10:
     from django.shortcuts import render
+    from django.urls import reverse
 else:
+    from django.core.urlresolvers import reverse
     from django.shortcuts import render_to_response
 
 if versions.DJANGO_GTE_1_8:

src/fobi/wizard/views/dynamic.py

@@ -4,7 +4,6 @@ import re
 
 from django import forms
 from django.shortcuts import redirect
-from django.core.urlresolvers import reverse
 from django.forms import formsets, ValidationError
 from django.views.generic import TemplateView
 from django.utils.decorators import classonlymethod
@@ -24,6 +23,11 @@ else:
     )
     from django.contrib.formtools.wizard.forms import ManagementForm
 
+if versions.DJANGO_GTE_1_10:
+    from django.urls import reverse
+else:
+    from django.core.urlresolvers import reverse
+
 logger = logging.getLogger(__name__)
 
 __all__ = (