Author: mattip <[email protected]>
Branch:
Changeset: r63417:84d6ab8cc8a2
Date: 2013-04-16 20:12 +0300
http://bitbucket.org/pypy/pypy/changeset/84d6ab8cc8a2/
Log: merge heads
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -129,3 +129,5 @@
.. branch: release-2.0-beta2
.. branch: unbreak-freebsd
+
+.. branch: virtualref-virtualizable
diff --git a/rpython/tool/logparser.py b/rpython/tool/logparser.py
--- a/rpython/tool/logparser.py
+++ b/rpython/tool/logparser.py
@@ -70,7 +70,11 @@
time = int(int(match.group(1), 16))
time_decrase = time_decrase or time < lasttime
lasttime = time
- record(match.group(2), time=int(match.group(1), 16))
+ try:
+ record(match.group(2), time=int(match.group(1), 16))
+ except:
+ print "Line", i
+ raise
if verbose:
sys.stderr.write('loaded\n')
if performance_log and time_decrase:
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
