[pypy-commit] pypy default: merge upstream

2014-10-14 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r73957:5b2a4468b724 Date: 2014-10-14 12:11 -0700 http://bitbucket.org/pypy/pypy/changeset/5b2a4468b724/ Log:merge upstream diff --git a/pypy/objspace/std/bytearrayobject.py b/pypy/objspace/std/bytearrayobject.py --- a/pypy/objspace/std/bytearrayobje

[pypy-commit] pypy default: merge upstream

2014-09-11 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r73480:a552e9ed86d6 Date: 2014-09-11 12:43 -0700 http://bitbucket.org/pypy/pypy/changeset/a552e9ed86d6/ Log:merge upstream diff too long, truncating to 2000 out of 2511 lines diff --git a/_pytest/resultlog.py b/_pytest/resultlog.py --- a/_pytest/res

[pypy-commit] pypy default: merge upstream

2014-05-01 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r71144:4cc9b702d120 Date: 2014-05-01 10:52 -0700 http://bitbucket.org/pypy/pypy/changeset/4cc9b702d120/ Log:merge upstream diff --git a/pypy/module/_rawffi/test/test__rawffi.py b/pypy/module/_rawffi/test/test__rawffi.py --- a/pypy/module/_rawffi/tes

[pypy-commit] pypy default: merge upstream

2014-04-16 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r70676:c7c7b54e61a0 Date: 2014-04-16 16:34 -0700 http://bitbucket.org/pypy/pypy/changeset/c7c7b54e61a0/ Log:merge upstream diff --git a/pypy/module/imp/importing.py b/pypy/module/imp/importing.py --- a/pypy/module/imp/importing.py +++ b/pypy/module/i

[pypy-commit] pypy default: merge upstream

2014-03-05 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r69745:de74625112ee Date: 2014-03-05 17:03 -0800 http://bitbucket.org/pypy/pypy/changeset/de74625112ee/ Log:merge upstream diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-h

[pypy-commit] pypy default: merge upstream

2014-02-13 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r69137:2d71669b2c3c Date: 2014-02-13 11:59 -0800 http://bitbucket.org/pypy/pypy/changeset/2d71669b2c3c/ Log:merge upstream diff --git a/include/PyPy.h b/include/PyPy.h new file mode 100644 --- /dev/null +++ b/include/PyPy.h @@ -0,0 +1,54 @@ +#ifndef

[pypy-commit] pypy default: merge upstream

2014-01-30 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r69034:50e4bd9b64b1 Date: 2014-01-30 17:29 -0800 http://bitbucket.org/pypy/pypy/changeset/50e4bd9b64b1/ Log:merge upstream diff --git a/pypy/module/micronumpy/interp_boxes.py b/pypy/module/micronumpy/interp_boxes.py --- a/pypy/module/micronumpy/inte

[pypy-commit] pypy default: merge upstream

2014-01-24 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r68926:92a94109c1f3 Date: 2014-01-24 16:18 -0800 http://bitbucket.org/pypy/pypy/changeset/92a94109c1f3/ Log:merge upstream diff --git a/pypy/module/micronumpy/interp_boxes.py b/pypy/module/micronumpy/interp_boxes.py --- a/pypy/module/micronumpy/inte

[pypy-commit] pypy default: merge upstream

2013-07-24 Thread krono
Author: Tobias Pape Branch: Changeset: r65619:d63e416d3f3d Date: 2013-05-06 11:32 +0200 http://bitbucket.org/pypy/pypy/changeset/d63e416d3f3d/ Log:merge upstream diff --git a/lib_pypy/_ctypes/structure.py b/lib_pypy/_ctypes/structure.py --- a/lib_pypy/_ctypes/structure.py +++ b/lib_pypy/_ct

[pypy-commit] pypy default: merge upstream

2013-07-22 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r65532:bed1ea0ec233 Date: 2013-07-22 18:25 -0700 http://bitbucket.org/pypy/pypy/changeset/bed1ea0ec233/ Log:merge upstream diff --git a/pypy/module/test_lib_pypy/test_ctypes_config_cache.py b/pypy/module/test_lib_pypy/test_ctypes_config_cache.py ---

[pypy-commit] pypy default: merge upstream

2013-06-21 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r64954:d0acdb6e6b8a Date: 2013-06-21 12:31 -0700 http://bitbucket.org/pypy/pypy/changeset/d0acdb6e6b8a/ Log:merge upstream diff --git a/pypy/objspace/std/setobject.py b/pypy/objspace/std/setobject.py --- a/pypy/objspace/std/setobject.py +++ b/pypy/ob

[pypy-commit] pypy default: merge upstream

2013-05-30 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r64671:fc8a329d4956 Date: 2013-05-30 12:41 -0700 http://bitbucket.org/pypy/pypy/changeset/fc8a329d4956/ Log:merge upstream diff --git a/pypy/module/pypyjit/test_pypy_c/test_bug.py b/pypy/module/pypyjit/test_pypy_c/test_bug.py --- a/pypy/module/pypyj

[pypy-commit] pypy default: merge upstream

2013-05-28 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r64644:0289956d46c1 Date: 2013-05-28 14:43 -0700 http://bitbucket.org/pypy/pypy/changeset/0289956d46c1/ Log:merge upstream diff --git a/rpython/translator/c/test/test_standalone.py b/rpython/translator/c/test/test_standalone.py --- a/rpython/transla

[pypy-commit] pypy default: merge upstream

2012-12-29 Thread bivab
Author: David Schneider Branch: Changeset: r59622:975e3cf7b0a8 Date: 2012-12-29 16:23 +0100 http://bitbucket.org/pypy/pypy/changeset/975e3cf7b0a8/ Log:merge upstream diff --git a/lib_pypy/numpypy/core/arrayprint.py b/lib_pypy/numpypy/core/arrayprint.py --- a/lib_pypy/numpypy/core/arrayprin

[pypy-commit] pypy default: merge upstream

2012-04-13 Thread RonnyPfannschmidt
Author: Ronny Pfannschmidt Branch: Changeset: r54331:f7ddf20f141f Date: 2012-04-13 12:52 +0200 http://bitbucket.org/pypy/pypy/changeset/f7ddf20f141f/ Log:merge upstream diff --git a/pypy/annotation/test/test_annrpython.py b/pypy/annotation/test/test_annrpython.py --- a/pypy/annotation/test

[pypy-commit] pypy default: merge upstream

2011-06-13 Thread snus_mumrik
Author: Ilya Osadchiy Branch: Changeset: r44899:6b6f75812436 Date: 2011-06-03 00:11 +0300 http://bitbucket.org/pypy/pypy/changeset/6b6f75812436/ Log:merge upstream diff --git a/pypy/annotation/annrpython.py b/pypy/annotation/annrpython.py --- a/pypy/annotation/annrpython.py +++ b/pypy/annot