Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r82906:bd53b782ce3d
Date: 2016-03-09 14:10 +0100
http://bitbucket.org/pypy/pypy/changeset/bd53b782ce3d/
Log: merge heads
diff --git a/pypy/module/_vmprof/interp_vmprof.py
b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
+++ b/pypy/module/_vmprof/interp_vmprof.py
@@ -60,10 +60,10 @@
Must be smaller than 1.0
"""
w_modules = space.sys.get('modules')
- if space.contains_w(w_modules, space.wrap('_continuation')):
- space.warn(space.wrap("Using _continuation/greenlet/stacklet together "
- "with vmprof will crash"),
- space.w_RuntimeWarning)
+ #if space.contains_w(w_modules, space.wrap('_continuation')):
+ # space.warn(space.wrap("Using _continuation/greenlet/stacklet together
"
+ # "with vmprof will crash"),
+ # space.w_RuntimeWarning)
try:
rvmprof.enable(fileno, period)
except rvmprof.VMProfError, e:
diff --git a/rpython/jit/tool/traceviewer.py b/rpython/jit/tool/traceviewer.py
--- a/rpython/jit/tool/traceviewer.py
+++ b/rpython/jit/tool/traceviewer.py
@@ -103,9 +103,9 @@
self.last_guard = -1
else:
# guards can be out of order nowadays
- groups = sorted(groups)
- self.first_guard = guard_number(groups[0])
- self.last_guard = guard_number(groups[-1])
+ groups = sorted(map(guard_number, groups))
+ self.first_guard = groups[0]
+ self.last_guard = groups[-1]
content = property(get_content, set_content)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
