From 5ff619979f499d2067c762d784d53c33a6d701a3 Mon Sep 17 00:00:00 2001 From: "Mosson, Andrew" Date: Thu, 19 Jun 2014 10:12:13 -0700 Subject: [PATCH] fix for django-braces>=1.4.0 braces 1.3 views exported AccessMixin in braces 1.4 this was moved views._access and not exported in views not sure if this was the intent of braces or an oversight if intent - should look at AccessMixin vs. using a more specific mixin tested against django-braces 1.3.1 and django-braces 1.4.0 --- djadmin2/viewmixins.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/djadmin2/viewmixins.py b/djadmin2/viewmixins.py index 723b00e..f3dc8c4 100644 --- a/djadmin2/viewmixins.py +++ b/djadmin2/viewmixins.py @@ -12,7 +12,14 @@ from django.utils.encoding import force_text from django.utils.text import get_text_list from django.utils.translation import ugettext as _ -from braces.views import AccessMixin +# braces 1.3 views exported AccessMixin +# in braces 1.4 this was moved views._access and not exported in views +# not sure if this was the intent of braces or an oversight +# if intent - should look at AccessMixin vs. using a more specific mixin +try: + from braces.views import AccessMixin +except ImportError: + from braces.views._access import AccessMixin from . import settings, permissions from .utils import admin2_urlname, model_options