From 148451c7747b380208938b45238c6f3536efd2bf Mon Sep 17 00:00:00 2001 From: mathieui Date: Sun, 7 Dec 2014 22:44:56 +0100 Subject: =?UTF-8?q?Fix=20the=20xml=20tab=20when=20pygments=20isn=E2=80=99t?= =?UTF-8?q?=20present?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/handlers.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/core/handlers.py b/src/core/handlers.py index e0c89abf..9ce50d42 100644 --- a/src/core/handlers.py +++ b/src/core/handlers.py @@ -44,11 +44,9 @@ try: from pygments.formatters import HtmlFormatter LEXER = get_lexer_by_name('xml') FORMATTER = HtmlFormatter(noclasses=True) + PYGMENTS = True except ImportError: - def highlight(text, *args, **kwargs): - return text - LEXER = None - FORMATTER = None + PYGMENTS = False def on_session_start_features(self, _): """ @@ -1117,8 +1115,11 @@ def outgoing_stanza(self, stanza): We are sending a new stanza, write it in the xml buffer if needed. """ if self.xml_tab: - xhtml_text = highlight('%s' % stanza, LEXER, FORMATTER) - poezio_colored = xhtml.xhtml_to_poezio_colors(xhtml_text, force=True) + if PYGMENTS: + xhtml_text = highlight('%s' % stanza, LEXER, FORMATTER) + poezio_colored = xhtml.xhtml_to_poezio_colors(xhtml_text, force=True) + else: + poezio_colored = '%s' % stanza self.add_message_to_text_buffer(self.xml_buffer, poezio_colored, nickname=get_theme().CHAR_XML_OUT) try: @@ -1137,8 +1138,11 @@ def incoming_stanza(self, stanza): We are receiving a new stanza, write it in the xml buffer if needed. """ if self.xml_tab: - xhtml_text = highlight('%s' % stanza, LEXER, FORMATTER) - poezio_colored = xhtml.xhtml_to_poezio_colors(xhtml_text, force=True) + if PYGMENTS: + xhtml_text = highlight('%s' % stanza, LEXER, FORMATTER) + poezio_colored = xhtml.xhtml_to_poezio_colors(xhtml_text, force=True) + else: + poezio_colored = '%s' % stanza self.add_message_to_text_buffer(self.xml_buffer, poezio_colored, nickname=get_theme().CHAR_XML_IN) try: -- cgit v1.2.3