Merge branch 'master' into drop-django-1.7

django-hijack · Apr 4, 2018 · f1fe741 · f1fe741
2 parents 066eea1 + 610bf0e
commit f1fe741
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/hijack_admin/admin.py b/hijack_admin/admin.py
@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 from compat import get_user_model
+from django import VERSION
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.template.loader import get_template
 from django.utils.translation import ugettext_lazy as _
 
 from hijack import settings as hijack_settings
+
 from hijack_admin import settings as hijack_admin_settings
 
 try:
@@ -34,7 +36,6 @@ def hijack_field(self, obj):
 
         return button_template.render(button_context)
 
-    hijack_field.allow_tags = True
     hijack_field.short_description = _('Hijack user')
 
 

diff --git a/hijack_admin/tests/test_hijack_admin.py b/hijack_admin/tests/test_hijack_admin.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
-
 from hijack.tests.test_hijack import BaseHijackTests
-from hijack.tests.utils import SettingsOverride
 
 from hijack_admin import settings as hijack_admin_settings
 from hijack_admin.tests.test_app.models import RelatedModel