Merge branch 'release/2.0'

* release/2.0:
  fixes wromng imports
  bump version
  updates _confir_action

.travis.yml

@@ -1,36 +1,16 @@
 language: python
 
 python:
-  - 2.7
   - 3.4
   - 3.5
   - 3.6
 
 env:
 
-  - DJANGO=1.9
-  - DJANGO=1.10
-  - DJANGO=1.11
   - DJANGO=2.0
+  - DJANGO=2.1
 
 
-matrix:
-  exclude:
-    - python: 2.7
-      env: DJANGO=2.0
-
-    - python: 3.4
-      env: DJANGO=2.0
-
-    - python: 3.6
-      env: DJANGO=1.8
-    - python: 3.6
-      env: DJANGO=1.9
-    - python: 3.6
-      env: DJANGO=1.10
-    - python: 3.6
-      env: DJANGO=1.11
-
 sudo: false
 
 install:

CHANGES

@@ -1,3 +1,10 @@
+Release 2.0
+-----------
+* dropped support Python 2.x
+* dropped support Django < 2.0
+* add Django 2.1 support
+* Updates _confirm_action utility to properly handle exceptions
+
 Release 1.9
 -----------
 * Fixed the link css classes (issue #15)

src/admin_extra_urls/__init__.py

@@ -1,3 +1,3 @@
 NAME = "admin-extra-urls"
-VERSION = __version__ = "1.9.0"
+VERSION = __version__ = "2.0.0"
 __author__ = 'sax'

src/admin_extra_urls/extras.py

@@ -10,10 +10,9 @@
 from django.contrib.admin.templatetags.admin_urls import admin_urlname
 from django.core.exceptions import PermissionDenied
 from django.http import HttpResponse, HttpResponseRedirect
+from django.urls import reverse
 from django.utils.http import urlencode
 
-from admin_extra_urls.comapt import getfullargspec, reverse
-
 
 def labelize(label):
     return label.replace('_', ' ').strip().title()
@@ -67,7 +66,7 @@ def link(path=None, label=None, icon='', permission=None,
         permission = encapsulate(permission)
 
     def link_decorator(func):
-        args = getfullargspec(func).args
+        args = inspect.getfullargspec(func).args
         if len(args) < 2:  # pragma: no cover
             raise ValueError('AdminExtraUrls: error decorating `{0}`. '
                              'Link methods need at least 2 arguments '
@@ -117,7 +116,7 @@ def action(path=None, label=None, icon='', permission=None,
         permission = encapsulate(permission)
 
     def action_decorator(func):
-        args = getfullargspec(func).args
+        args = inspect.getfullargspec(func).args
         if len(args) < 3:  # pragma: no cover
             raise ValueError('AdminExtraUrls: error decorating `{0}`. '
                              'Action methods need at least 3 arguments '

src/admin_extra_urls/site.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
 
-
 class AdminSiteMixin(object):
     pass

tox.ini

@@ -1,7 +1,6 @@
 [tox]
 # as per https://docs.djangoproject.com/en/1.11/faq/install/#what-python-version-can-i-use-with-django
-envlist = d{19,110,111}-py{27,34,35,py}
-          d{20}-py{34,35,36}
+envlist = d{20,21}-py{34,35,36}
 
 [pytest]
 python_paths=./tests/demoapp/
@@ -37,6 +36,7 @@ deps=
     d110: django>=1.10,<1.11
     d111: django>=1.11,<1.12
     d20: django>=2.0,<2.1
+    d21: django>=2.0,<2.1
 
     dev: git+git://github.com/django/django.git#egg=django