admin.py uses correct import of Editor, EditorClass.

wiki/admin.py

@@ -9,6 +9,7 @@ from django.core.urlresolvers import get_callable
 
 import models
 from conf import settings
+import editors
 
 class ArticleObjectAdmin(GenericTabularInline):
     model = models.ArticleForObject
@@ -22,15 +23,15 @@ class ArticleRevisionForm(forms.ModelForm):
         
     def __init__(self, *args, **kwargs):
         super(ArticleRevisionForm, self).__init__(*args, **kwargs)
-        EditorClass = get_callable(settings.EDITOR)
-        editor = EditorClass(instance=self.instance)
+        EditorClass = editors.EditorClass
+        editor = editors.editor
         self.fields['content'].widget = editor.get_admin_widget()
 
 class ArticleRevisionAdmin(admin.ModelAdmin):
     form = ArticleRevisionForm
     class Media:
-        js = get_callable(settings.EDITOR).AdminMedia.js
-        css = get_callable(settings.EDITOR).AdminMedia.css
+        js = editors.EditorClass.AdminMedia.js
+        css = editors.EditorClass.AdminMedia.css
 
 class ArticleRevisionInline(admin.TabularInline):
     model = models.ArticleRevision
@@ -40,8 +41,8 @@ class ArticleRevisionInline(admin.TabularInline):
     fields = ('content', 'title',  'deleted', 'locked',)
     
     class Media:
-        js = get_callable(settings.EDITOR).AdminMedia.js
-        css = get_callable(settings.EDITOR).AdminMedia.css
+        js = editors.EditorClass.AdminMedia.js
+        css = editors.EditorClass.AdminMedia.css
 
 class ArticleForm(forms.ModelForm):