コミット: c04d3ff65f34f66c937b1ef8e046c5200bce72da - allura (git)

allura

コミットメタ情報

• リビジョン: c04d3ff65f34f66c937b1ef8e046c5200bce72da (tree)
• 日時: 2010-06-22 01:13:45
• 作者: Rick Copeland <rcopeland@geek...>
• コミッター: Rick Copeland

ログメッセージ

[#616] - Quit auto-linking WikiWords

変更サマリ

• modified: pyforge/pyforge/lib/app_globals.py
• modified: pyforge/pyforge/tests/test_globals.py

差分

--- a/pyforge/pyforge/lib/app_globals.py
+++ b/pyforge/pyforge/lib/app_globals.py
@@ -69,10 +69,7 @@ class Globals(object):
             extensions=['codehilite', ForgeExtension(), 'tables'],
             output_format='html4',
             safe_mode='escape')
-        self.markdown_wiki = markdown.Markdown(
-            extensions=['codehilite', ForgeExtension(wiki=True), 'tables'],
-            output_format='html4',
-            safe_mode='escape')
+        self.markdown_wiki = self.markdown # [#616]
         # self.markdown.stripTopLevelTags = self.markdown_wiki.stripTopLevelTags=False
 
         # Setup OEmbed

--- a/pyforge/pyforge/tests/test_globals.py
+++ b/pyforge/pyforge/tests/test_globals.py
@@ -30,8 +30,8 @@ def test_markdown():
     assert '<a href=' in g.markdown.convert('# Foo!\n[Root]')
     assert '<a href=' not in g.markdown.convert('# Foo!\n[Rooted]')
     assert '<a href=' in g.markdown.convert('This is http://sf.net')
-    assert '<a href=' in g.markdown_wiki.convert('This is a WikiPage')
-    assert '<a href=' not in g.markdown_wiki.convert('This is a WIKIPAGE')
+    # assert '<a href=' in g.markdown_wiki.convert('This is a WikiPage')
+    # assert '<a href=' not in g.markdown_wiki.convert('This is a WIKIPAGE')
     assert '<br' in g.markdown.convert('Multi\nLine'), g.markdown.convert('Multi\nLine')
     assert '<br' not in g.markdown.convert('Multi\n\nLine')
     r = g.markdown.convert('[[projects]]')