Author: Armin Rigo
Branch: hashtable
Changeset: r1489:bb24720e379b
Date: 2014-11-01 17:41 +0100
http://bitbucket.org/pypy/stmgc/changeset/bb24720e379b/
Log:A random test, and a more precise test and fix following from it.
diff --git a/c7/stm/hashtable.c b/c7/stm/hashtable.c
--- a/c7/stm/hash
Author: mattip
Branch: ufuncapi
Changeset: r74324:a8d365caf86e
Date: 2014-10-31 14:01 +0200
http://bitbucket.org/pypy/pypy/changeset/a8d365caf86e/
Log:merge default into branch
diff too long, truncating to 2000 out of 40806 lines
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgi
Author: mattip
Branch: nditer-external_loop
Changeset: r74322:f44932374644
Date: 2014-10-31 08:28 +0200
http://bitbucket.org/pypy/pypy/changeset/f44932374644/
Log:close branch to be merged
___
pypy-commit mailing list
[email protected]
https:/
Author: mattip
Branch:
Changeset: r74323:55056cc539e0
Date: 2014-10-31 08:30 +0200
http://bitbucket.org/pypy/pypy/changeset/55056cc539e0/
Log:merge nditer-external_loop which implements numpy's nditer
external_loop argument
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew
Author: mattip
Branch: nditer-external_loop
Changeset: r74321:418e458600c7
Date: 2014-10-31 08:27 +0200
http://bitbucket.org/pypy/pypy/changeset/418e458600c7/
Log:cleanup, document branch to be merged
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsne
Author: mattip
Branch:
Changeset: r74325:eb7acf87bbaf
Date: 2014-11-01 22:48 +0200
http://bitbucket.org/pypy/pypy/changeset/eb7acf87bbaf/
Log:merge heads
diff --git a/pypy/objspace/std/formatting.py b/pypy/objspace/std/formatting.py
--- a/pypy/objspace/std/formatting.py
+++ b/pypy/objspace/
Author: mattip
Branch: nditer-external_loop
Changeset: r74320:d9fcdce54806
Date: 2014-10-31 01:14 +0200
http://bitbucket.org/pypy/pypy/changeset/d9fcdce54806/
Log:merge default into branch
diff too long, truncating to 2000 out of 39286 lines
diff --git a/.hgignore b/.hgignore
--- a/.hgignor
Author: mattip
Branch: nditer-external_loop
Changeset: r74319:6a505b52a29d
Date: 2014-10-31 01:14 +0200
http://bitbucket.org/pypy/pypy/changeset/6a505b52a29d/
Log:whoops, partial commit
diff --git a/pypy/module/micronumpy/nditer.py b/pypy/module/micronumpy/nditer.py
--- a/pypy/module/micronu