[pypy-svn] r79346 - in pypy/release/1.4.x: . pypy pypy/jit/metainterp/optimizeopt pypy/module/array/benchmark pypy/module/array/test pypy/rlib pypy/rlib/test pypy/translator/goal pypy/translator/goal/test2

[agaynor at codespeak.net]

Author: agaynor
Date: Mon Nov 22 15:26:02 2010
New Revision: 79346

Modified:
   pypy/release/1.4.x/   (props changed)
   pypy/release/1.4.x/pypy/   (props changed)
   pypy/release/1.4.x/pypy/jit/metainterp/optimizeopt/optimizer.py   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/Makefile   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/intimg.c   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/intimgtst.c   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/intimgtst.py   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/loop.c   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/sum.c   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/sumtst.c   (props changed)
   pypy/release/1.4.x/pypy/module/array/benchmark/sumtst.py   (props changed)
   pypy/release/1.4.x/pypy/module/array/test/test_array_old.py   (props changed)
   pypy/release/1.4.x/pypy/rlib/rerased.py   (props changed)
   pypy/release/1.4.x/pypy/rlib/test/test_rerased.py   (props changed)
   pypy/release/1.4.x/pypy/translator/goal/app_main.py
   pypy/release/1.4.x/pypy/translator/goal/test2/test_app_main.py
Log:
Merged 79161 from trunk.


Modified: pypy/release/1.4.x/pypy/translator/goal/app_main.py
==============================================================================
--- pypy/release/1.4.x/pypy/translator/goal/app_main.py	(original)
+++ pypy/release/1.4.x/pypy/translator/goal/app_main.py	Mon Nov 22 15:26:02 2010
@@ -362,6 +362,9 @@
     try:
         if run_command:
             # handle the "-c" command
+            # Put '' on sys.path
+            sys.path.insert(0, '')
+
             def run_it():
                 exec cmd in mainmodule.__dict__
             success = run_toplevel(run_it)

Modified: pypy/release/1.4.x/pypy/translator/goal/test2/test_app_main.py
==============================================================================
--- pypy/release/1.4.x/pypy/translator/goal/test2/test_app_main.py	(original)
+++ pypy/release/1.4.x/pypy/translator/goal/test2/test_app_main.py	Mon Nov 22 15:26:02 2010
@@ -496,6 +496,9 @@
         assert repr(str(tmpdir.join('otherpath'))) in data
         assert "''" not in data
 
+        data = self.run('-c "import sys; print sys.path"')
+        assert data.startswith("[''")
+
 
 class AppTestAppMain: