[pypy-commit] pypy default: kill the meeting talk

2011-11-21 Thread fijal
Author: Maciej Fijalkowski Branch: Changeset: r49596:3cde514a9a92 Date: 2011-11-21 11:25 +0200 http://bitbucket.org/pypy/pypy/changeset/3cde514a9a92/ Log:kill the meeting talk diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst --- a/pypy/doc/how-to-release.rst +++ b/pypy

[pypy-commit] pypy release-1.7.x: Added tag release-1.7 for changeset ff4af8f31882

2011-11-21 Thread fijal
Author: Maciej Fijalkowski Branch: release-1.7.x Changeset: r49597:7a1d5bd05243 Date: 2011-11-21 12:14 +0200 http://bitbucket.org/pypy/pypy/changeset/7a1d5bd05243/ Log:Added tag release-1.7 for changeset ff4af8f31882 diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@

[pypy-commit] pypy default: Fix.

2011-11-21 Thread arigo
Author: Armin Rigo Branch: Changeset: r49598:3c59b9c3ba47 Date: 2011-11-21 11:15 +0100 http://bitbucket.org/pypy/pypy/changeset/3c59b9c3ba47/ Log:Fix. diff --git a/pypy/doc/release-1.7.0.rst b/pypy/doc/release-1.7.0.rst --- a/pypy/doc/release-1.7.0.rst +++ b/pypy/doc/release-1.7.0.rst @@ -1

[pypy-commit] pypy default: merge heads

2011-11-21 Thread arigo
Author: Armin Rigo Branch: Changeset: r49599:aed533007ccf Date: 2011-11-21 11:18 +0100 http://bitbucket.org/pypy/pypy/changeset/aed533007ccf/ Log:merge heads diff --git a/pypy/doc/how-to-release.rst b/pypy/doc/how-to-release.rst --- a/pypy/doc/how-to-release.rst +++ b/pypy/doc/how-to-releas

[pypy-commit] pypy.org extradoc: checksums

2011-11-21 Thread fijal
Author: Maciej Fijalkowski Branch: extradoc Changeset: r292:e2d26191fd54 Date: 2011-11-21 12:21 +0200 http://bitbucket.org/pypy/pypy.org/changeset/e2d26191fd54/ Log:checksums diff --git a/source/download.txt b/source/download.txt --- a/source/download.txt +++ b/source/download.txt @@ -182,10

[pypy-commit] pypy.org extradoc: merge

2011-11-21 Thread fijal
Author: Maciej Fijalkowski Branch: extradoc Changeset: r293:a92d5719d9dc Date: 2011-11-21 12:21 +0200 http://bitbucket.org/pypy/pypy.org/changeset/a92d5719d9dc/ Log:merge diff --git a/source/download.txt b/source/download.txt --- a/source/download.txt +++ b/source/download.txt @@ -84,7 +84,7

[pypy-commit] pypy.org extradoc: regen html

2011-11-21 Thread fijal
Author: Maciej Fijalkowski Branch: extradoc Changeset: r294:3b0fd88061dc Date: 2011-11-21 12:22 +0200 http://bitbucket.org/pypy/pypy.org/changeset/3b0fd88061dc/ Log:regen html diff --git a/download.html b/download.html --- a/download.html +++ b/download.html @@ -69,9 +69,9 @@ (This is the o

[pypy-commit] pypy default: Added tag release-1.7 for changeset ff4af8f31882

2011-11-21 Thread fijal
Author: Maciej Fijalkowski Branch: Changeset: r49600:5c2c8665692c Date: 2011-11-21 12:14 +0200 http://bitbucket.org/pypy/pypy/changeset/5c2c8665692c/ Log:Added tag release-1.7 for changeset ff4af8f31882 diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ b590cf6de419

[pypy-commit] pypy default: Added tag release-1.7 for changeset ff4af8f31882

2011-11-21 Thread fijal
Author: Maciej Fijalkowski Branch: Changeset: r49601:4330437caa7d Date: 2011-11-21 12:14 +0200 http://bitbucket.org/pypy/pypy/changeset/4330437caa7d/ Log:Added tag release-1.7 for changeset ff4af8f31882 diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -1,3 +1,4 @@ b590cf6de419

[pypy-commit] pypy default: merge

2011-11-21 Thread fijal
Author: Maciej Fijalkowski Branch: Changeset: r49602:10cb0adcfdd9 Date: 2011-11-21 12:31 +0200 http://bitbucket.org/pypy/pypy/changeset/10cb0adcfdd9/ Log:merge diff --git a/pypy/doc/release-1.7.0.rst b/pypy/doc/release-1.7.0.rst --- a/pypy/doc/release-1.7.0.rst +++ b/pypy/doc/release-1.7.0.

[pypy-commit] pypy default: minor fixes

2011-11-21 Thread fijal
Author: Maciej Fijalkowski Branch: Changeset: r49603:a8545592fa3e Date: 2011-11-21 12:33 +0200 http://bitbucket.org/pypy/pypy/changeset/a8545592fa3e/ Log:minor fixes diff --git a/pypy/doc/release-1.7.0.rst b/pypy/doc/release-1.7.0.rst --- a/pypy/doc/release-1.7.0.rst +++ b/pypy/doc/release-

[pypy-commit] pypy type-specialized-instances: reverted last fix, found a new (and better) one

2011-11-21 Thread l . diekmann
Author: Lukas Diekmann Branch: type-specialized-instances Changeset: r49604:118048845a8d Date: 2011-11-21 11:41 +0100 http://bitbucket.org/pypy/pypy/changeset/118048845a8d/ Log:reverted last fix, found a new (and better) one diff --git a/pypy/objspace/std/mapdict.py b/pypy/objspace/std/mapdi

[pypy-commit] pypy default: there was really no optimizeopt test for circular virtuals??!

2011-11-21 Thread cfbolz
Author: Carl Friedrich Bolz Branch: Changeset: r49605:66bdc5c4e59c Date: 2011-11-21 12:28 +0100 http://bitbucket.org/pypy/pypy/changeset/66bdc5c4e59c/ Log:there was really no optimizeopt test for circular virtuals??! diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/p

[pypy-commit] pypy win64-stage1: merge

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49610:0e90cd957a7d Date: 2011-11-21 12:42 +0100 http://bitbucket.org/pypy/pypy/changeset/0e90cd957a7d/ Log:merge diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/pypy/jit/metainterp/optimizeopt/test/test_optimi

[pypy-commit] pypy win64_gborg: close old branch

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64_gborg Changeset: r49611:9d59a8501c00 Date: 2011-11-21 12:56 +0100 http://bitbucket.org/pypy/pypy/changeset/9d59a8501c00/ Log:close old branch ___ pypy-commit mailing list [email protected] http://mail.pyt

[pypy-commit] pypy win64 test: close old branch

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64 test Changeset: r49612:03816b1a901c Date: 2011-11-21 12:58 +0100 http://bitbucket.org/pypy/pypy/changeset/03816b1a901c/ Log:close old branch ___ pypy-commit mailing list [email protected] http://mail.pyth

[pypy-commit] pypy arm-backend-2: typo

2011-11-21 Thread bivab
Author: David Schneider Branch: arm-backend-2 Changeset: r49613:2bddb9109f82 Date: 2011-11-21 12:00 +0100 http://bitbucket.org/pypy/pypy/changeset/2bddb9109f82/ Log:typo diff --git a/pypy/jit/backend/arm/opassembler.py b/pypy/jit/backend/arm/opassembler.py --- a/pypy/jit/backend/arm/opassem

[pypy-commit] pypy arm-backend-2: add ARM to conftest and test_random

2011-11-21 Thread bivab
Author: David Schneider Branch: arm-backend-2 Changeset: r49614:1ff3890a1ce8 Date: 2011-11-21 12:01 +0100 http://bitbucket.org/pypy/pypy/changeset/1ff3890a1ce8/ Log:add ARM to conftest and test_random diff --git a/pypy/jit/backend/conftest.py b/pypy/jit/backend/conftest.py --- a/pypy/jit/bac

[pypy-commit] pypy arm-backend-2: Updating the position of the regalloc to soon when merging operations with the following guard leads to some vars being freed to early

2011-11-21 Thread bivab
Author: David Schneider Branch: arm-backend-2 Changeset: r49615:2771f3c2a471 Date: 2011-11-21 12:04 +0100 http://bitbucket.org/pypy/pypy/changeset/2771f3c2a471/ Log:Updating the position of the regalloc to soon when merging operations with the following guard leads to some vars being

[pypy-commit] pypy default: also a test where the circular virtual is forced

2011-11-21 Thread cfbolz
Author: Carl Friedrich Bolz Branch: Changeset: r49616:24e8fd936c50 Date: 2011-11-21 12:44 +0100 http://bitbucket.org/pypy/pypy/changeset/24e8fd936c50/ Log:also a test where the circular virtual is forced diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/pypy/jit/metai

[pypy-commit] pypy win64-stage1: _continuelet on win64 _works_ !

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49619:fbf211aee071 Date: 2011-11-21 14:18 +0100 http://bitbucket.org/pypy/pypy/changeset/fbf211aee071/ Log:_continuelet on win64 _works_ ! There was an old direct reference to windows in rwin32.py, changed it to host_factory d

[pypy-commit] pypy default: a failing test that shows a problem around forcing of virtual immutable recursive structs

2011-11-21 Thread cfbolz
Author: Carl Friedrich Bolz Branch: Changeset: r49617:f6d1a45766ce Date: 2011-11-21 14:15 +0100 http://bitbucket.org/pypy/pypy/changeset/f6d1a45766ce/ Log:a failing test that shows a problem around forcing of virtual immutable recursive structs diff --git a/pypy/jit/metainterp/optim

[pypy-commit] pypy default: No-op clarification.

2011-11-21 Thread arigo
Author: Armin Rigo Branch: Changeset: r49620:5b572a486ead Date: 2011-11-21 15:08 +0100 http://bitbucket.org/pypy/pypy/changeset/5b572a486ead/ Log:No-op clarification. diff --git a/pypy/rpython/test/test_rclass.py b/pypy/rpython/test/test_rclass.py --- a/pypy/rpython/test/test_rclass.py +++

[pypy-commit] pypy default: Attempt to kill 5225def4e322, which contains the broken

2011-11-21 Thread arigo
Author: Armin Rigo Branch: Changeset: r49621:9e1ad8713760 Date: 2011-11-21 15:29 +0100 http://bitbucket.org/pypy/pypy/changeset/9e1ad8713760/ Log:Attempt to kill 5225def4e322, which contains the broken merges 015d05dac523 and 4dcb9ca387a6. ___

[pypy-commit] pypy default: Disable a half-broken test that fails on Python 2.7 (see comments).

2011-11-21 Thread arigo
Author: Armin Rigo Branch: Changeset: r49622:ab5c477f2f34 Date: 2011-11-21 16:17 +0100 http://bitbucket.org/pypy/pypy/changeset/ab5c477f2f34/ Log:Disable a half-broken test that fails on Python 2.7 (see comments). diff --git a/pypy/rpython/test/test_rclass.py b/pypy/rpython/test/test_rclass

[pypy-commit] pypy type-specialized-instances: fixed some tests where storage items are erased. there is no general erasing pair anymore so we need to use the methods from the correct AbstractAttribut

2011-11-21 Thread l . diekmann
Author: Lukas Diekmann Branch: type-specialized-instances Changeset: r49624:90348184732d Date: 2011-11-21 16:44 +0100 http://bitbucket.org/pypy/pypy/changeset/90348184732d/ Log:fixed some tests where storage items are erased. there is no general erasing pair anymore so we need to use

[pypy-commit] pypy type-specialized-instances: None should be erased by PlainAttribute

2011-11-21 Thread l . diekmann
Author: Lukas Diekmann Branch: type-specialized-instances Changeset: r49623:510e6bc4ef58 Date: 2011-11-21 16:40 +0100 http://bitbucket.org/pypy/pypy/changeset/510e6bc4ef58/ Log:None should be erased by PlainAttribute diff --git a/pypy/objspace/std/mapdict.py b/pypy/objspace/std/mapdict.py --

[pypy-commit] pypy arm-backend-2: (arigo, bivab) remove a reference to boxes

2011-11-21 Thread bivab
Author: David Schneider Branch: arm-backend-2 Changeset: r49625:5f60920a9b51 Date: 2011-11-21 14:08 +0100 http://bitbucket.org/pypy/pypy/changeset/5f60920a9b51/ Log:(arigo, bivab) remove a reference to boxes diff --git a/pypy/jit/backend/arm/regalloc.py b/pypy/jit/backend/arm/regalloc.py ---

[pypy-commit] pypy arm-backend-2: (arigo, bivab) remove gcremovetypeptr for the arm backend for now

2011-11-21 Thread bivab
Author: David Schneider Branch: arm-backend-2 Changeset: r49627:2c3c610bb2de Date: 2011-11-21 14:31 +0100 http://bitbucket.org/pypy/pypy/changeset/2c3c610bb2de/ Log:(arigo, bivab) remove gcremovetypeptr for the arm backend for now diff --git a/pypy/jit/backend/arm/runner.py b/pypy/jit/backen

[pypy-commit] pypy arm-backend-2: remove another reference to boxes

2011-11-21 Thread bivab
Author: David Schneider Branch: arm-backend-2 Changeset: r49629:406a32f88290 Date: 2011-11-21 15:35 +0100 http://bitbucket.org/pypy/pypy/changeset/406a32f88290/ Log:remove another reference to boxes diff --git a/pypy/jit/backend/arm/regalloc.py b/pypy/jit/backend/arm/regalloc.py --- a/pypy/j

[pypy-commit] pypy arm-backend-2: merge heads

2011-11-21 Thread bivab
Author: David Schneider Branch: arm-backend-2 Changeset: r49632:81bac4da2b46 Date: 2011-11-21 17:12 +0100 http://bitbucket.org/pypy/pypy/changeset/81bac4da2b46/ Log:merge heads ___ pypy-commit mailing list [email protected] http://mail.python.

[pypy-commit] pypy arm-backend-2: more fixes

2011-11-21 Thread bivab
Author: David Schneider Branch: arm-backend-2 Changeset: r49631:b14409bab3b1 Date: 2011-11-21 16:12 +0100 http://bitbucket.org/pypy/pypy/changeset/b14409bab3b1/ Log:more fixes diff --git a/pypy/jit/backend/arm/regalloc.py b/pypy/jit/backend/arm/regalloc.py --- a/pypy/jit/backend/arm/regalloc

[pypy-commit] pypy arm-backend-2: merge default (again)

2011-11-21 Thread bivab
Author: David Schneider Branch: arm-backend-2 Changeset: r49633:2ec66beccfff Date: 2011-11-21 17:13 +0100 http://bitbucket.org/pypy/pypy/changeset/2ec66beccfff/ Log:merge default (again) diff --git a/pypy/rpython/test/test_rclass.py b/pypy/rpython/test/test_rclass.py --- a/pypy/rpython/test/

[pypy-commit] pypy type-specialized-instances: fallback to PlainAttribute on AttributeError. this fix is needed for modules, since they do not have a typedef

2011-11-21 Thread l . diekmann
Author: Lukas Diekmann Branch: type-specialized-instances Changeset: r49634:1ff52ab49127 Date: 2011-11-21 17:34 +0100 http://bitbucket.org/pypy/pypy/changeset/1ff52ab49127/ Log:fallback to PlainAttribute on AttributeError. this fix is needed for modules, since they do not have a typed

[pypy-commit] pypy win64-stage1: more unification of int and long

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49635:b5a4bc7caf97 Date: 2011-11-21 16:12 +0100 http://bitbucket.org/pypy/pypy/changeset/b5a4bc7caf97/ Log:more unification of int and long diff --git a/lib_pypy/pyexpat.py b/lib_pypy/pyexpat.py --- a/lib_pypy/pyexpat.py +++ b/lib_pyp

[pypy-commit] pypy win64-stage1: cleanup of merge conflicts

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49637:0c8590e158a9 Date: 2011-11-21 17:48 +0100 http://bitbucket.org/pypy/pypy/changeset/0c8590e158a9/ Log:cleanup of merge conflicts diff --git a/pypy/rlib/_rffi_stacklet.py b/pypy/rlib/_rffi_stacklet.py --- a/pypy/rlib/_rffi_stackle

[pypy-commit] pypy win64-stage1: bad bad

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49639:ba80ac53c5fb Date: 2011-11-21 18:32 +0100 http://bitbucket.org/pypy/pypy/changeset/ba80ac53c5fb/ Log:bad bad diff --git a/lib_pypy/pyexpat.py b/lib_pypy/pyexpat.py --- a/lib_pypy/pyexpat.py +++ b/lib_pypy/pyexpat.py @@ -371,7 +3

[pypy-commit] pypy win64-stage1: merge heads

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49638:5030492cfa10 Date: 2011-11-21 18:20 +0100 http://bitbucket.org/pypy/pypy/changeset/5030492cfa10/ Log:merge heads diff --git a/pypy/rpython/lltypesystem/rffi.py b/pypy/rpython/lltypesystem/rffi.py --- a/pypy/rpython/lltypesystem

[pypy-commit] pypy default: relevant_environ updated for windows

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: Changeset: r49642:d4d7276882d4 Date: 2011-11-21 19:46 +0100 http://bitbucket.org/pypy/pypy/changeset/d4d7276882d4/ Log:relevant_environ updated for windows diff --git a/pypy/translator/platform/windows.py b/pypy/translator/platform/windows.py --- a/pypy/tra

[pypy-commit] pypy win64-stage1: relevant_environ updated for windows

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49641:8cd49e98e5a5 Date: 2011-11-21 19:43 +0100 http://bitbucket.org/pypy/pypy/changeset/8cd49e98e5a5/ Log:relevant_environ updated for windows diff --git a/pypy/translator/platform/windows.py b/pypy/translator/platform/windows.py --

[pypy-commit] pypy win64-stage1: merged with default

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49643:d3cf57e55482 Date: 2011-11-21 19:50 +0100 http://bitbucket.org/pypy/pypy/changeset/d3cf57e55482/ Log:merged with default ___ pypy-commit mailing list [email protected] http://mail

[pypy-commit] pypy default: Write the recursive possibly-looping case of this logic.

2011-11-21 Thread arigo
Author: Armin Rigo Branch: Changeset: r49645:26947e25881a Date: 2011-11-21 19:55 +0100 http://bitbucket.org/pypy/pypy/changeset/26947e25881a/ Log:Write the recursive possibly-looping case of this logic. diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/pypy/jit/metain

[pypy-commit] pypy default: merge heads

2011-11-21 Thread arigo
Author: Armin Rigo Branch: Changeset: r49646:9106a03c8a60 Date: 2011-11-21 20:01 +0100 http://bitbucket.org/pypy/pypy/changeset/9106a03c8a60/ Log:merge heads diff --git a/pypy/translator/platform/windows.py b/pypy/translator/platform/windows.py --- a/pypy/translator/platform/windows.py +++

[pypy-commit] pypy default: Improve the tests, testing a fully recursive solution.

2011-11-21 Thread arigo
Author: Armin Rigo Branch: Changeset: r49644:7744697c53dd Date: 2011-11-21 19:41 +0100 http://bitbucket.org/pypy/pypy/changeset/7744697c53dd/ Log:Improve the tests, testing a fully recursive solution. diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/pypy/jit/metainte

[pypy-commit] pypy default: Test and fix: instead of using a custom __setattr__ handler

2011-11-21 Thread arigo
Author: Armin Rigo Branch: Changeset: r49647:ddbc82ef4d8f Date: 2011-11-21 20:30 +0100 http://bitbucket.org/pypy/pypy/changeset/ddbc82ef4d8f/ Log:Test and fix: instead of using a custom __setattr__ handler (and no __getattr__, creating confusion), create a bunch of properties. diff

[pypy-commit] pypy numpy-monkeyaround: add test and implementation for transpose, add test for set_shape

2011-11-21 Thread mattip
Author: mattip Branch: numpy-monkeyaround Changeset: r49648:a5ced36cd80a Date: 2011-11-21 22:53 +0200 http://bitbucket.org/pypy/pypy/changeset/a5ced36cd80a/ Log:add test and implementation for transpose, add test for set_shape diff --git a/pypy/module/micronumpy/interp_numarray.py b/pypy/mod

[pypy-commit] pypy win64-stage1: manual merge

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49649:3e561e90ee5a Date: 2011-11-21 23:44 +0100 http://bitbucket.org/pypy/pypy/changeset/3e561e90ee5a/ Log:manual merge diff --git a/lib_pypy/pyrepl/unix_console.py b/lib_pypy/pyrepl/unix_console.py --- a/lib_pypy/pyrepl/unix_console.

[pypy-commit] pypy win64-stage1: Merge with default

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49650:b3b8a737d506 Date: 2011-11-21 23:52 +0100 http://bitbucket.org/pypy/pypy/changeset/b3b8a737d506/ Log:Merge with default diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/pypy/jit/metainterp/optimizeopt/tes

[pypy-commit] Notification: pypy

2011-11-21 Thread Bitbucket
You have received a notification from chronitis. Hi, I forked pypy. My fork is at https://bitbucket.org/chronitis/pypy. -- Disable notifications at https://bitbucket.org/account/notifications/ ___ pypy-commit mailing list [email protected] http://m

[pypy-commit] [OPEN] Pull request #14 for pypy/pypy: py3k sys.hash_info

2011-11-21 Thread Bitbucket
A new pull request has been opened by chronitis. chronitis/pypy has changes to be pulled into pypy/pypy. https://bitbucket.org/pypy/pypy/pull-request/14/py3k-syshash_info Title: py3k sys.hash_info Add missing py3k sys.hash_info struct. Changes to be pulled: 63cd13767ec9 by Gordon Ball: "Add p

[pypy-commit] pypy win64-stage1: forgot this patch for sys.maxint, which has bad consequences.

2011-11-21 Thread ctismer
Author: Christian Tismer Branch: win64-stage1 Changeset: r49652:77ee30370cd7 Date: 2011-11-22 03:44 +0100 http://bitbucket.org/pypy/pypy/changeset/77ee30370cd7/ Log:forgot this patch for sys.maxint, which has bad consequences. Note that this patch must stay until the end of stage 1.

[pypy-commit] pypy default: allow inlining into marshal, which is used in cPickle

2011-11-21 Thread alex_gaynor
Author: Alex Gaynor Branch: Changeset: r49653:bb940ca20b4d Date: 2011-11-21 23:59 -0500 http://bitbucket.org/pypy/pypy/changeset/bb940ca20b4d/ Log:allow inlining into marshal, which is used in cPickle diff --git a/pypy/module/pypyjit/policy.py b/pypy/module/pypyjit/policy.py --- a/pypy/modu

[pypy-commit] pypy default: merged upstream

2011-11-21 Thread alex_gaynor
Author: Alex Gaynor Branch: Changeset: r49654:bdb51cc58e95 Date: 2011-11-22 00:01 -0500 http://bitbucket.org/pypy/pypy/changeset/bdb51cc58e95/ Log:merged upstream diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/pypy/jit/metainterp/optimizeopt/test/test_optimizeopt.p