From ccea2e65881ea4c8105feed2ce17a56404b27dbf Mon Sep 17 00:00:00 2001
From: Andre D <andre@andred.ca>
Date: Wed, 5 Jun 2013 09:40:06 -0700
Subject: [PATCH] markdown: Use explicit renderer names.

---
 r2/r2/lib/filters.py             | 4 ++--
 r2/r2/lib/pages/wiki.py          | 6 +++---
 r2/r2/lib/validator/validator.py | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/r2/r2/lib/filters.py b/r2/r2/lib/filters.py
index 5107cefea..3f5b64efb 100644
--- a/r2/r2/lib/filters.py
+++ b/r2/r2/lib/filters.py
@@ -197,11 +197,11 @@ markdown_xhtml_dtd_path = os.path.join(
 
 markdown_dtd = '<!DOCTYPE div- SYSTEM "file://%s">' % markdown_xhtml_dtd_path
 
-def markdown_souptest(text, nofollow=False, target=None, renderer=None):
+def markdown_souptest(text, nofollow=False, target=None, renderer='reddit'):
     if not text:
         return text
     
-    if not renderer or renderer == 'reddit':
+    if renderer == 'reddit':
         smd = safemarkdown(text, nofollow=nofollow, target=target)
     elif renderer == 'wiki':
         smd = wikimarkdown(text)
diff --git a/r2/r2/lib/pages/wiki.py b/r2/r2/lib/pages/wiki.py
index f5438aeab..fc05fe404 100644
--- a/r2/r2/lib/pages/wiki.py
+++ b/r2/r2/lib/pages/wiki.py
@@ -30,9 +30,9 @@ from pylons.i18n import _
 
 class WikiView(Templated):
     def __init__(self, content, edit_by, edit_date, may_revise=False,
-                 page=None, diff=None, renderer=None):
+                 page=None, diff=None, renderer='wiki'):
         self.page_content_md = content
-        if not renderer or renderer == 'wiki':
+        if renderer == 'wiki':
             self.page_content = wikimarkdown(content)
         elif renderer == 'reddit':
             self.page_content = safemarkdown(content)
@@ -141,7 +141,7 @@ class WikiBasePage(Reddit):
                         **context)
 
 class WikiPageView(WikiBasePage):
-    def __init__(self, content, page, diff=None, renderer=None, **context):
+    def __init__(self, content, page, diff=None, renderer='wiki', **context):
         may_revise = context.get('may_revise')
         if not content and not context.get('alert'):
             if may_revise:
diff --git a/r2/r2/lib/validator/validator.py b/r2/r2/lib/validator/validator.py
index bb6fefb41..8c5776407 100644
--- a/r2/r2/lib/validator/validator.py
+++ b/r2/r2/lib/validator/validator.py
@@ -571,7 +571,7 @@ class VTitle(VLength):
         }
 
 class VMarkdown(VLength):
-    def __init__(self, param, max_length = 10000, renderer=None, **kw):
+    def __init__(self, param, max_length = 10000, renderer='reddit', **kw):
         VLength.__init__(self, param, max_length, **kw)
         self.renderer = renderer