Mercurial > moin > 1.9
changeset 52:80b3d4e891ff
merge moin--main--1.3--patch-931: fix hidding of huge tracebacks
Patches applied:
* arch@arch.thinkmo.de--2003-archives/moin--main--1.3--patch-931
fix hidding of huge tracebacks
* nirs@freeshell.org--2005/moin--fix--1.3--patch-54
cgitb: fix attribute quoting
* nirs@freeshell.org--2005/moin--fix--1.3--patch-55
failure: hide huge tracebacks correctly
* nirs@freeshell.org--2005/moin--fix--1.3--patch-56
merge from main
imported from: moin--main--1.5--patch-53
author | Nir Soffer <nirs@freeshell.org> |
---|---|
date | Thu, 29 Sep 2005 00:39:21 +0000 |
parents | 54d5932d5a03 |
children | 699811601bed |
files | ChangeLog MoinMoin/failure.py MoinMoin/support/cgitb.py |
diffstat | 3 files changed, 34 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Sep 29 00:36:27 2005 +0000 +++ b/ChangeLog Thu Sep 29 00:39:21 2005 +0000 @@ -36,6 +36,34 @@ MoinMoin/wikiaction.py +2005-09-04 14:31:21 GMT Nir Soffer <nirs@freeshell.org> patch-931 + + Summary: + fix hidding of huge tracebacks + Revision: + moin--main--1.3--patch-931 + + Patches applied: + + * nirs@freeshell.org--2005/moin--fix--1.3--patch-54 + cgitb: fix attribute quoting + + * nirs@freeshell.org--2005/moin--fix--1.3--patch-55 + failure: hide huge tracebacks correctly + + * nirs@freeshell.org--2005/moin--fix--1.3--patch-56 + merge from main + + + modified files: + ChangeLog MoinMoin/failure.py MoinMoin/support/cgitb.py + + new patches: + nirs@freeshell.org--2005/moin--fix--1.3--patch-54 + nirs@freeshell.org--2005/moin--fix--1.3--patch-55 + nirs@freeshell.org--2005/moin--fix--1.3--patch-56 + + 2005-09-04 00:24:17 GMT Nir Soffer <nirs@freeshell.org> patch-930 Summary:
--- a/MoinMoin/failure.py Thu Sep 29 00:36:27 2005 +0000 +++ b/MoinMoin/failure.py Thu Sep 29 00:39:21 2005 +0000 @@ -36,7 +36,6 @@ self.formatMessage(), self.formatButtons(), self.formatDebugInfo(), - self.debugInfoHideScript(), self.formatTextTraceback() ) return ''.join(content) @@ -80,7 +79,8 @@ def formatDebugInfo(self): """ Put debugging information in a hidden div """ attributes = {'id': self.debugInfoID} - info = [self.formatTraceback(), + info = [self.debugInfoHideScript(), + self.formatTraceback(), self.formatSystemDetails(),] return self.formatter.section(''.join(info), attributes) @@ -88,11 +88,9 @@ """ Hide debug info for javascript enabled browsers """ if self.debug: return '' - return """ -<script type="text/javascript"> -toggleDebugInfo() -</script> -""" + return ''' +<script type="text/javascript">toggleDebugInfo()</script> +''' def formatTraceback(self): return self.formatAllTracebacks(self.formatOneTraceback)
--- a/MoinMoin/support/cgitb.py Thu Sep 29 00:36:27 2005 +0000 +++ b/MoinMoin/support/cgitb.py Thu Sep 29 00:39:21 2005 +0000 @@ -359,7 +359,7 @@ def formatStylesheet(self): """ Format inline html stylesheet """ - return '<style type=text/css>%s</style>' % self.stylesheet() + return '<style type="text/css">%s</style>' % self.stylesheet() def stylesheet(self): """ Return stylesheet rules. Override to change rules.