diff options
| author | Matthäus G. Chajdas <dev@anteru.net> | 2022-12-04 16:20:15 +0100 |
|---|---|---|
| committer | Matthäus G. Chajdas <dev@anteru.net> | 2022-12-04 16:20:15 +0100 |
| commit | cdfa8e0ad46c1f5c3d05276ba7130aeb1bfcde35 (patch) | |
| tree | b41f5154c16f332d353f0bc7e7c0a21ea278aa41 | |
| parent | 3f9eb7ac4423eeb7d102c08189381d24d119aea7 (diff) | |
| download | pygments-git-cdfa8e0ad46c1f5c3d05276ba7130aeb1bfcde35.tar.gz | |
Improve whitespace handling in PythonTracebackLexer.
| -rw-r--r-- | pygments/lexers/python.py | 16 | ||||
| -rw-r--r-- | tests/examplefiles/pycon/pycon_ctrlc_traceback.output | 64 | ||||
| -rw-r--r-- | tests/examplefiles/pycon/pycon_test.pycon.output | 22 | ||||
| -rw-r--r-- | tests/examplefiles/pytb/database.pytb.output | 44 | ||||
| -rw-r--r-- | tests/examplefiles/pytb/error_locations.pytb.output | 52 | ||||
| -rw-r--r-- | tests/examplefiles/pytb/py3tb_test.py3tb.output | 12 | ||||
| -rw-r--r-- | tests/examplefiles/pytb/pytb_test2.pytb.output | 4 | ||||
| -rw-r--r-- | tests/examplefiles/pytb/pytb_test3.pytb.output | 8 | ||||
| -rw-r--r-- | tests/examplefiles/pytb/syntax_error.py2tb.output | 12 | ||||
| -rw-r--r-- | tests/examplefiles/pytb/syntax_error.pytb.output | 12 | ||||
| -rw-r--r-- | tests/examplefiles/pytb/syntax_error_caret_code.py2tb.output | 10 | ||||
| -rw-r--r-- | tests/examplefiles/pytb/syntax_error_caret_code.pytb.output | 10 | ||||
| -rw-r--r-- | tests/examplefiles/pytb/truncated.pytb.output | 44 |
13 files changed, 155 insertions, 155 deletions
diff --git a/pygments/lexers/python.py b/pygments/lexers/python.py index b959525a..64f260d1 100644 --- a/pygments/lexers/python.py +++ b/pygments/lexers/python.py @@ -15,7 +15,7 @@ from pygments.lexer import Lexer, RegexLexer, include, bygroups, using, \ default, words, combined, do_insertions, this, line_re from pygments.util import get_bool_opt, shebang_matches from pygments.token import Text, Comment, Operator, Keyword, Name, String, \ - Number, Punctuation, Generic, Other, Error + Number, Punctuation, Generic, Other, Error, Whitespace from pygments import unistring as uni __all__ = ['PythonLexer', 'PythonConsoleLexer', 'PythonTracebackLexer', @@ -753,24 +753,24 @@ class PythonTracebackLexer(RegexLexer): ], 'intb': [ (r'^( File )("[^"]+")(, line )(\d+)(, in )(.+)(\n)', - bygroups(Text, Name.Builtin, Text, Number, Text, Name, Text)), + bygroups(Text, Name.Builtin, Text, Number, Text, Name, Whitespace)), (r'^( File )("[^"]+")(, line )(\d+)(\n)', - bygroups(Text, Name.Builtin, Text, Number, Text)), + bygroups(Text, Name.Builtin, Text, Number, Whitespace)), (r'^( )(.+)(\n)', - bygroups(Text, using(PythonLexer), Text), 'markers'), + bygroups(Whitespace, using(PythonLexer), Whitespace), 'markers'), (r'^([ \t]*)(\.\.\.)(\n)', - bygroups(Text, Comment, Text)), # for doctests... + bygroups(Whitespace, Comment, Whitespace)), # for doctests... (r'^([^:]+)(: )(.+)(\n)', - bygroups(Generic.Error, Text, Name, Text), '#pop'), + bygroups(Generic.Error, Text, Name, Whitespace), '#pop'), (r'^([a-zA-Z_][\w.]*)(:?\n)', - bygroups(Generic.Error, Text), '#pop') + bygroups(Generic.Error, Whitespace), '#pop') ], 'markers': [ # Either `PEP 657 <https://www.python.org/dev/peps/pep-0657/>` # error locations in Python 3.11+, or single-caret markers # for syntax errors before that. (r'^( {4,})([~^]+)(\n)', - bygroups(Text, Punctuation.Marker, Text), + bygroups(Whitespace, Punctuation.Marker, Whitespace), '#pop'), default('#pop'), ], diff --git a/tests/examplefiles/pycon/pycon_ctrlc_traceback.output b/tests/examplefiles/pycon/pycon_ctrlc_traceback.output index 2cdae0cf..ce3bf6e3 100644 --- a/tests/examplefiles/pycon/pycon_ctrlc_traceback.output +++ b/tests/examplefiles/pycon/pycon_ctrlc_traceback.output @@ -93,10 +93,10 @@ '5' Literal.Number ', in ' Text '<module>' Name -'\n' Text +'\n' Text.Whitespace 'Exception' Generic.Error -'\n' Text +'\n' Text.Whitespace '>>>\n' Generic.Output @@ -222,12 +222,12 @@ '3' Literal.Number ', in ' Text '<module>' Name -'\n' Text +'\n' Text.Whitespace '__main__.A' Generic.Error ': ' Text 'first' Name -'\n' Text +'\n' Text.Whitespace '\n' Generic.Output @@ -243,12 +243,12 @@ '5' Literal.Number ', in ' Text '<module>' Name -'\n' Text +'\n' Text.Whitespace '__main__.B' Generic.Error ': ' Text 'second' Name -'\n' Text +'\n' Text.Whitespace '\n' Generic.Output @@ -263,22 +263,22 @@ '"<stdin>"' Name.Builtin ', line ' Text '1' Literal.Number -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'x' Name ' ' Text '=' Operator -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace 'SyntaxError' Generic.Error ': ' Text 'invalid syntax' Name -'\n' Text +'\n' Text.Whitespace '>>>\n' Generic.Output @@ -358,7 +358,7 @@ ' .123\nValueError' Generic.Error ': ' Text 'multi' Name -'\n' Text +'\n' Text.Whitespace ' line\n' Generic.Output @@ -383,16 +383,16 @@ 'Traceback (most recent call last):\n' Generic.Traceback -' ' Text +' ' Text.Whitespace '.' Operator '.' Operator '.' Operator -'\n' Text +'\n' Text.Whitespace 'ValueError' Generic.Error ': ' Text 'multi' Name -'\n' Text +'\n' Text.Whitespace ' line\n' Generic.Output @@ -417,17 +417,17 @@ 'Traceback (most recent call last):\n' Generic.Traceback -' ' Text +' ' Text.Whitespace '.' Operator '.' Operator '.' Operator '.' Operator -'\n' Text +'\n' Text.Whitespace 'ValueError' Generic.Error ': ' Text 'multi' Name -'\n' Text +'\n' Text.Whitespace ' line\n' Generic.Output @@ -452,18 +452,18 @@ 'Traceback (most recent call last):\n' Generic.Traceback -' ' Text +' ' Text.Whitespace ' ' Text '.' Operator '.' Operator '.' Operator '.' Operator -'\n' Text +'\n' Text.Whitespace 'ValueError' Generic.Error ': ' Text 'multi' Name -'\n' Text +'\n' Text.Whitespace ' line\n' Generic.Output @@ -488,14 +488,14 @@ 'Traceback (most recent call last):\n' Generic.Traceback -' ' Text +' ' Text.Whitespace '...' Comment -'\n' Text +'\n' Text.Whitespace 'ValueError' Generic.Error ': ' Text 'multi' Name -'\n' Text +'\n' Text.Whitespace ' line\n' Generic.Output @@ -517,10 +517,10 @@ '1' Literal.Number ', in ' Text '<module>' Name -'\n' Text +'\n' Text.Whitespace 'Exception' Generic.Error -'\n' Text +'\n' Text.Whitespace '>>> ' Generic.Prompt 'import' Keyword.Namespace @@ -544,7 +544,7 @@ '1' Literal.Number ', in ' Text '<module>' Name -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/path/to/stuff/somemodule/blah.py"' Name.Builtin @@ -552,9 +552,9 @@ '658' Literal.Number ', in ' Text 'blah' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'raise' Keyword ' ' Text 'Exception' Name.Exception @@ -563,9 +563,9 @@ 'Hi.' Literal.String.Single "'" Literal.String.Single ')' Punctuation -'\n' Text +'\n' Text.Whitespace 'Exception' Generic.Error ': ' Text 'Hi.' Name -'\n' Text +'\n' Text.Whitespace diff --git a/tests/examplefiles/pycon/pycon_test.pycon.output b/tests/examplefiles/pycon/pycon_test.pycon.output index 2ab6654b..6fba6318 100644 --- a/tests/examplefiles/pycon/pycon_test.pycon.output +++ b/tests/examplefiles/pycon/pycon_test.pycon.output @@ -7,20 +7,20 @@ '"<stdin>"' Name.Builtin ', line ' Text '1' Literal.Number -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace ':' Punctuation -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace 'SyntaxError' Generic.Error ': ' Text 'invalid syntax' Name -'\n' Text +'\n' Text.Whitespace '>>> ' Generic.Prompt '\n' Text @@ -39,12 +39,12 @@ 'Traceback (most recent call last):\n' Generic.Traceback -' ' Text +' ' Text.Whitespace '...' Comment -'\n' Text +'\n' Text.Whitespace 'ZeroDivisionError' Generic.Error -'\n' Text +'\n' Text.Whitespace '\n' Generic.Output @@ -58,6 +58,6 @@ 'Traceback (most recent call last):\n' Generic.Traceback -' ' Text +' ' Text.Whitespace '...' Comment -'\n' Text +'\n' Text.Whitespace diff --git a/tests/examplefiles/pytb/database.pytb.output b/tests/examplefiles/pytb/database.pytb.output index e9422613..ceaed6a6 100644 --- a/tests/examplefiles/pytb/database.pytb.output +++ b/tests/examplefiles/pytb/database.pytb.output @@ -10,16 +10,16 @@ '314' Literal.Number ', in ' Text 'dispatch_request' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'dispatcher' Name '.' Operator 'dispatch' Name '(' Punctuation 'req' Name ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/web/main.py"' Name.Builtin @@ -27,9 +27,9 @@ '186' Literal.Number ', in ' Text 'dispatch' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'req' Name '.' Operator 'session' Name @@ -45,7 +45,7 @@ ' ' Text 'req' Name ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/web/session.py"' Name.Builtin @@ -53,16 +53,16 @@ '52' Literal.Number ', in ' Text '__init__' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'self' Name.Builtin.Pseudo '.' Operator 'promote_session' Name '(' Punctuation 'sid' Name ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/web/session.py"' Name.Builtin @@ -70,9 +70,9 @@ '125' Literal.Number ', in ' Text 'promote_session' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '"' Literal.String.Double 'AND authenticated=0' Literal.String.Double '"' Literal.String.Double @@ -83,7 +83,7 @@ ',' Punctuation ')' Punctuation ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/db/util.py"' Name.Builtin @@ -91,9 +91,9 @@ '47' Literal.Number ', in ' Text 'execute' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'return' Keyword ' ' Text 'self' Name.Builtin.Pseudo @@ -110,7 +110,7 @@ ' ' Text 'args' Name ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py"' Name.Builtin @@ -118,9 +118,9 @@ '44' Literal.Number ', in ' Text 'execute' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'args' Name ' ' Text 'or' Operator.Word @@ -128,7 +128,7 @@ '[' Punctuation ']' Punctuation ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py"' Name.Builtin @@ -136,9 +136,9 @@ '36' Literal.Number ', in ' Text '_rollback_on_error' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'return' Keyword ' ' Text 'function' Name @@ -154,12 +154,12 @@ '*' Operator 'kwargs' Name ')' Punctuation -'\n' Text +'\n' Text.Whitespace 'OperationalError' Generic.Error ': ' Text 'database is locked' Name -'\n' Text +'\n' Text.Whitespace '\n' Text diff --git a/tests/examplefiles/pytb/error_locations.pytb.output b/tests/examplefiles/pytb/error_locations.pytb.output index 52a5c187..1589d9bf 100644 --- a/tests/examplefiles/pytb/error_locations.pytb.output +++ b/tests/examplefiles/pytb/error_locations.pytb.output @@ -6,17 +6,17 @@ '13' Literal.Number ', in ' Text '<module>' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'in_Python_3_11' Name '(' Punctuation ')' Punctuation -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^^^^^^^^^^^^^^^^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/home/tb.py"' Name.Builtin @@ -24,19 +24,19 @@ '2' Literal.Number ', in ' Text 'in_Python_3_11' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'return' Keyword ' ' Text 'error_locations' Name '(' Punctuation ')' Punctuation -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^^^^^^^^^^^^^^^^^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/home/tb.py"' Name.Builtin @@ -44,9 +44,9 @@ '5' Literal.Number ', in ' Text 'error_locations' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'return' Keyword ' ' Text 'are_provided' Name @@ -56,11 +56,11 @@ 'is' Operator.Word ' ' Text 'True' Keyword.Constant -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^^^^^^^^^^^^^^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/home/tb.py"' Name.Builtin @@ -68,19 +68,19 @@ '8' Literal.Number ', in ' Text 'are_provided' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'return' Keyword ' ' Text 'in_tracebacks' Name '(' Punctuation ')' Punctuation -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^^^^^^^^^^^^^^^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/home/tb.py"' Name.Builtin @@ -88,21 +88,21 @@ '11' Literal.Number ', in ' Text 'in_tracebacks' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'return' Keyword ' ' Text '1' Literal.Number.Integer '/' Operator '0' Literal.Number.Integer -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '~^~' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace 'ZeroDivisionError' Generic.Error ': ' Text 'division by zero' Name -'\n' Text +'\n' Text.Whitespace diff --git a/tests/examplefiles/pytb/py3tb_test.py3tb.output b/tests/examplefiles/pytb/py3tb_test.py3tb.output index 05445c72..245b8e2f 100644 --- a/tests/examplefiles/pytb/py3tb_test.py3tb.output +++ b/tests/examplefiles/pytb/py3tb_test.py3tb.output @@ -3,18 +3,18 @@ '"<stdin>"' Name.Builtin ', line ' Text '1' Literal.Number -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '1' Literal.Number.Integer '+' Operator -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace 'SyntaxError' Generic.Error ': ' Text 'invalid syntax' Name -'\n' Text +'\n' Text.Whitespace diff --git a/tests/examplefiles/pytb/pytb_test2.pytb.output b/tests/examplefiles/pytb/pytb_test2.pytb.output index aa26c7ef..019199fd 100644 --- a/tests/examplefiles/pytb/pytb_test2.pytb.output +++ b/tests/examplefiles/pytb/pytb_test2.pytb.output @@ -3,9 +3,9 @@ '"temp.py"' Name.Builtin ', line ' Text '1' Literal.Number -'\n' Text +'\n' Text.Whitespace 'SyntaxError' Generic.Error ': ' Text "Non-ASCII character '\\xc3' in file temp.py on line 1, but no encoding declared; see http://www.python.org/peps/pep-0263.html for details" Name -'\n' Text +'\n' Text.Whitespace diff --git a/tests/examplefiles/pytb/pytb_test3.pytb.output b/tests/examplefiles/pytb/pytb_test3.pytb.output index 073aea2a..a083afb6 100644 --- a/tests/examplefiles/pytb/pytb_test3.pytb.output +++ b/tests/examplefiles/pytb/pytb_test3.pytb.output @@ -8,12 +8,12 @@ '1' Literal.Number ', in ' Text '<module>' Name -'\n' Text +'\n' Text.Whitespace 'TypeError' Generic.Error ': ' Text "unsupported operand type(s) for /: 'int' and 'str'" Name -'\n' Text +'\n' Text.Whitespace '>>> blah\n' Other @@ -25,7 +25,7 @@ '1' Literal.Number ', in ' Text '<module>' Name -'\n' Text +'\n' Text.Whitespace 'builtins.NameError' Generic.Error -'\n' Text +'\n' Text.Whitespace diff --git a/tests/examplefiles/pytb/syntax_error.py2tb.output b/tests/examplefiles/pytb/syntax_error.py2tb.output index f7ae91bf..e5edf232 100644 --- a/tests/examplefiles/pytb/syntax_error.py2tb.output +++ b/tests/examplefiles/pytb/syntax_error.py2tb.output @@ -3,19 +3,19 @@ '"<stdin>"' Name.Builtin ', line ' Text '1' Literal.Number -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'mismatch' Name '(' Punctuation ']' Punctuation -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace 'SyntaxError' Generic.Error ': ' Text "closing parenthesis ']' does not match opening parenthesis '('" Name -'\n' Text +'\n' Text.Whitespace diff --git a/tests/examplefiles/pytb/syntax_error.pytb.output b/tests/examplefiles/pytb/syntax_error.pytb.output index f7ae91bf..e5edf232 100644 --- a/tests/examplefiles/pytb/syntax_error.pytb.output +++ b/tests/examplefiles/pytb/syntax_error.pytb.output @@ -3,19 +3,19 @@ '"<stdin>"' Name.Builtin ', line ' Text '1' Literal.Number -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'mismatch' Name '(' Punctuation ']' Punctuation -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace 'SyntaxError' Generic.Error ': ' Text "closing parenthesis ']' does not match opening parenthesis '('" Name -'\n' Text +'\n' Text.Whitespace diff --git a/tests/examplefiles/pytb/syntax_error_caret_code.py2tb.output b/tests/examplefiles/pytb/syntax_error_caret_code.py2tb.output index 8e51a868..177c9b94 100644 --- a/tests/examplefiles/pytb/syntax_error_caret_code.py2tb.output +++ b/tests/examplefiles/pytb/syntax_error_caret_code.py2tb.output @@ -3,12 +3,12 @@ '"<stdin>"' Name.Builtin ', line ' Text '1' Literal.Number -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^' Operator -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace diff --git a/tests/examplefiles/pytb/syntax_error_caret_code.pytb.output b/tests/examplefiles/pytb/syntax_error_caret_code.pytb.output index 8e51a868..177c9b94 100644 --- a/tests/examplefiles/pytb/syntax_error_caret_code.pytb.output +++ b/tests/examplefiles/pytb/syntax_error_caret_code.pytb.output @@ -3,12 +3,12 @@ '"<stdin>"' Name.Builtin ', line ' Text '1' Literal.Number -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^' Operator -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '^' Punctuation.Marker -'\n' Text +'\n' Text.Whitespace diff --git a/tests/examplefiles/pytb/truncated.pytb.output b/tests/examplefiles/pytb/truncated.pytb.output index 5b8c94ac..e4e202d3 100644 --- a/tests/examplefiles/pytb/truncated.pytb.output +++ b/tests/examplefiles/pytb/truncated.pytb.output @@ -5,16 +5,16 @@ '314' Literal.Number ', in ' Text 'dispatch_request' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'dispatcher' Name '.' Operator 'dispatch' Name '(' Punctuation 'req' Name ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/web/main.py"' Name.Builtin @@ -22,9 +22,9 @@ '186' Literal.Number ', in ' Text 'dispatch' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'req' Name '.' Operator 'session' Name @@ -40,7 +40,7 @@ ' ' Text 'req' Name ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/web/session.py"' Name.Builtin @@ -48,16 +48,16 @@ '52' Literal.Number ', in ' Text '__init__' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'self' Name.Builtin.Pseudo '.' Operator 'promote_session' Name '(' Punctuation 'sid' Name ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/web/session.py"' Name.Builtin @@ -65,9 +65,9 @@ '125' Literal.Number ', in ' Text 'promote_session' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace '"' Literal.String.Double 'AND authenticated=0' Literal.String.Double '"' Literal.String.Double @@ -78,7 +78,7 @@ ',' Punctuation ')' Punctuation ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/db/util.py"' Name.Builtin @@ -86,9 +86,9 @@ '47' Literal.Number ', in ' Text 'execute' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'return' Keyword ' ' Text 'self' Name.Builtin.Pseudo @@ -105,7 +105,7 @@ ' ' Text 'args' Name ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py"' Name.Builtin @@ -113,9 +113,9 @@ '44' Literal.Number ', in ' Text 'execute' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'args' Name ' ' Text 'or' Operator.Word @@ -123,7 +123,7 @@ '[' Punctuation ']' Punctuation ')' Punctuation -'\n' Text +'\n' Text.Whitespace ' File ' Text '"/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py"' Name.Builtin @@ -131,9 +131,9 @@ '36' Literal.Number ', in ' Text '_rollback_on_error' Name -'\n' Text +'\n' Text.Whitespace -' ' Text +' ' Text.Whitespace 'return' Keyword ' ' Text 'function' Name @@ -149,9 +149,9 @@ '*' Operator 'kwargs' Name ')' Punctuation -'\n' Text +'\n' Text.Whitespace 'OperationalError' Generic.Error ': ' Text 'database is locked' Name -'\n' Text +'\n' Text.Whitespace |
