From 24c0b5145d8d2d3e9080d427574dbf18ee60c8db Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridgeyman@gmail.com>
Date: Sun, 19 Aug 2012 14:41:49 -0400
Subject: [PATCH] Updated django-wiki and plugin imports.

---
 .../course_wiki/plugins/markdownedx/wiki_plugin.py        | 8 ++++----
 requirements.txt                                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py b/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py
index a33b4e86d1..cae7b0bfb4 100644
--- a/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py
+++ b/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py
@@ -2,12 +2,12 @@
 
 from django.core.urlresolvers import reverse_lazy
 
-from wiki.core import plugins_registry, baseplugin
-import wiki
+from wiki.core.plugins.base import BasePlugin
+from wiki.core.plugins import registry as plugin_registry
 
 from course_wiki.plugins.markdownedx import mdx_circuit, mdx_wikipath, mdx_mathjax, mdx_video
 
-class ExtendMarkdownPlugin(baseplugin.BasePlugin):
+class ExtendMarkdownPlugin(BasePlugin):
     """
     This plugin simply loads all of the markdown extensions we use in edX.
     """
@@ -20,5 +20,5 @@ class ExtendMarkdownPlugin(baseplugin.BasePlugin):
                            mdx_mathjax.MathJaxExtension(configs={}) ,
                            mdx_video.VideoExtension(configs={})]
 
-plugins_registry.register(ExtendMarkdownPlugin)
+plugin_registry.register(ExtendMarkdownPlugin)
 
diff --git a/requirements.txt b/requirements.txt
index 4e078cda51..15bfab1411 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -44,5 +44,5 @@ django-ses
 django-storages
 django-threaded-multihost
 django-sekizai<0.7
-git+git://github.com/benjaoming/django-wiki.git@97f8413
+git+git://github.com/benjaoming/django-wiki.git@c145596
 -r repo-requirements.txt