[pypy-svn] r71801 - in pypy/release/1.2.x/pypy/config: . test

[arigo at codespeak.net]

Author: arigo
Date: Fri Mar  5 15:16:49 2010
New Revision: 71801

Modified:
   pypy/release/1.2.x/pypy/config/pypyoption.py
   pypy/release/1.2.x/pypy/config/test/test_pypyoption.py
Log:
svn merge svn+ssh://codespeak.net/svn/pypy/trunk -r71789:71790


Modified: pypy/release/1.2.x/pypy/config/pypyoption.py
==============================================================================
--- pypy/release/1.2.x/pypy/config/pypyoption.py	(original)
+++ pypy/release/1.2.x/pypy/config/pypyoption.py	Fri Mar  5 15:16:49 2010
@@ -325,7 +325,6 @@
         config.objspace.opcodes.suggest(CALL_LIKELY_BUILTIN=True)
     if level in ['2', '3', 'jit']:
         config.objspace.opcodes.suggest(CALL_METHOD=True)
-        config.objspace.std.suggest(withshadowtracking=True)
         config.objspace.std.suggest(withrangelist=True)
         config.objspace.std.suggest(withmethodcache=True)
         config.objspace.std.suggest(withprebuiltchar=True)

Modified: pypy/release/1.2.x/pypy/config/test/test_pypyoption.py
==============================================================================
--- pypy/release/1.2.x/pypy/config/test/test_pypyoption.py	(original)
+++ pypy/release/1.2.x/pypy/config/test/test_pypyoption.py	Fri Mar  5 15:16:49 2010
@@ -47,7 +47,7 @@
 def test_set_pypy_opt_level():
     conf = get_pypy_config()
     set_pypy_opt_level(conf, '2')
-    assert conf.objspace.std.withshadowtracking
+    assert conf.objspace.std.withsharingdict
     conf = get_pypy_config()
     set_pypy_opt_level(conf, '0')
     assert not conf.objspace.std.newshortcut