[pypy-commit] pypy app_main-refactor: rpython fix, and fix checkmodule to run with sys

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: app_main-refactor
Changeset: r55515:26189d7c5fb5
Date: 2012-06-08 17:54 +0200
http://bitbucket.org/pypy/pypy/changeset/26189d7c5fb5/

Log:	rpython fix, and fix checkmodule to run with sys

diff --git a/pypy/module/sys/initpath.py b/pypy/module/sys/initpath.py
--- a/pypy/module/sys/initpath.py
+++ b/pypy/module/sys/initpath.py
@@ -41,7 +41,7 @@
 
 
 def readlink_maybe(filename):
-    if hasattr(os, 'readlink'):
+    if not IS_WINDOWS:
         return os.readlink(filename)
     raise NotImplementedError
 
diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py
--- a/pypy/objspace/fake/objspace.py
+++ b/pypy/objspace/fake/objspace.py
@@ -158,6 +158,8 @@
         if isinstance(x, r_singlefloat):
             self._wrap_not_rpython(x)
         if isinstance(x, list):
+            if x == []: # special case: it is used e.g. in sys/__init__.py
+                return w_some_obj()
             self._wrap_not_rpython(x)
         return w_some_obj()
     wrap._annspecialcase_ = "specialize:argtype(1)"