[pypy-commit] lang-smalltalk rbitblt: use rpath

timfel noreply at buildbot.pypy.org
Thu Jan 16 15:04:33 CET 2014


Author: Tim Felgentreff <timfelgentreff at gmail.com>
Branch: rbitblt
Changeset: r569:66cea7643c37
Date: 2014-01-10 11:36 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/66cea7643c37/

Log:	use rpath

diff --git a/targetimageloadingsmalltalk.py b/targetimageloadingsmalltalk.py
--- a/targetimageloadingsmalltalk.py
+++ b/targetimageloadingsmalltalk.py
@@ -2,7 +2,7 @@
 import os
 
 from rpython.rlib.streamio import open_file_as_stream
-from rpython.rlib import jit
+from rpython.rlib import jit, rpath
 
 from spyvm import model, interpreter, squeakimage, objspace, wrapper,\
     error, shadow
@@ -191,9 +191,7 @@
     if path is None:
         path = "Squeak.image"
 
-    path = os.path.join(os.getcwd(), path)
-    if os.name == "nt":
-        path = path.replace("/", "\\")
+    path = rpath.rabspath(path)
     try:
         f = open_file_as_stream(path, mode="rb", buffering=0)
     except OSError as e:


More information about the pypy-commit mailing list