From 6bc25d3d7b84abdf1ccba56741fe8a546f562940 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Wed, 20 Nov 2013 13:37:02 -0500 Subject: [PATCH] DRY up m.group('lang') in FencedBlockPreprocessor. (imported from commit 9f9ab5604b7df711a3a369247def1277880b0b5f) --- zerver/lib/bugdown/fenced_code.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/zerver/lib/bugdown/fenced_code.py b/zerver/lib/bugdown/fenced_code.py index db9c688bf3..6b3f77017d 100644 --- a/zerver/lib/bugdown/fenced_code.py +++ b/zerver/lib/bugdown/fenced_code.py @@ -136,20 +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 format_fence(self, m): + def format_fence(self, m, lang): langclass = '' - if m.group('lang'): - langclass = LANG_TAG % m.group('lang') - if m.group('lang') in ('quote', 'quoted'): + if lang: + langclass = LANG_TAG % (lang,) + if lang in ('quote', 'quoted'): replacement = self.format_quote(m.group('code')) return replacement - code = self.format_code(langclass, m.group('lang'), m.group('code')) + code = self.format_code(langclass, lang, m.group('code')) placeholder = self.markdown.htmlStash.store(code, safe=True) return placeholder def process_fence(self, m, text): - fence_text = self.format_fence(m) + lang = m.group('lang') + fence_text = self.format_fence(m, lang) return '%s\n%s\n%s'% (text[:m.start()], fence_text, text[m.end():]) def run(self, lines):