From 3af46e7edbb4ae425df2c2f3b217ab6233ae3a6f Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 9 Dec 2013 15:12:59 +0000 Subject: [PATCH 1/3] filters.py: fix "TypeError: format requires a mapping" Signed-off-by: Wei Liu --- june/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/june/filters.py b/june/filters.py index ac12b08..0db2436 100644 --- a/june/filters.py +++ b/june/filters.py @@ -69,7 +69,7 @@ def gist(link, content=None): match = re.match(pattern, link) if not match: return None - html = '' % match.group(1) + html = '' % { 'link' : match.group(1) } if not content: return html return '
%s
%s
' % ( From 3beb3bedc3148b44c6f731be290246f648c49bc7 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 9 Dec 2013 15:14:16 +0000 Subject: [PATCH 2/3] front.py: import markdown from the right file Per 0962e34e8 (Move everything into filters) markdown funciton is moved to new location. Signed-off-by: Wei Liu --- june/handlers/front.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/june/handlers/front.py b/june/handlers/front.py index 8915ff0..e1572e3 100644 --- a/june/handlers/front.py +++ b/june/handlers/front.py @@ -5,7 +5,7 @@ import datetime from flask import Blueprint, request, g, current_app from flask import render_template, Response, jsonify -from ..utils.markdown import markdown +from ..filters import markdown from ..utils.user import require_user from ..models import Node, Topic, fill_topics, cache From 5ed13e8c7e973f495c9692011b6acdacfbec1726 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Mon, 9 Dec 2013 15:15:46 +0000 Subject: [PATCH 3/3] tests: import markdown from right file This should fix travis failure. Signed-off-by: Wei Liu --- tests/test_markdown.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_markdown.py b/tests/test_markdown.py index 4252d07..525925c 100644 --- a/tests/test_markdown.py +++ b/tests/test_markdown.py @@ -1,4 +1,4 @@ -from june.utils.markdown import markdown +from june.filters import markdown def test_none():