Author: Richard Plangger <planri...@gmail.com>
Branch: vecopt-merge
Changeset: r79907:fe486d25512c
Date: 2015-09-30 15:53 +0200
http://bitbucket.org/pypy/pypy/changeset/fe486d25512c/
Log: reverted some changes that are not necessary for the branch
diff --git a/pypy/module/micronumpy/ufuncs.py b/pypy/module/micronumpy/ufuncs.py
--- a/pypy/module/micronumpy/ufuncs.py
+++ b/pypy/module/micronumpy/ufuncs.py
@@ -276,7 +276,7 @@
loop.accumulate_flat(
space, self.func, obj, dtype, out, self.identity)
if call__array_wrap__:
- out = space.call_method(obj, '__array_wrap__', out, None)
+ out = space.call_method(obj, '__array_wrap__', out,
space.w_None)
return out
axis_flags = [False] * shapelen
diff --git a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
--- a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
@@ -72,7 +72,7 @@
stderr = ''
assert not stderr
#
- if discard_stdout_before_last_line or True:
+ if discard_stdout_before_last_line:
stdout = stdout.splitlines(True)[-1]
#
# parse the JIT log
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
