Author: Tim Felgentreff <[email protected]>
Branch:
Changeset: r259:f80ccde97eb0
Date: 2013-04-12 10:26 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/f80ccde97eb0/
Log: Open files in binary mode, to avoid automatic line-conversion on
windows
diff --git a/spyvm/test/test_miniimage.py b/spyvm/test/test_miniimage.py
--- a/spyvm/test/test_miniimage.py
+++ b/spyvm/test/test_miniimage.py
@@ -28,7 +28,7 @@
return perform(space.wrap_string(name), "asSymbol")
def open_miniimage(space):
- return squeakimage.reader_for_image(space,
squeakimage.Stream(mini_image.open()))
+ return squeakimage.reader_for_image(space,
squeakimage.Stream(mini_image.open(mode="rb")))
def get_reader():
return reader
diff --git a/spyvm/tool/analyseimage.py b/spyvm/tool/analyseimage.py
--- a/spyvm/tool/analyseimage.py
+++ b/spyvm/tool/analyseimage.py
@@ -11,10 +11,10 @@
minitest_image = image_dir.join('minitest.image')
def get_miniimage(space):
- return squeakimage.reader_for_image(space,
squeakimage.Stream(mini_image.open()))
+ return squeakimage.reader_for_image(space,
squeakimage.Stream(mini_image.open(mode="rb")))
def get_minitestimage(space):
- return squeakimage.reader_for_image(space,
squeakimage.Stream(minitest_image.open()))
+ return squeakimage.reader_for_image(space,
squeakimage.Stream(minitest_image.open(mode="rb")))
def create_image(space, image_reader):
image_reader.initialize()
diff --git a/targetimageloadingsmalltalk.py b/targetimageloadingsmalltalk.py
--- a/targetimageloadingsmalltalk.py
+++ b/targetimageloadingsmalltalk.py
@@ -90,7 +90,7 @@
path = "Squeak.image"
try:
- f = open_file_as_stream(path, buffering=0)
+ f = open_file_as_stream(path, mode="rb", buffering=0)
except OSError as e:
os.write(2, "%s -- %s (LoadError)\n" % (os.strerror(e.errno), path))
return 1
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
