removed django.utils.six intead directly imported six

src/dal/test/case.py

@@ -10,7 +10,7 @@
 try:
     from django.urls import reverse
 except ImportError:
-    from django.core.urlresolvers import reverse
+    from django.urls import reverse
 from django.utils import six
 
 from splinter import Browser

src/dal/views.py

@@ -7,7 +7,7 @@
 from django.contrib.auth import get_permission_codename
 from django.core.exceptions import ImproperlyConfigured
 from django.http import HttpResponseBadRequest, HttpResponseNotAllowed
-from django.utils import six
+import six
 from django.views.generic.list import BaseListView
 
 
@@ -104,7 +104,7 @@ def create_object(self, text):
     def has_add_permission(self, request):
         """Return True if the user has the permission to add a model."""
         if django.VERSION < (2, 0, 0):
-            auth = request.user.is_authenticated()
+            auth = request.user.is_authenticated
         else:
             auth = request.user.is_authenticated
 

src/dal/widgets.py

@@ -10,8 +10,8 @@
 try:
     from django.urls import reverse
 except ImportError:
-    from django.core.urlresolvers import reverse
-from django.utils import six
+    from django.urls import reverse
+import six
 from django.utils.safestring import mark_safe
 
 

src/dal_contenttypes/fields.py

@@ -1,7 +1,7 @@
 """Model choice fields that take a ContentType too: for generic relations."""
 
 from django.contrib.contenttypes.models import ContentType
-from django.utils import six
+import six
 
 
 class ContentTypeModelFieldMixin(object):

src/dal_queryset_sequence/fields.py

@@ -7,7 +7,7 @@
 
 from django import forms
 from django.contrib.contenttypes.models import ContentType
-from django.conf.urls import url
+from django.urls import re_path
 
 from queryset_sequence import QuerySetSequence
 
@@ -162,5 +162,5 @@ def as_url(self, form):
 
         AutoView = type('Autoview{}{}'.format(form.__name__, self.field_id),
                         (self.view_obj,), {})
-        return url(r'^{}_{}_autocomp$'.format(form.__name__, self.field_id),
+        return re_path(r'^{}_{}_autocomp$'.format(form.__name__, self.field_id),
                    AutoView.as_view(queryset=self.queryset), name=url_name)

src/dal_queryset_sequence/widgets.py

@@ -8,7 +8,7 @@
 
 from django import forms
 from django.contrib.contenttypes.models import ContentType
-from django.utils import six
+import six
 
 
 class QuerySetSequenceSelectMixin(WidgetMixin):

src/dal_select2/views.py

@@ -7,8 +7,8 @@
 
 from django import http
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
-from django.utils.translation import ugettext as _
+import six
+from django.utils.translation import gettext as _
 from django.views.generic.list import View
 
 

src/dal_select2/widgets.py

@@ -14,7 +14,7 @@
     from django.contrib.admin.widgets import SELECT2_TRANSLATIONS
 except ImportError:
     SELECT2_TRANSLATIONS = {}
-from django.utils import six
+import six
 from django.utils import translation
 
 

src/dal_select2_queryset_sequence/fields.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from dal_queryset_sequence.fields import QuerySetSequenceModelField
 
@@ -44,5 +44,5 @@ def as_url(self, form):
                         (Select2QuerySetSequenceAutoView,),
                         {'model_choice': self.model_choice})  # send to the view the model and filter list
 
-        return url(r'^{}_{}_autocomp$'.format(form.__name__, self.field_id),
+        return re_path(r'^{}_{}_autocomp$'.format(form.__name__, self.field_id),
                    AutoView.as_view(), name=url_name)

src/dal_select2_queryset_sequence/views.py

@@ -7,7 +7,7 @@
 from queryset_sequence import QuerySetSequence
 
 from django.template.defaultfilters import capfirst
-from django.utils import six
+import six
 from django.db.models import Q
 
 from functools import reduce

src/dal_select2_taggit/widgets.py

@@ -3,7 +3,7 @@
 from dal_select2.widgets import TagSelect2
 
 from django import VERSION
-from django.utils import six
+import six
 
 
 class TaggitSelect2(TagSelect2):

test_project/custom_select2/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'custom_select2.apps.TestApp'

test_project/custom_select2/admin.py

@@ -10,7 +10,7 @@ class TestInline(admin.TabularInline):
     fk_name = 'for_inline'
 
 
+@admin.register(TModel)
 class TestAdmin(admin.ModelAdmin):
     form = TForm
     inlines = [TestInline]
-admin.site.register(TModel, TestAdmin)

test_project/custom_select2/urls.py

@@ -1,13 +1,13 @@
 from dal import autocomplete
 
-from django.conf.urls import url
+from django.urls import path
 
 from .models import TModel
 
 
 urlpatterns = [
-    url(
-        'test-autocomplete/$',
+    path(
+        'test-autocomplete/',
         autocomplete.Select2QuerySetView.as_view(model=TModel),
         name='select2_fk',
     ),

test_project/forward_different_fields/admin.py

@@ -10,7 +10,7 @@ class TestInline(admin.TabularInline):
     fk_name = 'for_inline'
 
 
+@admin.register(TModel)
 class TestAdmin(admin.ModelAdmin):
     form = TForm
 
-admin.site.register(TModel, TestAdmin)

test_project/forward_different_fields/urls.py

@@ -1,6 +1,6 @@
 from dal import autocomplete
 
-from django.conf.urls import url
+from django.urls import path
 
 
 class ListWithForwardsView(autocomplete.Select2ListView):
@@ -19,8 +19,8 @@ def get_list(self):
 
 
 urlpatterns = [
-    url(
-        '^forward_different_fields/$',
+    path(
+        'forward_different_fields/',
         ListWithForwardsView.as_view(),
         name='forward_different_fields'
     ),

test_project/linked_data/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'linked_data.apps.TestApp'

test_project/linked_data/admin.py

@@ -10,7 +10,7 @@ class TestInline(admin.TabularInline):
     fk_name = 'for_inline'
 
 
+@admin.register(TModel)
 class TestAdmin(admin.ModelAdmin):
     form = TForm
     inlines = [TestInline]
-admin.site.register(TModel, TestAdmin)

test_project/linked_data/test_views.py

@@ -6,8 +6,8 @@
 try:
     from django.urls import reverse
 except ImportError:
-    from django.core.urlresolvers import reverse
-from django.utils.encoding import force_text
+    from django.urls import reverse
+from django.utils.encoding import force_str
 
 from .models import TModel
 from .urls import LinkedDataView
@@ -24,7 +24,7 @@ def test_no_data(self):
 
         response = LinkedDataView.as_view(model=TModel)(request)
         self.assertEqual(response.status_code, 200)
-        self.assertJSONEqual(force_text(response.content),
+        self.assertJSONEqual(force_str(response.content),
                              '{"results": [], "pagination": {"more": false}}')
 
     def test_not_dict(self):
@@ -34,7 +34,7 @@ def test_not_dict(self):
 
         response = LinkedDataView.as_view(model=TModel)(request)
         self.assertEqual(response.status_code, 400)
-        self.assertEqual(force_text(response.content), 'Not a JSON object')
+        self.assertEqual(force_str(response.content), 'Not a JSON object')
 
     def test_invalid_json(self):
         request = self.factory.get(
@@ -43,7 +43,7 @@ def test_invalid_json(self):
 
         response = LinkedDataView.as_view(model=TModel)(request)
         self.assertEqual(response.status_code, 400)
-        self.assertEqual(force_text(response.content), 'Invalid JSON data')
+        self.assertEqual(force_str(response.content), 'Invalid JSON data')
 
     def test_invalid_method(self):
         request = self.factory.put(reverse('linked_data'))

test_project/linked_data/urls.py

@@ -1,6 +1,6 @@
 from dal import autocomplete
 
-from django.conf.urls import url
+from django.urls import path
 
 from .models import TModel
 
@@ -17,8 +17,8 @@ def get_queryset(self):
 
 
 urlpatterns = [
-    url(
-        '^linked_data/$',
+    path(
+        'linked_data/',
         LinkedDataView.as_view(model=TModel),
         name='linked_data'
     ),

test_project/rename_forward/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'rename_forward.apps.TestApp'

test_project/rename_forward/admin.py

@@ -10,7 +10,7 @@ class TestInline(admin.TabularInline):
     fk_name = 'for_inline'
 
 
+@admin.register(TModel)
 class TestAdmin(admin.ModelAdmin):
     form = TForm
     inlines = [TestInline]
-admin.site.register(TModel, TestAdmin)

test_project/rename_forward/urls.py

@@ -1,6 +1,6 @@
 from dal import autocomplete
 
-from django.conf.urls import url
+from django.urls import path
 
 from .models import TModel
 
@@ -22,8 +22,8 @@ def get_queryset(self):
 
 
 urlpatterns = [
-    url(
-        '^linked_data/$',
+    path(
+        'linked_data/',
         LinkedDataView.as_view(model=TModel),
         name='linked_data_rf'
     ),

test_project/secure_data/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'secure_data.apps.TestApp'

test_project/secure_data/admin.py

@@ -26,7 +26,7 @@ class TestInline(SecureFormMixin, admin.TabularInline):
     form = TForm
 
 
+@admin.register(TModel)
 class TestAdmin(SecureFormMixin, admin.ModelAdmin):
     inlines = [TestInline]
     form = TForm
-admin.site.register(TModel, TestAdmin)

test_project/secure_data/urls.py

@@ -1,6 +1,6 @@
 from dal import autocomplete
 
-from django.conf.urls import url
+from django.urls import path
 
 from .models import TModel
 
@@ -11,8 +11,8 @@ def get_queryset(self):
 
 
 urlpatterns = [
-    url(
-        '^secure-data/$',
+    path(
+        'secure-data/',
         SecureDataView.as_view(),
         name='secure_data',
     ),

test_project/select2_foreign_key/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'select2_foreign_key.apps.TestApp'

test_project/select2_foreign_key/admin.py

@@ -10,7 +10,7 @@ class TestInline(admin.TabularInline):
     fk_name = 'for_inline'
 
 
+@admin.register(TModel)
 class TestAdmin(admin.ModelAdmin):
     form = TForm
     inlines = [TestInline]
-admin.site.register(TModel, TestAdmin)

test_project/select2_foreign_key/urls.py

@@ -1,13 +1,13 @@
 from dal import autocomplete
 
-from django.conf.urls import url
+from django.urls import path
 
 from .models import TModel
 
 
 urlpatterns = [
-    url(
-        'test-autocomplete/$',
+    path(
+        'test-autocomplete/',
         autocomplete.Select2QuerySetView.as_view(model=TModel),
         name='select2_fk',
     ),

test_project/select2_generic_foreign_key/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'select2_generic_foreign_key.apps.TestApp'

test_project/select2_generic_foreign_key/admin.py

@@ -10,7 +10,7 @@ class TestInline(admin.TabularInline):
     fk_name = 'for_inline'
 
 
+@admin.register(TModel)
 class TestAdmin(admin.ModelAdmin):
     form = TForm
     inlines = [TestInline]
-admin.site.register(TModel, TestAdmin)

test_project/select2_generic_foreign_key/test_forms.py

@@ -6,8 +6,8 @@
 try:
     from django.urls import reverse
 except ImportError:
-    from django.core.urlresolvers import reverse
-from django.utils import six
+    from django.urls import reverse
+import six
 
 from queryset_sequence import QuerySetSequence
 

test_project/select2_generic_foreign_key/urls.py

@@ -1,6 +1,6 @@
 from dal import autocomplete
 
-from django.conf.urls import url
+from django.urls import path
 from django.contrib.auth.models import Group
 from django.views import generic
 
@@ -9,8 +9,8 @@
 
 
 urlpatterns = [
-    url(
-        'test/(?P<pk>\d+)/$',
+    path(
+        'test/<int:pk>/',
         generic.UpdateView.as_view(
             model=TModel,
             form_class=TForm,

test_project/select2_generic_m2m/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'select2_generic_m2m.apps.TestApp'

test_project/select2_generic_m2m/admin.py

@@ -10,7 +10,7 @@ class TestInline(admin.TabularInline):
     fk_name = 'for_inline'
 
 
+@admin.register(TModel)
 class TestAdmin(admin.ModelAdmin):
     form = TForm
     inlines = [TestInline]
-admin.site.register(TModel, TestAdmin)

test_project/select2_generic_m2m/test_forms.py

@@ -7,8 +7,8 @@
 try:
     from django.urls import reverse
 except ImportError:
-    from django.core.urlresolvers import reverse
-from django.utils import six
+    from django.urls import reverse
+import six
 
 from queryset_sequence import QuerySetSequence