[Python-checkins] r61612 - doctools/trunk/sphinx/highlighting.py

Wed Mar 19 08:45:14 CET 2008

Author: georg.brandl
Date: Wed Mar 19 08:45:14 2008
New Revision: 61612
Modified:
 doctools/trunk/sphinx/highlighting.py
Log:
Ignore MemoryError while parsing Python source with Python 2.4
(it's raised for invalid coding cookies).
Modified: doctools/trunk/sphinx/highlighting.py
==============================================================================

--- doctools/trunk/sphinx/highlighting.py	(original)
+++ doctools/trunk/sphinx/highlighting.py	Wed Mar 19 08:45:14 2008
@@ -66,6 +66,13 @@
 replace('\x02', '@rb[]')
 
 
+parsing_exceptions = (SyntaxError, UnicodeEncodeError)
+if sys.version_info < (2, 5):
+ # Python <= 2.4 raises MemoryError when parsing an
+ # invalid encoding cookie
+ parsing_exceptions += MemoryError,
+
+
 class PygmentsBridge(object):
 def __init__(self, dest='html', stylename='sphinx'):
 self.dest = dest
@@ -112,7 +119,7 @@
 
 try:
 parser.suite(src)
- except (SyntaxError, UnicodeEncodeError):
+ except parsing_exceptions:
 return unhighlighted()
 else:
 lexer = lexers['python']
