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/templatetags/frontendadmin_tags.py b/frontendadmin/templatetags/frontendadmin_tags.py index 1d549f1..4733016 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 @@ -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 @@ -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 diff --git a/frontendadmin/urls.py b/frontendadmin/urls.py index 75535ed..145bebf 100644 --- a/frontendadmin/urls.py +++ b/frontendadmin/urls.py @@ -1,8 +1,14 @@ -from django.conf.urls.defaults import * +# 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' @@ -26,5 +32,5 @@ url(r'^success_delete/$', success_delete, name='frontendadmin_success_delete' - ), -) + ) +] diff --git a/frontendadmin/views.py b/frontendadmin/views.py index f82b284..277bdac 100644 --- a/frontendadmin/views.py +++ b/frontendadmin/views.py @@ -2,7 +2,13 @@ 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 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 @@ -11,12 +17,16 @@ 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 forms import DeleteRequestForm, FrontendAdminModelForm +from .forms import DeleteRequestForm, FrontendAdminModelForm EXCLUDES = getattr(settings, 'FRONTEND_EXCLUDES', {})