summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pygments/lexers/agile.py3
-rw-r--r--tests/examplefiles/database.pytb4
-rw-r--r--tests/examplefiles/truncated.pytb15
3 files changed, 21 insertions, 1 deletions
diff --git a/pygments/lexers/agile.py b/pygments/lexers/agile.py
index 1a57c737..2fca1103 100644
--- a/pygments/lexers/agile.py
+++ b/pygments/lexers/agile.py
@@ -368,7 +368,8 @@ class PythonTracebackLexer(RegexLexer):
'root': [
(r'^Traceback \(most recent call last\):\n', Generic.Traceback, 'intb'),
# SyntaxError starts with this.
- (r'^(?= File "[^"]+", line \d+\n)', Generic.Traceback, 'intb'),
+ (r'^(?= File "[^"]+", line \d+)', Generic.Traceback, 'intb'),
+ (r'^.*\n', Text),
],
'intb': [
(r'^( File )("[^"]+")(, line )(\d+)(, in )(.+)(\n)',
diff --git a/tests/examplefiles/database.pytb b/tests/examplefiles/database.pytb
index a3f99114..9138e01b 100644
--- a/tests/examplefiles/database.pytb
+++ b/tests/examplefiles/database.pytb
@@ -1,3 +1,5 @@
+Text before
+
Traceback (most recent call last):
File "/usr/lib/python2.3/site-packages/trac/web/main.py", line 314, in dispatch_request
dispatcher.dispatch(req)
@@ -14,3 +16,5 @@ Traceback (most recent call last):
File "/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py", line 36, in _rollback_on_error
return function(self, *args, **kwargs)
OperationalError: database is locked
+
+Text after
diff --git a/tests/examplefiles/truncated.pytb b/tests/examplefiles/truncated.pytb
new file mode 100644
index 00000000..ad5b6d49
--- /dev/null
+++ b/tests/examplefiles/truncated.pytb
@@ -0,0 +1,15 @@
+ File "/usr/lib/python2.3/site-packages/trac/web/main.py", line 314, in dispatch_request
+ dispatcher.dispatch(req)
+ File "/usr/lib/python2.3/site-packages/trac/web/main.py", line 186, in dispatch
+ req.session = Session(self.env, req)
+ File "/usr/lib/python2.3/site-packages/trac/web/session.py", line 52, in __init__
+ self.promote_session(sid)
+ File "/usr/lib/python2.3/site-packages/trac/web/session.py", line 125, in promote_session
+ "AND authenticated=0", (sid,))
+ File "/usr/lib/python2.3/site-packages/trac/db/util.py", line 47, in execute
+ return self.cursor.execute(sql_escape_percent(sql), args)
+ File "/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py", line 44, in execute
+ args or [])
+ File "/usr/lib/python2.3/site-packages/trac/db/sqlite_backend.py", line 36, in _rollback_on_error
+ return function(self, *args, **kwargs)
+OperationalError: database is locked