From dd06714353fed961630c51d29061cb64541b45ec Mon Sep 17 00:00:00 2001 From: milde Date: Mon, 20 Apr 2015 14:05:27 +0000 Subject: [PATCH] Safe import of "pygments": syntax errors with Py 3.1 and 3.2. git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@7884 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/docutils/utils/code_analyzer.py | 2 +- docutils/docutils/writers/odf_odt/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docutils/docutils/utils/code_analyzer.py b/docutils/docutils/utils/code_analyzer.py index 18c2c1ecf..5df203e54 100644 --- a/docutils/docutils/utils/code_analyzer.py +++ b/docutils/docutils/utils/code_analyzer.py @@ -13,7 +13,7 @@ try: from pygments.lexers import get_lexer_by_name from pygments.formatters.html import _get_ttype_class with_pygments = True -except ImportError: +except (ImportError, SyntaxError): # pygments 2.0.1 fails with Py 3.1 and 3.2 with_pygments = False # Filter the following token types from the list of class arguments: diff --git a/docutils/docutils/writers/odf_odt/__init__.py b/docutils/docutils/writers/odf_odt/__init__.py index eba6361d1..1222f4b5d 100644 --- a/docutils/docutils/writers/odf_odt/__init__.py +++ b/docutils/docutils/writers/odf_odt/__init__.py @@ -58,7 +58,7 @@ try: import pygments.lexers from pygmentsformatter import OdtPygmentsProgFormatter, \ OdtPygmentsLaTeXFormatter -except ImportError, exp: +except (ImportError, SyntaxError), exp: pygments = None # check for the Python Imaging Library -- 2.11.4.GIT