summaryrefslogtreecommitdiffstats
path: root/Parser
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-08-13 09:15:16 (GMT)
committerGeorg Brandl <georg@python.org>2009-08-13 09:15:16 (GMT)
commitc3c6fed6fe282ca2aedb9b15904bde63218dfc86 (patch)
tree2dd7ef87fe904ed056855d9c4e88871c580db807 /Parser
parent6b2964d6a484f066b28e79427dd4f1d8dbdb5de5 (diff)
downloadcpython-c3c6fed6fe282ca2aedb9b15904bde63218dfc86.zip
cpython-c3c6fed6fe282ca2aedb9b15904bde63218dfc86.tar.gz
cpython-c3c6fed6fe282ca2aedb9b15904bde63218dfc86.tar.bz2
Merged revisions 74010,74034,74054 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r74010 | r.david.murray | 2009-07-15 16:16:54 +0200 (Mi, 15 Jul 2009) | 2 lines PEP-8-ify r73389. ................ r74034 | alexandre.vassalotti | 2009-07-17 07:35:59 +0200 (Fr, 17 Jul 2009) | 2 lines The output() function takes only one string argument. ................ r74054 | alexandre.vassalotti | 2009-07-17 10:31:44 +0200 (Fr, 17 Jul 2009) | 14 lines Merged revisions 74051-74052 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74051 | alexandre.vassalotti | 2009-07-17 03:54:23 -0400 (Fri, 17 Jul 2009) | 2 lines Initialize variables in PyCurses_getsyx() to avoid compiler warnings. ........ r74052 | alexandre.vassalotti | 2009-07-17 04:09:04 -0400 (Fri, 17 Jul 2009) | 3 lines Fix GCC warning about fprintf used without a string literal and without format arguments. ........ ................
Diffstat (limited to 'Parser')
-rw-r--r--Parser/asdl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Parser/asdl.py b/Parser/asdl.py
index 28a7138..ca91b6e 100644
--- a/Parser/asdl.py
+++ b/Parser/asdl.py
@@ -323,8 +323,8 @@ class VisitorBase(object):
try:
meth(object, *args)
except Exception:
- output("Error visiting", repr(object))
- output(sys.exc_info()[1])
+ output("Error visiting" + repr(object))
+ output(str(sys.exc_info()[1]))
traceback.print_exc()
# XXX hack
if hasattr(self, 'file'):