Merge 7631ce6 into 6e3ea39

admin_reorder/middleware.py

@@ -3,7 +3,14 @@
 from django.conf import settings
 from django.contrib import admin
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import resolve, Resolver404
+
+# Django 2.0 and up should use django.urls instead
+import django
+django_version = django.get_version()
+if django_version >= '2.0':
+    from django.urls import resolve, Resolver404
+else:
+    from django.core.urlresolvers import resolve, Resolver 404
 
 try:
     from django.utils.deprecation import MiddlewareMixin