[pypy-commit] pypy default: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r75466:3a5aa32cbc44
Date: 2015-01-21 18:45 +0100
http://bitbucket.org/pypy/pypy/changeset/3a5aa32cbc44/

Log:	merge heads

diff --git a/pypy/objspace/std/test/test_mapdict.py b/pypy/objspace/std/test/test_mapdict.py
--- a/pypy/objspace/std/test/test_mapdict.py
+++ b/pypy/objspace/std/test/test_mapdict.py
@@ -144,7 +144,7 @@
     assert obj2.map.back.ever_mutated == True
     assert obj2.map is obj.map
 
-def test_attr_immutability_delete(monkeypatch):
+def test_attr_immutability_delete():
     cls = Class()
     obj = cls.instantiate()
     obj.setdictvalue(space, "a", 10)