Use Markdown 2.5

README.md

@@ -119,7 +119,7 @@ So far the dependencies are:
 
  * [django=>1.4](http://www.djangoproject.com)
  * [django-south](http://south.aeracode.org/)
- * [Markdown>=2.2.0](https://github.com/waylan/Python-Markdown)
+ * [Markdown>=2.5.0](https://github.com/waylan/Python-Markdown)
  * [django-mptt>=0.5](https://github.com/django-mptt/django-mptt)
  * [django-sekizai](https://github.com/ojii/django-sekizai/)
  * [sorl-thumbnail](https://github.com/sorl/sorl-thumbnail)

requirements.txt

 django>=1.4
 South<0.8
-Markdown<2.3.0
+Markdown>=2.5.0,<2.6.0
 django-sekizai<0.7
 django-mptt>=0.5.3
 sorl-thumbnail

wiki/plugins/links/mdx/djangowikilinks.py

@@ -31,20 +31,13 @@ except ImportError:
     from markdown import etree #@UnresolvedImport @Reimport
 
 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.'],
-                        'live_lookups' : [True, 'If the plugin should try and match links to real articles'],
-                        'default_level' : [2, 'The level that most articles are created at. Relative links will tend to start at that level.']
+    config = {
+        'base_url': ['/', 'String to append to beginning of URL.'],
+        'html_class': ['wikipath', 'CSS hook. Leave blank for none.'],
+        'live_lookups': [True, 'If the plugin should try and match links to real articles'],
+        'default_level': [2, 'The level that most articles are created at. Relative links will tend to start at that level.'],
     }
 
-        # 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
 
@@ -130,9 +123,6 @@ class WikiPath(markdown.inlinepatterns.Pattern):
                 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()

wiki/plugins/links/mdx/urlize.py

@@ -94,9 +94,6 @@ class UrlizeExtension(markdown.Extension):
         """ Replace autolink with UrlizePattern """
         md.inlinePatterns['autolink'] = UrlizePattern(URLIZE_RE, md)
 
-def makeExtension(configs=None):
-    return UrlizeExtension(configs=configs)
-
 if __name__ == "__main__":
     import doctest
     doctest.testmod()

wiki/plugins/links/wiki_plugin.py

@@ -6,7 +6,7 @@ from wiki.conf import settings
 from wiki.core.plugins import registry
 from wiki.core.plugins.base import BasePlugin
 from wiki.plugins.links import views
-from wiki.plugins.links.mdx.urlize import makeExtension
+from wiki.plugins.links.mdx.urlize import UrlizeExtension
 from wiki.plugins.links.mdx.djangowikilinks import WikiPathExtension
 from django.core.urlresolvers import reverse_lazy
 
@@ -23,13 +23,13 @@ class LinkPlugin(BasePlugin):
                'form_class': None,
                'get_form_kwargs': (lambda a: {})}
 
-    wikipath_config = [
-        ('base_url', reverse_lazy('wiki:get', kwargs={'path': ''}) ),
-        ('live_lookups', settings.LINK_LIVE_LOOKUPS ),
-        ('default_level', settings.LINK_DEFAULT_LEVEL ),
-        ]
+    wikipath_ext = WikiPathExtension(
+        base_url=reverse_lazy('wiki:get', kwargs={'path': ''}),
+        live_lookups=settings.LINK_LIVE_LOOKUPS,
+        default_level=settings.LINK_DEFAULT_LEVEL,
+    )
 
-    markdown_extensions = [makeExtension(), WikiPathExtension(wikipath_config)]
+    markdown_extensions = [UrlizeExtension(), wikipath_ext]
 
     def __init__(self):
         pass