Skip to content

Commit 7201709

Browse files
author
Richard Jones
committed
removed some property name clashes
1 parent 8e3297d commit 7201709

File tree

7 files changed

+171
-153
lines changed

7 files changed

+171
-153
lines changed

roundup/cgi/PageTemplates/Expressions.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
2626
"""
2727

28-
__version__='$Revision: 1.3 $'[11:-2]
28+
__version__='$Revision: 1.4 $'[11:-2]
2929

3030
import re, sys
3131
from TALES import Engine, CompilerError, _valid_name, NAME_RE, \
@@ -287,9 +287,9 @@ def restrictedTraverse(self, path, securityManager,
287287
object = apply(object, name)
288288
continue
289289

290-
if name[0] == '_':
291-
# Never allowed in a URL.
292-
raise AttributeError, name
290+
# if name[0] == '_':
291+
# # Never allowed in a URL.
292+
# raise AttributeError, name
293293

294294
# Try an attribute.
295295
o = get(object, name, M)

roundup/cgi/cgitb.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#
22
# This module was written by Ka-Ping Yee, <[email protected]>.
33
#
4-
# $Id: cgitb.py,v 1.3 2002-09-06 07:23:29 richard Exp $
4+
# $Id: cgitb.py,v 1.4 2002-09-09 05:28:48 richard Exp $
55

66
__doc__ = """
77
Extended CGI traceback handler by Ka-Ping Yee, <[email protected]>.
88
"""
99

10-
import sys, os, types, string, keyword, linecache, tokenize, inspect, pydoc
10+
import sys, os, types, string, keyword, linecache, tokenize, inspect
11+
import pydoc, traceback
1112

1213
from roundup.i18n import _
1314

@@ -51,6 +52,10 @@ def pt_html(context=5):
5152
niceDict(' ', context.global_vars),
5253
niceDict(' ', context.local_vars)))
5354
# context._scope_stack))
55+
56+
l.append('\n')
57+
l.append(''.join(traceback.format_exception(etype, evalue,
58+
sys.exc_traceback)))
5459
return head + cgi.escape('\n'.join(l)) + '</pre><p>&nbsp;</p>'
5560

5661
def html(context=5):
@@ -163,6 +168,9 @@ def handler():
163168

164169
#
165170
# $Log: not supported by cvs2svn $
171+
# Revision 1.3 2002/09/06 07:23:29 richard
172+
# tweak
173+
#
166174
# Revision 1.2 2002/09/06 07:21:31 richard
167175
# much nicer error messages when there's a templating error
168176
#

0 commit comments

Comments
 (0)