Changed getting of EditorClass and editor to functions (so they don't run so early).

wiki/admin.py

@@ -23,15 +23,15 @@ class ArticleRevisionForm(forms.ModelForm):
         
     def __init__(self, *args, **kwargs):
         super(ArticleRevisionForm, self).__init__(*args, **kwargs)
-        EditorClass = editors.EditorClass
-        editor = editors.editor
+        EditorClass = editors.getEditorClass()
+        editor = editors.getEditor()
         self.fields['content'].widget = editor.get_admin_widget()
 
 class ArticleRevisionAdmin(admin.ModelAdmin):
     form = ArticleRevisionForm
     class Media:
-        js = editors.EditorClass.AdminMedia.js
-        css = editors.EditorClass.AdminMedia.css
+        js = editors.getEditorClass().AdminMedia.js
+        css = editors.getEditorClass().AdminMedia.css
 
 class ArticleRevisionInline(admin.TabularInline):
     model = models.ArticleRevision
@@ -41,8 +41,8 @@ class ArticleRevisionInline(admin.TabularInline):
     fields = ('content', 'title',  'deleted', 'locked',)
     
     class Media:
-        js = editors.EditorClass.AdminMedia.js
-        css = editors.EditorClass.AdminMedia.css
+        js = editors.getEditorClass().AdminMedia.js
+        css = editors.getEditorClass().AdminMedia.css
 
 class ArticleForm(forms.ModelForm):
 

wiki/editors/__init__.py

 from wiki.conf import settings
 from django.core.urlresolvers import get_callable
 
-EditorClass = get_callable(settings.EDITOR)
-editor = EditorClass()
+_EditorClass = None
+_editor = None
+
+def getEditorClass():
+    if not _EditorClass:
+        _EditorClass = get_callable(settings.EDITOR)
+    return _EditorClass
+    
+def getEditor():
+    if not _editor:
+        _editor = getEditorClass()()
+    return _editor

wiki/views/article.py

@@ -106,7 +106,7 @@ class Create(FormView, ArticleMixin):
         kwargs['parent_urlpath'] = self.urlpath
         kwargs['parent_article'] = self.article
         kwargs['create_form'] = kwargs.pop('form', None)
-        kwargs['editor'] = editors.editor
+        kwargs['editor'] = editors.getEditor()
         return super(Create, self).get_context_data(**kwargs)
     
 
@@ -290,7 +290,7 @@ class Edit(FormView, ArticleMixin):
     
     def get_context_data(self, **kwargs):
         kwargs['edit_form'] = kwargs.pop('form', None)
-        kwargs['editor'] = editors.editor
+        kwargs['editor'] = editors.getEditor()
         kwargs['selected_tab'] = 'edit'
         kwargs['sidebar'] = self.sidebar_plugins
         
@@ -565,6 +565,6 @@ def root_create(request):
         create_form = forms.CreateRootForm()
     
     c = RequestContext(request, {'create_form': create_form,
-                                 'editor': editors.editor,})
+                                 'editor': editors.getEditor(),})
     return render_to_response("wiki/article/create_root.html", context_instance=c)