[pypy-svn] r5049 - pypy/trunk/src/pypy/module

[arigo at codespeak.net]

Author: arigo
Date: Fri Jun 11 14:19:54 2004
New Revision: 5049

Modified:
   pypy/trunk/src/pypy/module/sysinterp.py
   pypy/trunk/src/pypy/module/sysmodule.py
Log:
Renamed w_path into w_initialpath.
Seems that our autopath.py is buggy and removes .../appspace from sys.path.


Modified: pypy/trunk/src/pypy/module/sysinterp.py
==============================================================================
--- pypy/trunk/src/pypy/module/sysinterp.py	(original)
+++ pypy/trunk/src/pypy/module/sysinterp.py	Fri Jun 11 14:19:54 2004
@@ -63,7 +63,7 @@
 # Initialize the default path
 srcdir = os.path.dirname(autopath.pypydir)
 appdir = os.path.join(autopath.pypydir, 'appspace')
-w_path = space.newlist([space.wrap(''), space.wrap(appdir)] +
+w_initialpath = space.newlist([space.wrap(''), space.wrap(appdir)] +
                        [space.wrap(p) for p in cpy_sys.path if p!= srcdir])
 
 # XXX - Replace with appropriate PyPy version numbering

Modified: pypy/trunk/src/pypy/module/sysmodule.py
==============================================================================
--- pypy/trunk/src/pypy/module/sysmodule.py	(original)
+++ pypy/trunk/src/pypy/module/sysmodule.py	Fri Jun 11 14:19:54 2004
@@ -5,7 +5,8 @@
 __interplevel__execfile('sysinterp.py')
 
 # Common data structures
-from __interplevel__ import path, modules, argv
+from __interplevel__ import initialpath as path
+from __interplevel__ import modules, argv
 from __interplevel__ import warnoptions, builtin_module_names
 
 # Objects from interpreter-level