[pypy-commit] pypy default: merge heads

arigo noreply at buildbot.pypy.org
Wed Sep 14 18:24:16 CEST 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r47270:dfae5033127e
Date: 2011-09-14 18:23 +0200
http://bitbucket.org/pypy/pypy/changeset/dfae5033127e/

Log:	merge heads

diff --git a/pypy/objspace/std/mapdict.py b/pypy/objspace/std/mapdict.py
--- a/pypy/objspace/std/mapdict.py
+++ b/pypy/objspace/std/mapdict.py
@@ -347,7 +347,7 @@
 SLOTS_STARTING_FROM = 3
 
 
-class BaseMapdictObject: # slightly evil to make it inherit from W_Root
+class BaseMapdictObject:
     _mixin_ = True
 
     def _init_empty(self, map):


More information about the pypy-commit mailing list