Merge pull request #103 from joehybird/dj20-warnings

Fix some django 2.x warnings

CHANGELOG.rst

@@ -11,6 +11,8 @@ master (unreleased)
 * Added support for python 3.6
 * Fixed User.is_authenticated() deprecation warning (Django>=2.0)
 * Fixed deprecated MIDDLEWARE_CLASSES settings
+* Fixed deprecated urls declarations
+* Fixed ForeignKey on_delete values
 
 0.12.2 (2018-03-09)
 ===================

agnocomplete/__init__.py

@@ -5,7 +5,7 @@
 import logging
 
 from django.conf import settings
-from django.utils.module_loading import import_module
+from django.utils.module_loading import autodiscover_modules
 
 logger = logging.getLogger(__name__)
 
@@ -22,20 +22,7 @@ def get_namespace():
 
 def autodiscover():
     """Auto-discover INSTALLED_APPS agnocomplete modules."""
-    module_name = "autocomplete"
-    for app in settings.INSTALLED_APPS:
-        # Attempt to import the app's 'routing' module
-        module = '{}.{}'.format(app, module_name)
-        try:
-            import_module(module)
-        except ImportError as ex:
-            reason = ex.args[0]
-            if 'No module named {}'.format(module_name) in reason \
-                    or "No module named '{}'".format(module) in reason:
-                logger.info('No module named {}'.format(module))
-            else:  # re-raise - something's wrong
-                logger.warning(ex)
-                raise ImportError(ex)
+    autodiscover_modules('autocomplete')
 
 
 default_app_config = 'agnocomplete.app.AgnocompleteConfig'

agnocomplete/widgets.py

@@ -6,7 +6,7 @@
 from django import get_version
 
 from django.forms import widgets
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.encoding import force_text as text
 from django.conf import settings
 

demo/authentication.py

@@ -13,7 +13,7 @@ class PersonBackend(object):
     Authenticate against the Person model.
     """
 
-    def authenticate(self, email=None):
+    def authenticate(self, request=None, email=None):
         try:
             person = Person.objects.get(email=email)
         except Person.DoesNotExist:

demo/autocomplete.py

@@ -2,7 +2,7 @@
 Autocomplete classes
 """
 import logging
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.encoding import force_text as text
 from django.conf import settings
 

demo/forms.py

@@ -4,7 +4,7 @@
 import pprint
 
 from django import forms
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 from agnocomplete import fields, widgets
 from agnocomplete.forms import UserContextFormMixin

demo/models.py

@@ -31,7 +31,7 @@ def save(self, *args, **kwargs):
 
 
 class FavoriteColor(models.Model):
-    person = models.ForeignKey(Person)
+    person = models.ForeignKey(Person, on_delete=models.CASCADE)
     color = models.CharField(max_length=100, choices=COLORS)
 
     def __unicode__(self):
@@ -48,7 +48,7 @@ def __unicode__(self):
 
 
 class PersonTag(models.Model):
-    person = models.ForeignKey(Person)
+    person = models.ForeignKey(Person, on_delete=models.CASCADE)
     tags = models.ManyToManyField(Tag)
 
     def __unicode__(self):
@@ -72,7 +72,7 @@ def __unicode__(self):
 
 
 class PersonContextTag(models.Model):
-    person = models.ForeignKey(Person)
+    person = models.ForeignKey(Person, on_delete=models.CASCADE)
     tags = models.ManyToManyField(ContextTag)
 
     def __unicode__(self):

demo/tests/test_admin_views.py

@@ -1,5 +1,5 @@
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.contrib.auth.models import User
 
 from ..admin import FavoriteColorModelForm

demo/tests/test_demo_views.py

@@ -1,5 +1,5 @@
 import json
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase, override_settings
 import mock
 

demo/tests/test_errors.py

@@ -1,5 +1,5 @@
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import override_settings
 from django.core.exceptions import SuspiciousOperation
 

demo/tests/test_fields.py

@@ -1,7 +1,7 @@
 from distutils.version import StrictVersion
 
 from django import forms, get_version
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 import six
 

demo/tests/test_url_proxy_views.py

@@ -1,7 +1,7 @@
 import json
 
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.encoding import force_text as text
 
 from .. import DATABASE, GOODAUTHTOKEN

demo/tests/test_views.py

@@ -1,5 +1,5 @@
 # -*- coding: utf8 -*-
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.encoding import force_text as text
 from django.contrib.auth.models import User
 

demo/urls.py

@@ -9,13 +9,13 @@
 
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 
     # Autodiscovered URLs
     url(
         r'^agnocomplete/',
         include(
-            'agnocomplete.urls',
+            ('agnocomplete.urls', 'agnocomplete'),
             namespace=get_namespace()
         )
     ),
@@ -66,6 +66,6 @@
         name='url-proxy-with-extra'),
 
     # Mock Third Party URLs
-    url(r'^3rdparty/', include('demo.urls_proxy', namespace='url-proxy')),
+    url(r'^3rdparty/', include(('demo.urls_proxy', 'url-proxy')))
 
 ]

demo/views.py

@@ -1,6 +1,6 @@
 import logging
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.views.generic import CreateView, FormView, UpdateView
 from django.utils.decorators import method_decorator