From 1b87ffddd845fbe8737a79d7498be042ccfc8472 Mon Sep 17 00:00:00 2001 From: artscoop Date: Fri, 28 Jun 2013 00:20:51 +0200 Subject: [PATCH 1/9] Fix for django.conf.urls.default deprecated in 1.4 --- frontendadmin/urls.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontendadmin/urls.py b/frontendadmin/urls.py index 75535ed..384429c 100644 --- a/frontendadmin/urls.py +++ b/frontendadmin/urls.py @@ -1,4 +1,7 @@ -from django.conf.urls.defaults import * +try: + from django.conf.urls.defaults import * +except: + from django.conf.urls import * from frontendadmin.views import add, change, delete, success, success_delete from django.views.decorators.cache import never_cache From 8d1d230a965ed71751737c0715170a79e873bc39 Mon Sep 17 00:00:00 2001 From: Steve Kossouho Date: Mon, 31 Aug 2015 04:39:33 +0200 Subject: [PATCH 2/9] Python 3 changes --- frontendadmin/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontendadmin/views.py b/frontendadmin/views.py index 0bce338..4cfca07 100644 --- a/frontendadmin/views.py +++ b/frontendadmin/views.py @@ -16,7 +16,7 @@ from django.forms import CharField from django.contrib import messages -from forms import DeleteRequestForm, FrontendAdminModelForm +from .forms import DeleteRequestForm, FrontendAdminModelForm EXCLUDES = getattr(settings, 'FRONTEND_EXCLUDES', {}) From 9fe302b6674a8d90f463cacf56ec83fe78cbf98c Mon Sep 17 00:00:00 2001 From: Steve Kossouho Date: Mon, 31 Aug 2015 04:42:19 +0200 Subject: [PATCH 3/9] Python 3 changes --- frontendadmin/templatetags/frontendadmin_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontendadmin/templatetags/frontendadmin_tags.py b/frontendadmin/templatetags/frontendadmin_tags.py index 1d549f1..d65f9ca 100644 --- a/frontendadmin/templatetags/frontendadmin_tags.py +++ b/frontendadmin/templatetags/frontendadmin_tags.py @@ -11,7 +11,7 @@ def frontendadmin_add(context, queryset_object, label=None): # Check if `queryset_object` is a queryset if not isinstance(queryset_object, QuerySet): - raise template.TemplateSyntaxError, "'%s' argument must be a queryset" % queryset_object + raise template.TemplateSyntaxError("'%s' argument must be a queryset" % queryset_object) app_label = queryset_object.model._meta.app_label model_name = queryset_object.model._meta.module_name From 37d26733fdcf5822349225bf2ccd0c149cc8e457 Mon Sep 17 00:00:00 2001 From: Steve Kossouho Date: Mon, 31 Aug 2015 04:43:01 +0200 Subject: [PATCH 4/9] Python 3 changes --- frontendadmin/templatetags/frontendadmin_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontendadmin/templatetags/frontendadmin_tags.py b/frontendadmin/templatetags/frontendadmin_tags.py index d65f9ca..c8d2fd6 100644 --- a/frontendadmin/templatetags/frontendadmin_tags.py +++ b/frontendadmin/templatetags/frontendadmin_tags.py @@ -40,7 +40,7 @@ def frontendadmin_change(context, model_object, label=None): # Check if `model_object` is a model-instance if not isinstance(model_object, Model): - raise template.TemplateSyntaxError, "'%s' argument must be a model-instance" % model_object + raise template.TemplateSyntaxError("'%s' argument must be a model-instance" % model_object) app_label = model_object._meta.app_label model_name = model_object._meta.module_name From 29cab5dbca88e4f55f50be021e9db17414c8f868 Mon Sep 17 00:00:00 2001 From: Steve Kossouho Date: Mon, 31 Aug 2015 04:43:29 +0200 Subject: [PATCH 5/9] Python 3 changes --- frontendadmin/templatetags/frontendadmin_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontendadmin/templatetags/frontendadmin_tags.py b/frontendadmin/templatetags/frontendadmin_tags.py index c8d2fd6..4733016 100644 --- a/frontendadmin/templatetags/frontendadmin_tags.py +++ b/frontendadmin/templatetags/frontendadmin_tags.py @@ -70,7 +70,7 @@ def frontendadmin_delete(context, model_object, label=None): # Check if `model_object` is a model-instance if not isinstance(model_object, Model): - raise template.TemplateSyntaxError, "'%s' argument must be a model-instance" % model_object + raise template.TemplateSyntaxError("'%s' argument must be a model-instance" % model_object) app_label = model_object._meta.app_label model_name = model_object._meta.module_name From 20e2cd47b72aad1cb21df0879864eb869b70e778 Mon Sep 17 00:00:00 2001 From: Steve Kossouho Date: Wed, 21 Oct 2015 00:35:14 +0200 Subject: [PATCH 6/9] Fix for Django 1.9 --- frontendadmin/views.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontendadmin/views.py b/frontendadmin/views.py index 83d335e..6d35829 100644 --- a/frontendadmin/views.py +++ b/frontendadmin/views.py @@ -2,7 +2,12 @@ from django.contrib.admin import site from django.contrib.auth.decorators import login_required from django.core.urlresolvers import reverse -from django.db.models import get_model +try: + # Not supported after Django 1.8 + from django.db.models import get_model +except ImportError: + # Only from Django 1.9 onwards + from django.apps.apps import get_model from django.forms.models import modelform_factory from django.http import HttpResponseRedirect, HttpResponseForbidden from django.shortcuts import render_to_response From b58b99bf65a0867d2b38432760d4d5adb8644b67 Mon Sep 17 00:00:00 2001 From: Steve Kossouho Date: Wed, 21 Oct 2015 00:36:27 +0200 Subject: [PATCH 7/9] Fix for Django 1.9 --- frontendadmin/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontendadmin/views.py b/frontendadmin/views.py index 6d35829..5547286 100644 --- a/frontendadmin/views.py +++ b/frontendadmin/views.py @@ -7,7 +7,8 @@ from django.db.models import get_model except ImportError: # Only from Django 1.9 onwards - from django.apps.apps import get_model + from django.apps import apps + get_model = apps.get_model from django.forms.models import modelform_factory from django.http import HttpResponseRedirect, HttpResponseForbidden from django.shortcuts import render_to_response From a8f5ab4abb6872b3bddb4046e1e9b9251cfbfb60 Mon Sep 17 00:00:00 2001 From: Steve Kossouho Date: Wed, 21 Oct 2015 00:41:56 +0200 Subject: [PATCH 8/9] Python 2.7+ changes --- frontendadmin/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontendadmin/views.py b/frontendadmin/views.py index 5547286..277bdac 100644 --- a/frontendadmin/views.py +++ b/frontendadmin/views.py @@ -17,7 +17,11 @@ from django.template import TemplateDoesNotExist from django.utils.translation import ugettext as _ from django.views.decorators.cache import never_cache -from django.utils.importlib import import_module +try: + # For old versions of Django supporting py2.6 + from django.utils.importlib import import_module +except ImportError: + from importlib import import_module from django.conf import settings from django.forms import CharField from django.contrib import messages From b194d6d79745bf06405befa79196fec57288cf0f Mon Sep 17 00:00:00 2001 From: artscoop Date: Sat, 24 Dec 2016 20:22:42 +0100 Subject: [PATCH 9/9] Django 1.10 support --- .gitignore | 1 + frontendadmin/urls.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bfa6a22 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +# Created by .ignore support plugin (hsz.mobi) diff --git a/frontendadmin/urls.py b/frontendadmin/urls.py index 384429c..145bebf 100644 --- a/frontendadmin/urls.py +++ b/frontendadmin/urls.py @@ -1,11 +1,14 @@ +# coding: utf-8 try: from django.conf.urls.defaults import * except: from django.conf.urls import * + from frontendadmin.views import add, change, delete, success, success_delete from django.views.decorators.cache import never_cache -urlpatterns = patterns('', + +urlpatterns = [ url(r'^add/(?P[\w]+)/(?P[\w]+)/$', never_cache(add), name='frontendadmin_add' @@ -29,5 +32,5 @@ url(r'^success_delete/$', success_delete, name='frontendadmin_success_delete' - ), -) + ) +]