Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
6de33787
Commit
6de33787
authored
May 08, 2010
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't nest block tags inside HTML <p> tags in zExceptions.ExceptionFormatter.
LP #351006
parent
cbee56f2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
doc/CHANGES.rst
doc/CHANGES.rst
+3
-0
src/zExceptions/ExceptionFormatter.py
src/zExceptions/ExceptionFormatter.py
+2
-2
No files found.
doc/CHANGES.rst
View file @
6de33787
...
@@ -36,6 +36,9 @@ Features Added
...
@@ -36,6 +36,9 @@ Features Added
Bugs Fixed
Bugs Fixed
++++++++++
++++++++++
- LP #351006: Don't nest block tags inside HTML ``<p>`` tags in
``zExceptions.ExceptionFormatter``.
- LP #411837: Handle resource files with ``.htm`` extention properly,
- LP #411837: Handle resource files with ``.htm`` extention properly,
as page template resources.
as page template resources.
...
...
src/zExceptions/ExceptionFormatter.py
View file @
6de33787
...
@@ -208,7 +208,7 @@ class HTMLExceptionFormatter (TextExceptionFormatter):
...
@@ -208,7 +208,7 @@ class HTMLExceptionFormatter (TextExceptionFormatter):
return
cgi
.
escape
(
s
)
return
cgi
.
escape
(
s
)
def
getPrefix
(
self
):
def
getPrefix
(
self
):
return
'<p>Traceback (innermost last):
\
r
\
n
<ul>'
return
'<p>Traceback (innermost last):
</p>
\
r
\
n
<ul>'
def
formatSupplementLine
(
self
,
line
):
def
formatSupplementLine
(
self
,
line
):
return
'<b>%s</b>'
%
self
.
escape
(
str
(
line
))
return
'<b>%s</b>'
%
self
.
escape
(
str
(
line
))
...
@@ -223,7 +223,7 @@ class HTMLExceptionFormatter (TextExceptionFormatter):
...
@@ -223,7 +223,7 @@ class HTMLExceptionFormatter (TextExceptionFormatter):
return
'<li>%s</li>'
%
line
return
'<li>%s</li>'
%
line
def
formatLastLine
(
self
,
exc_line
):
def
formatLastLine
(
self
,
exc_line
):
return
'</ul>%s</p>'
%
self
.
escape
(
exc_line
)
return
'</ul>
<p>
%s</p>'
%
self
.
escape
(
exc_line
)
def
formatExtraInfo
(
self
,
supplement
):
def
formatExtraInfo
(
self
,
supplement
):
getInfo
=
getattr
(
supplement
,
'getInfo'
,
None
)
getInfo
=
getattr
(
supplement
,
'getInfo'
,
None
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment