Commit 0fed8aa8 by Bridger Maxwell

Merge

parents 238ed768 f840e241
#!/usr/bin/env python #!/usr/bin/env python
print "Hello"
''' '''
WikiLink Extention for Python-Markdown WikiLink Extention for Python-Markdown
====================================== ======================================
......
...@@ -30,7 +30,6 @@ class CircuitExtension(markdown.Extension): ...@@ -30,7 +30,6 @@ class CircuitExtension(markdown.Extension):
md.inlinePatterns.add(name, pattern, "<reference") md.inlinePatterns.add(name, pattern, "<reference")
def extendMarkdown(self, md, md_globals): def extendMarkdown(self, md, md_globals):
print "Here"
self.add_inline(md, 'circuit', CircuitLink, r'^circuit:(?P<name>[a-zA-Z0-9]*)$') self.add_inline(md, 'circuit', CircuitLink, r'^circuit:(?P<name>[a-zA-Z0-9]*)$')
class CircuitLink(markdown.inlinepatterns.Pattern): class CircuitLink(markdown.inlinepatterns.Pattern):
...@@ -43,5 +42,4 @@ class CircuitLink(markdown.inlinepatterns.Pattern): ...@@ -43,5 +42,4 @@ class CircuitLink(markdown.inlinepatterns.Pattern):
def makeExtension(configs=None) : def makeExtension(configs=None) :
print "Here"
return CircuitExtension(configs=configs) return CircuitExtension(configs=configs)
...@@ -247,7 +247,6 @@ class Revision(models.Model): ...@@ -247,7 +247,6 @@ class Revision(models.Model):
# Create pre-parsed contents - no need to parse on-the-fly # Create pre-parsed contents - no need to parse on-the-fly
ext = WIKI_MARKDOWN_EXTENSIONS ext = WIKI_MARKDOWN_EXTENSIONS
print "Waka", WIKI_MARKDOWN_EXTENSIONS
ext += ["wikilinks(base_url=%s/)" % reverse('wiki_view', args=('',))] ext += ["wikilinks(base_url=%s/)" % reverse('wiki_view', args=('',))]
self.contents_parsed = markdown(self.contents, self.contents_parsed = markdown(self.contents,
extensions=ext, extensions=ext,
......
...@@ -94,7 +94,6 @@ WIKI_MARKDOWN_EXTENSIONS = getattr(settings, 'SIMPLE_WIKI_MARKDOWN_EXTENSIONS', ...@@ -94,7 +94,6 @@ WIKI_MARKDOWN_EXTENSIONS = getattr(settings, 'SIMPLE_WIKI_MARKDOWN_EXTENSIONS',
'circuit' 'circuit'
]) ])
print WIKI_MARKDOWN_EXTENSIONS
WIKI_IMAGE_EXTENSIONS = getattr(settings, WIKI_IMAGE_EXTENSIONS = getattr(settings,
'SIMPLE_WIKI_IMAGE_EXTENSIONS', 'SIMPLE_WIKI_IMAGE_EXTENSIONS',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment