From a694d1034ee6ec9ba177bc66fd4296b71e125587 Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridgeyman@gmail.com>
Date: Wed, 22 Aug 2012 15:57:44 -0400
Subject: [PATCH] We use django-wiki's built-in wikilinks markdown extension.
 They were clashing.

---
 .../plugins/markdownedx/mdx_wikipath.py       | 92 -------------------
 .../plugins/markdownedx/wiki_plugin.py        |  7 +-
 lms/envs/common.py                            |  1 +
 repo-requirements.txt                         |  2 +-
 4 files changed, 4 insertions(+), 98 deletions(-)
 delete mode 100755 lms/djangoapps/course_wiki/plugins/markdownedx/mdx_wikipath.py

diff --git a/lms/djangoapps/course_wiki/plugins/markdownedx/mdx_wikipath.py b/lms/djangoapps/course_wiki/plugins/markdownedx/mdx_wikipath.py
deleted file mode 100755
index 4c6f6fadd7..0000000000
--- a/lms/djangoapps/course_wiki/plugins/markdownedx/mdx_wikipath.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env python
-
-'''
-Wikipath Extension for Python-Markdown
-======================================
-
-Converts [Link Name](wiki:ArticleName) to relative links pointing to article.  Requires Python-Markdown 2.0+
-
-Basic usage:
-
-    >>> import markdown
-    >>> text = "Some text with a [Link Name](wiki:ArticleName)."
-    >>> html = markdown.markdown(text, ['wikipath(base_url="/wiki/view/")'])
-    >>> html
-    u'<p>Some text with a <a class="wikipath" href="/wiki/view/ArticleName/">Link Name</a>.</p>'
-
-Dependencies:
-* [Python 2.3+](http://python.org)
-* [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
-'''
-
-
-import markdown
-try:
-    # Markdown 2.1.0 changed from 2.0.3. We try importing the new version first,
-    # but import the 2.0.3 version if it fails
-    from markdown.util import etree
-except:
-    from markdown import etree
-
-
-class WikiPathExtension(markdown.Extension):
-    def __init__(self, configs):
-        # set extension defaults
-        self.config = {
-                        'base_url' : ['/', 'String to append to beginning of URL.'],
-                        'html_class' : ['wikipath', 'CSS hook. Leave blank for none.']
-        }
-        
-        # Override defaults with user settings
-        for key, value in configs :
-            # self.config[key][0] = value
-            self.setConfig(key, value)
-                
-                
-    def extendMarkdown(self, md, md_globals):
-        self.md = md
-        
-        # append to end of inline patterns
-        WIKI_RE =  r'\[(?P<linkTitle>.+?)\]\(wiki:(?P<wikiTitle>[a-zA-Z\d/_-]*)\)'
-        wikiPathPattern = WikiPath(WIKI_RE, self.config)
-        wikiPathPattern.md = md
-        md.inlinePatterns.add('wikipath', wikiPathPattern, "<reference")
-
-class WikiPath(markdown.inlinepatterns.Pattern):
-    def __init__(self, pattern, config):
-        markdown.inlinepatterns.Pattern.__init__(self, pattern)
-        self.config = config
-    
-    def handleMatch(self, m) :
-        article_title = m.group('wikiTitle')
-        if article_title.startswith("/"):
-            article_title = article_title[1:]
-        
-        url = self.config['base_url'][0] + article_title
-        label = m.group('linkTitle')
-        a = etree.Element('a')
-        a.set('href', url)
-        a.text = label
-        
-        if self.config['html_class'][0]:
-            a.set('class', self.config['html_class'][0])
-            
-        return a
-        
-    def _getMeta(self):
-        """ Return meta data or config data. """
-        base_url = self.config['base_url'][0]
-        html_class = self.config['html_class'][0]
-        if hasattr(self.md, 'Meta'):
-            if self.md.Meta.has_key('wiki_base_url'):
-                base_url = self.md.Meta['wiki_base_url'][0]
-            if self.md.Meta.has_key('wiki_html_class'):
-                html_class = self.md.Meta['wiki_html_class'][0]
-        return base_url, html_class
-
-def makeExtension(configs=None) :
-    return WikiPathExtension(configs=configs)
-
-if __name__ == "__main__":
-    import doctest
-    doctest.testmod()
diff --git a/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py b/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py
index cae7b0bfb4..ffbe7b0a52 100644
--- a/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py
+++ b/lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py
@@ -5,18 +5,15 @@ from django.core.urlresolvers import reverse_lazy
 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
+from course_wiki.plugins.markdownedx import mdx_circuit, mdx_mathjax, mdx_video
 
 class ExtendMarkdownPlugin(BasePlugin):
     """
     This plugin simply loads all of the markdown extensions we use in edX.
     """
-    
-    wiki_base_url = reverse_lazy("wiki:get", kwargs={'path' : ""})
-    
+        
     markdown_extensions = [mdx_circuit.CircuitExtension(configs={}),
                            #mdx_image.ImageExtension() , #This one doesn't work. Tries to import simplewiki.settings
-                           mdx_wikipath.WikiPathExtension(configs={'base_url' : wiki_base_url}.iteritems() ) ,
                            mdx_mathjax.MathJaxExtension(configs={}) ,
                            mdx_video.VideoExtension(configs={})]
 
diff --git a/lms/envs/common.py b/lms/envs/common.py
index c99423c7a1..e016d4a859 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -585,6 +585,7 @@ INSTALLED_APPS = (
     'mptt',
     'sekizai',
     #'wiki.plugins.attachments',
+    'wiki.plugins.links',
     'wiki.plugins.notifications',
     'course_wiki.plugins.markdownedx',
 
diff --git a/repo-requirements.txt b/repo-requirements.txt
index fcfb063077..82c0b06b34 100644
--- a/repo-requirements.txt
+++ b/repo-requirements.txt
@@ -1,6 +1,6 @@
 -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
 -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
--e git://github.com/benjaoming/django-wiki.git@63003aa#egg=django-wiki
+-e git://github.com/benjaoming/django-wiki.git@3576a2d#egg=django-wiki
 -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
 -e common/lib/capa
 -e common/lib/xmodule