[pypy-svn] r15228 - in pypy/dist/pypy: lib module/__builtin__ objspace/std

[arigo at codespeak.net]

Author: arigo
Date: Thu Jul 28 12:03:33 2005
New Revision: 15228

Added:
   pypy/dist/pypy/lib/marshal.py   (contents, props changed)
Modified:
   pypy/dist/pypy/module/__builtin__/importing.py
   pypy/dist/pypy/objspace/std/objspace.py
Log:
For now, disable pyc file support.  This creates more mysterious umph-ish 
bootstrapping problems that we want to worry about at the moment.


Added: pypy/dist/pypy/lib/marshal.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/lib/marshal.py	Thu Jul 28 12:03:33 2005
@@ -0,0 +1,3 @@
+# temporary
+from _marshal import __doc__
+from _marshal import *

Modified: pypy/dist/pypy/module/__builtin__/importing.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/importing.py	(original)
+++ pypy/dist/pypy/module/__builtin__/importing.py	Thu Jul 28 12:03:33 2005
@@ -48,7 +48,7 @@
         pyfile_exist = False
     
     pycfile = filepart + ".pyc"    
-    if os.path.exists(pycfile):
+    if 0:  # os.path.exists(pycfile):       # DISABLED PYC FILES FOR NOW
         pyc_state = check_compiled_module(space, pyfile, pyfile_ts, pycfile)
         pycfile_exists = pyc_state >= 0
         pycfile_ts_valid = pyc_state > 0 and pyfile_exist
@@ -365,9 +365,10 @@
                       w(space.builtin))
     pycode.exec_code(space, w_dict, w_dict) 
 
-    mtime = os.fstat(osfile.fd)[stat.ST_MTIME]
-    cpathname = pathname + 'c'
-    write_compiled_module(space, pycode, cpathname, mtime)
+    if 0:        # DISABLED PYC FILES FOR NOW
+        mtime = os.fstat(osfile.fd)[stat.ST_MTIME]
+        cpathname = pathname + 'c'
+        write_compiled_module(space, pycode, cpathname, mtime)
 
     return w_mod
 

Modified: pypy/dist/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/std/objspace.py	(original)
+++ pypy/dist/pypy/objspace/std/objspace.py	Thu Jul 28 12:03:33 2005
@@ -81,7 +81,8 @@
         self.setup_old_style_classes()
 
         # early bootstrap for marshal
-        self.sys.setmodule(self.setup_marshal())
+        if 0:    # DISABLED PYC FILES FOR NOW
+            self.sys.setmodule(self.setup_marshal())
 
         # fix up a problem where multimethods apparently don't 
         # like to define this at interp-level