1+ import django
12from django .contrib import admin
23from django .utils .translation import ugettext as _
3- from django .utils .encoding import force_unicode
4+
5+ if django .VERSION >= (1 , 8 ):
6+ from django .utils .encoding import force_text
7+ else :
8+ from django .utils .encoding import force_unicode as force_text
9+
410from django .http import HttpResponseRedirect
511from functools import update_wrapper
612
@@ -18,28 +24,31 @@ def has_delete_permission(self, request, obj=None):
1824 return False
1925
2026 def get_urls (self ):
21- try :
22- from django .conf .urls .defaults import patterns , url
23- except ImportError :
24- from django .conf .urls import patterns , url
25-
2627 def wrap (view ):
2728 def wrapper (* args , ** kwargs ):
2829 return self .admin_site .admin_view (view )(* args , ** kwargs )
2930 return update_wrapper (wrapper , view )
3031
31- info = self .model ._meta .app_label , self .model ._meta .module_name
32+ info = self .model ._meta .app_label , self .model ._meta .model_name
3233
33- urlpatterns = patterns ('' ,
34- url (r'^history/$' ,
35- wrap (self .history_view ),
36- {'object_id' : '1' },
37- name = '%s_%s_history' % info ),
38- url (r'^$' ,
39- wrap (self .change_view ),
40- {'object_id' : '1' },
41- name = '%s_%s_changelist' % info ),
42- )
34+ if django .VERSION >= (1 , 8 ):
35+ from django .urls import path
36+ urlpatterns = [
37+ path (r'history/' , wrap (self .history_view ), {'object_id' : '1' }, name = '%s_%s_history' % info ),
38+ path (r'' , wrap (self .change_view ), {'object_id' : '1' }, name = '%s_%s_changelist' % info ),
39+ ]
40+ else :
41+ try :
42+ from django .conf .urls .defaults import patterns , url
43+ except ImportError :
44+ from django .conf .urls import patterns , url
45+ info = self .model ._meta .app_label , self .model ._meta .module_name
46+
47+ urlpatterns = patterns (
48+ '' ,
49+ url (r'^history/$' , wrap (self .history_view ), {'object_id' : '1' }, name = '%s_%s_history' % info ),
50+ url (r'^$' , wrap (self .change_view ), {'object_id' : '1' }, name = '%s_%s_changelist' % info ),
51+ )
4352 return urlpatterns
4453
4554 def response_change (self , request , obj ):
@@ -48,8 +57,8 @@ def response_change(self, request, obj):
4857 """
4958 opts = obj ._meta
5059
51- msg = _ ('%(obj)s was changed successfully.' ) % {'obj' : force_unicode (obj )}
52- if request .POST .has_key ("_continue" ):
60+ msg = _ ('%(obj)s was changed successfully.' ) % {'obj' : force_text (obj )}
61+ if request .POST .get ("_continue" ):
5362 self .message_user (request , msg + ' ' + _ ("You may edit it again below." ))
5463 return HttpResponseRedirect (request .path )
5564 else :
0 commit comments