Author: Philip Jenvey
Branch: py3k
Changeset: r68324:0e2516a31328
Date: 2013-11-25 15:08 -0800
http://bitbucket.org/pypy/pypy/changeset/0e2516a31328/
Log:merge default
diff --git a/lib-python/2.7/socket.py b/lib-python/2.7/socket.py
--- a/lib-python/2.7/socket.py
+++ b/lib-python/2.7/socket.
Author: Philip Jenvey
Branch: remove-intlong-smm
Changeset: r68321:4a8cc991806d
Date: 2013-11-25 16:20 -0800
http://bitbucket.org/pypy/pypy/changeset/4a8cc991806d/
Log:fix the not really indirect anyway properties
diff --git a/pypy/objspace/std/intobject.py b/pypy/objspace/std/intobject.py
-
Author: Philip Jenvey
Branch: py3k
Changeset: r68322:a0f4678afc88
Date: 2013-11-20 11:22 -0800
http://bitbucket.org/pypy/pypy/changeset/a0f4678afc88/
Log:merge default
diff --git a/rpython/annotator/unaryop.py b/rpython/annotator/unaryop.py
--- a/rpython/annotator/unaryop.py
+++ b/rpython/an
Author: Philip Jenvey
Branch: py3k
Changeset: r68323:219abd35c165
Date: 2013-11-25 15:05 -0800
http://bitbucket.org/pypy/pypy/changeset/219abd35c165/
Log:utilize rpython's new lstrip
diff --git a/pypy/module/__builtin__/compiling.py
b/pypy/module/__builtin__/compiling.py
--- a/pypy/module/_
Author: Matti Picus
Branch: numpy-tests
Changeset: r902:fedbf76c4d87
Date: 2013-11-25 21:32 +0200
http://bitbucket.org/pypy/buildbot/changeset/fedbf76c4d87/
Log:replace git's parseGotRevision to add something like a revision
number
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypy
Author: Tobias Pape
Branch:
Changeset: r68318:48ee7b6ba963
Date: 2013-11-25 16:21 +0100
http://bitbucket.org/pypy/pypy/changeset/48ee7b6ba963/
Log:Merged in krono/pypy/osx-eci-frameworks-makefile (pull request #195)
OSX: Ensure frameworks end up in Makefile when specified in Externa
Author: Tobias Pape
Branch: osx-eci-frameworks-makefile
Changeset: r68317:f2f414ba68d4
Date: 2013-10-30 14:31 +0100
http://bitbucket.org/pypy/pypy/changeset/f2f414ba68d4/
Log:OSX: Ensure frameworks end up in Makefile when specified in External
compilation info
diff --git a/rpython/tr
Author: Antonio Cuni
Branch:
Changeset: r68315:7f3a776cc72a
Date: 2013-11-25 11:43 +0100
http://bitbucket.org/pypy/pypy/changeset/7f3a776cc72a/
Log:fix test_pass_ndarray_object_to_c by exposing W_NDimArray to C as we
do for all the other builtin types
diff --git a/pypy/module/cpyext
Author: Antonio Cuni
Branch: ndarray-buffer
Changeset: r68316:eda923010bdb
Date: 2013-11-25 11:44 +0100
http://bitbucket.org/pypy/pypy/changeset/eda923010bdb/
Log:hg merge default
diff --git a/lib-python/2.7/socket.py b/lib-python/2.7/socket.py
--- a/lib-python/2.7/socket.py
+++ b/lib-python