[pypy-svn] r39222 - in pypy/dist/pypy: bin translator/goal

[ac at codespeak.net]

Author: ac
Date: Tue Feb 20 11:40:05 2007
New Revision: 39222

Modified:
   pypy/dist/pypy/bin/py.py
   pypy/dist/pypy/translator/goal/app_main.py
Log:
Import site module on startup.

Modified: pypy/dist/pypy/bin/py.py
==============================================================================
--- pypy/dist/pypy/bin/py.py	(original)
+++ pypy/dist/pypy/bin/py.py	Tue Feb 20 11:40:05 2007
@@ -13,7 +13,7 @@
 
 from pypy.tool import option
 from py.compat.optparse import make_option
-from pypy.interpreter import main, interactive, error
+from pypy.interpreter import main, interactive, error, gateway
 from pypy.config.config import OptionDescription, BoolOption, StrOption
 from pypy.config.config import Config, to_optparse
 import os, sys
@@ -37,6 +37,15 @@
               default=None, cmdline="-c"),
     ])
 
+pypy_init = gateway.applevel('''
+def pypy_init():
+    try:
+        import site
+    except:
+        import sys
+        print >> sys.stderr, "import site' failed"
+
+''').interphook('pypy_init')
 def main_(argv=None):
     starttime = time.time()
     config, parser = option.get_standard_options()
@@ -90,6 +99,7 @@
     try:
         def do_start():
             space.startup()
+            pypy_init(space)
         if main.run_toplevel(space, do_start,
                              verbose=interactiveconfig.verbose):
             # compile and run it

Modified: pypy/dist/pypy/translator/goal/app_main.py
==============================================================================
--- pypy/dist/pypy/translator/goal/app_main.py	(original)
+++ pypy/dist/pypy/translator/goal/app_main.py	Tue Feb 20 11:40:05 2007
@@ -214,6 +214,12 @@
     mainmodule = type(sys)('__main__')
     sys.modules['__main__'] = mainmodule
 
+    try:
+        import site
+    except:
+        print >> sys.stderr, "import site' failed"
+
+
     # set up the Ctrl-C => KeyboardInterrupt signal handler, if the
     # signal module is available
     try: