[pypy-commit] pypy default: merge

fijal noreply at buildbot.pypy.org
Mon Nov 14 10:56:14 CET 2011


Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r49394:e36e879eb1fe
Date: 2011-11-14 10:55 +0100
http://bitbucket.org/pypy/pypy/changeset/e36e879eb1fe/

Log:	merge

diff --git a/pypy/objspace/std/intobject.py b/pypy/objspace/std/intobject.py
--- a/pypy/objspace/std/intobject.py
+++ b/pypy/objspace/std/intobject.py
@@ -17,7 +17,7 @@
 """
 
 class W_AbstractIntObject(W_Object):
-    pass
+    __slots__ = ()
 
 class W_IntObject(W_AbstractIntObject):
     __slots__ = 'intval'
diff --git a/pypy/objspace/std/iterobject.py b/pypy/objspace/std/iterobject.py
--- a/pypy/objspace/std/iterobject.py
+++ b/pypy/objspace/std/iterobject.py
@@ -5,7 +5,7 @@
 
 
 class W_AbstractIterObject(W_Object):
-    pass
+    __slots__ = ()
 
 class W_AbstractSeqIterObject(W_AbstractIterObject):
     from pypy.objspace.std.itertype import iter_typedef as typedef
diff --git a/pypy/objspace/std/listobject.py b/pypy/objspace/std/listobject.py
--- a/pypy/objspace/std/listobject.py
+++ b/pypy/objspace/std/listobject.py
@@ -12,7 +12,7 @@
 from pypy.interpreter.argument import Signature
 
 class W_AbstractListObject(W_Object):
-    pass
+    __slots__ = ()
 
 class W_ListObject(W_AbstractListObject):
     from pypy.objspace.std.listtype import list_typedef as typedef
diff --git a/pypy/objspace/std/longobject.py b/pypy/objspace/std/longobject.py
--- a/pypy/objspace/std/longobject.py
+++ b/pypy/objspace/std/longobject.py
@@ -9,7 +9,7 @@
 from pypy.rlib.rbigint import rbigint, SHIFT
 
 class W_AbstractLongObject(W_Object):
-    pass
+    __slots__ = ()
 
 class W_LongObject(W_AbstractLongObject):
     """This is a wrapper of rbigint."""
diff --git a/pypy/objspace/std/stringobject.py b/pypy/objspace/std/stringobject.py
--- a/pypy/objspace/std/stringobject.py
+++ b/pypy/objspace/std/stringobject.py
@@ -20,7 +20,7 @@
 from pypy.objspace.std.formatting import mod_format
 
 class W_AbstractStringObject(W_Object):
-    pass
+    __slots__ = ()
 
 class W_StringObject(W_AbstractStringObject):
     from pypy.objspace.std.stringtype import str_typedef as typedef
diff --git a/pypy/objspace/std/tupleobject.py b/pypy/objspace/std/tupleobject.py
--- a/pypy/objspace/std/tupleobject.py
+++ b/pypy/objspace/std/tupleobject.py
@@ -10,7 +10,7 @@
 from pypy.rlib.debug import make_sure_not_resized
 
 class W_AbstractTupleObject(W_Object):
-    pass
+    __slots__ = ()
 
 class W_TupleObject(W_AbstractTupleObject):
     from pypy.objspace.std.tupletype import tuple_typedef as typedef
diff --git a/pypy/objspace/std/unicodeobject.py b/pypy/objspace/std/unicodeobject.py
--- a/pypy/objspace/std/unicodeobject.py
+++ b/pypy/objspace/std/unicodeobject.py
@@ -20,7 +20,7 @@
 from pypy.objspace.std.stringtype import stringstartswith, stringendswith
 
 class W_AbstractUnicodeObject(W_Object):
-    pass
+    __slots__ = ()
 
 class W_UnicodeObject(W_AbstractUnicodeObject):
     from pypy.objspace.std.unicodetype import unicode_typedef as typedef


More information about the pypy-commit mailing list