Return-Path: X-Original-To: apmail-allura-commits-archive@www.apache.org Delivered-To: apmail-allura-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 41B14188CD for ; Wed, 6 Jan 2016 17:06:26 +0000 (UTC) Received: (qmail 61769 invoked by uid 500); 6 Jan 2016 17:06:26 -0000 Delivered-To: apmail-allura-commits-archive@allura.apache.org Received: (qmail 61744 invoked by uid 500); 6 Jan 2016 17:06:26 -0000 Mailing-List: contact commits-help@allura.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@allura.apache.org Delivered-To: mailing list commits@allura.apache.org Received: (qmail 61695 invoked by uid 99); 6 Jan 2016 17:06:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jan 2016 17:06:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DDB03E0F5A; Wed, 6 Jan 2016 17:06:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brondsem@apache.org To: commits@allura.apache.org Date: Wed, 06 Jan 2016 17:06:26 -0000 Message-Id: <73ec02c463334d3094a6c0a73dafaa07@git.apache.org> In-Reply-To: <5864e82ee69445e3ba179a7fc3cd2e3b@git.apache.org> References: <5864e82ee69445e3ba179a7fc3cd2e3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] allura git commit: [#7987] ticket:882 uset FencedCodeProcessor for fence code [#7987] ticket:882 uset FencedCodeProcessor for fence code Project: http://git-wip-us.apache.org/repos/asf/allura/repo Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/b8712c0c Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b8712c0c Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b8712c0c Branch: refs/heads/master Commit: b8712c0c0fe237bf2d3841630e557efb57868c75 Parents: 19c532f Author: Denis Kotov Authored: Fri Dec 25 21:22:34 2015 +0200 Committer: Dave Brondsema Committed: Wed Jan 6 12:06:03 2016 -0500 ---------------------------------------------------------------------- Allura/allura/lib/markdown_extensions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/allura/blob/b8712c0c/Allura/allura/lib/markdown_extensions.py ---------------------------------------------------------------------- diff --git a/Allura/allura/lib/markdown_extensions.py b/Allura/allura/lib/markdown_extensions.py index cbccf5d..016c5e4 100644 --- a/Allura/allura/lib/markdown_extensions.py +++ b/Allura/allura/lib/markdown_extensions.py @@ -21,6 +21,7 @@ from urlparse import urljoin from tg import config from bs4 import BeautifulSoup +from markdown.extensions.fenced_code import FencedBlockPreprocessor import html5lib import html5lib.serializer import html5lib.filters.alphabeticalattributes @@ -248,7 +249,7 @@ class ForgeExtension(markdown.Extension): # allow markdown within e.g.
...
More info at: # https://github.com/waylan/Python-Markdown/issues/52 md.preprocessors['html_block'].markdown_in_raw = True - md.preprocessors['fenced-code'] = FencedCodeProcessor() + md.preprocessors['fenced-code'] = FencedBlockPreprocessor(md) md.preprocessors.add('plain_text_block', PlainTextPreprocessor(md), "_begin") md.preprocessors.add('macro_include', ForgeMacroIncludePreprocessor(md), '_end') # this has to be before the 'escape' processor, otherwise weird