From 36bc7ba5b5d25cea881db22fb1a5bc2bc5fbc3e4 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Tue, 27 Jan 2015 10:13:10 -0600 Subject: [PATCH] Handle guess_lexer exceptions in pygments reST directive --- CHANGES | 4 ++++ VERSION | 2 +- doc/ext/rst_directive.py | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index a50dc265cc..1b084c7f19 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.3-397 | 2015-01-27 10:13:10 -0600 + + * Handle guess_lexer exceptions in pygments reST directive (Jon Siwek) + 2.3-396 | 2015-01-23 10:49:15 -0600 * DNP3: fix reachable assertion and buffer over-read/overflow. diff --git a/VERSION b/VERSION index 081c98cc51..9a536ef2e7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-396 +2.3-397 diff --git a/doc/ext/rst_directive.py b/doc/ext/rst_directive.py index 434eef2c61..43c95abc52 100644 --- a/doc/ext/rst_directive.py +++ b/doc/ext/rst_directive.py @@ -135,7 +135,10 @@ class Pygments(Directive): # lexer not found, use default. lexer = TextLexer() else: - lexer = guess_lexer(content) + try: + lexer = guess_lexer(content) + except: + lexer = TextLexer() # import sys # print >>sys.stderr, self.arguments, lexer.__class__