From 7bb30a96ac75929f3adc471667df7f9372dc6a85 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Wed, 20 Nov 2013 13:32:21 -0500 Subject: [PATCH] Extract FencedBlockPreprocessor.format_fence(). (imported from commit 8a35de7df9ad956496263c82668b118910edd6b3) --- zerver/lib/bugdown/fenced_code.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zerver/lib/bugdown/fenced_code.py b/zerver/lib/bugdown/fenced_code.py index 13d7e4d873..db9c688bf3 100644 --- a/zerver/lib/bugdown/fenced_code.py +++ b/zerver/lib/bugdown/fenced_code.py @@ -136,21 +136,21 @@ class FencedBlockPreprocessor(markdown.preprocessors.Preprocessor): quoted_paragraphs.append("\n".join("> " + line for line in lines if line != '')) return "\n\n".join(quoted_paragraphs) - def process_fence(self, m, text): + def format_fence(self, m): langclass = '' if m.group('lang'): langclass = LANG_TAG % m.group('lang') - if m.group('lang') in ('quote', 'quoted'): - replacement = self.format_quote(m.group('code')) - - return '%s\n%s\n%s'% (text[:m.start()], replacement, text[m.end():]) + return replacement code = self.format_code(langclass, m.group('lang'), m.group('code')) - placeholder = self.markdown.htmlStash.store(code, safe=True) - return '%s\n%s\n%s'% (text[:m.start()], placeholder, text[m.end():]) + return placeholder + + def process_fence(self, m, text): + fence_text = self.format_fence(m) + return '%s\n%s\n%s'% (text[:m.start()], fence_text, text[m.end():]) def run(self, lines): """ Match and store Fenced Code Blocks in the HtmlStash. """