[pypy-commit] lang-smalltalk storage-cleanups: Turned from_reader() method into the constructor.

[anton_gulenko]

Author: Anton Gulenko <anton.gulenko at googlemail.com>
Branch: storage-cleanups
Changeset: r1013:15238f6b9b23
Date: 2014-08-05 19:42 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/15238f6b9b23/

Log:	Turned from_reader() method into the constructor.

diff --git a/spyvm/squeakimage.py b/spyvm/squeakimage.py
--- a/spyvm/squeakimage.py
+++ b/spyvm/squeakimage.py
@@ -219,9 +219,7 @@
 def parse_image(space, stream):
     image_reader = reader_for_image(space, stream)
     image_reader.read_all()
-    image = SqueakImage()
-    image.from_reader(space, image_reader)
-    return image
+    return SqueakImage(space, image_reader)
 
 class ImageReader(object):
 
@@ -385,7 +383,7 @@
     _immutable_fields_ = ["w_asSymbol", "w_simulateCopyBits", "version",
                           "is_modern", "startup_time"]
 
-    def from_reader(self, space, reader):
+    def __init__(self, space, reader):
         self.special_objects = [g_object.w_object for g_object in
                                 reader.chunks[reader.specialobjectspointer]
                                 .g_object.pointers]
diff --git a/spyvm/test/util.py b/spyvm/test/util.py
--- a/spyvm/test/util.py
+++ b/spyvm/test/util.py
@@ -16,8 +16,7 @@
     space = create_space(bootstrap)
     reader = open_reader(space, image_filename)
     reader.read_all()
-    image = squeakimage.SqueakImage()
-    image.from_reader(space, reader)
+    image = squeakimage.SqueakImage(space, reader)
     interp = TestInterpreter(space, image)
     return space, interp, image, reader