- get the pygments install to be easily switched on/off

- fix test_exceptions to always call non-pygments tests
- update test for py3k transition

1 files changed, 12 insertions, 2 deletions

diff --git a/mako/exceptions.py b/mako/exceptions.py
index fb9b3e6..583f874 100644
--- a/mako/exceptions.py
+++ b/mako/exceptions.py
@@ -235,15 +235,25 @@ ${tback.errorname}: ${tback.message}
 """)
 
 
-try:
+def _install_pygments():
+    global syntax_highlight, pygments_html_formatter
     from mako.ext.pygmentplugin import syntax_highlight,\
             pygments_html_formatter
-except ImportError:
+
+def _install_fallback():
+    global syntax_highlight, pygments_html_formatter
     from mako.filters import html_escape
     pygments_html_formatter = None
     def syntax_highlight(filename='', language=None):
         return html_escape
 
+def _install_highlighting():
+    try:
+        _install_pygments()
+    except ImportError:
+        _install_fallback()
+_install_highlighting()
+
 def html_error_template():
     """Provides a template that renders a stack trace in an HTML format,
     providing an excerpt of code as well as substituting source template