From 22997ded2f02877408b43071136849ddbb095ec9 Mon Sep 17 00:00:00 2001 From: Jan-Jelle Kester Date: Thu, 16 Feb 2017 22:24:24 +0100 Subject: [PATCH 1/2] Fix import error Issue #104 --- src/auditlog/mixins.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/auditlog/mixins.py b/src/auditlog/mixins.py index 0a554a9..3022b6d 100644 --- a/src/auditlog/mixins.py +++ b/src/auditlog/mixins.py @@ -2,7 +2,10 @@ import json from django.conf import settings from django.core import urlresolvers -from django.urls.exceptions import NoReverseMatch +try: + from django.urls.exceptions import NoReverseMatch +except ImportError: + from django.core.urlresolvers import NoReverseMatch MAX = 75 From d97160f0c8f2cdaa55b4f5790a4710bde0afaf39 Mon Sep 17 00:00:00 2001 From: Jan-Jelle Kester Date: Thu, 16 Feb 2017 22:24:35 +0100 Subject: [PATCH 2/2] Version bump --- docs/source/conf.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 217537b..933d18a 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -62,7 +62,7 @@ copyright = u'2017, Jan-Jelle Kester' # The short X.Y version. version = '0.4' # The full version, including alpha/beta/rc tags. -release = '0.4.2' +release = '0.4.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 32c811b..bac6ade 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup setup( name='django-auditlog', - version='0.4.2', + version='0.4.3', packages=['auditlog', 'auditlog.migrations'], package_dir={'': 'src'}, url='https://github.com/jjkester/django-auditlog',