[pypy-svn] r12602 - in pypy/dist/pypy: documentation interpreter module module/__builtin__ module/__builtin__/test module/builtin module/sys module/sys2 translator

[hpk at codespeak.net]

Author: hpk
Date: Fri May 20 09:32:35 2005
New Revision: 12602

Added:
   pypy/dist/pypy/module/README.txt
   pypy/dist/pypy/module/__builtin__/
      - copied from r12601, pypy/dist/pypy/module/builtin/
   pypy/dist/pypy/module/sys/
      - copied from r12601, pypy/dist/pypy/module/sys2/
Removed:
   pypy/dist/pypy/module/builtin/
   pypy/dist/pypy/module/sys2/
Modified:
   pypy/dist/pypy/documentation/coding-guide.txt
   pypy/dist/pypy/interpreter/baseobjspace.py
   pypy/dist/pypy/module/__builtin__/test/test_complexobject.py
   pypy/dist/pypy/translator/ann_override.py
Log:
issue51 testing 

this got finally sensible after Chris's recent checkins: 

- renamed sys2 to sys 

- renamed builtin to __builtin__ 

- put a README into pypy/module warning against putting .py
  files in there 

- fixed all the references to sys2 and modules (i hope) 



Modified: pypy/dist/pypy/documentation/coding-guide.txt
==============================================================================
--- pypy/dist/pypy/documentation/coding-guide.txt	(original)
+++ pypy/dist/pypy/documentation/coding-guide.txt	Fri May 20 09:32:35 2005
@@ -451,7 +451,7 @@
 
     >>>> import sys
     >>>> sys.__file__
-    '/home/hpk/pypy-dist/pypy/module/sys2/__init__.pyc'
+    '/home/hpk/pypy-dist/pypy/module/sys/__init__.pyc'
 
     >>>> import operator
     >>>> operator.__file__
@@ -476,7 +476,7 @@
 *pypy/modules* 
 
     mixed interpreter/app-level builtin modules, such as 
-    the sys and builtin module. 
+    the ``sys`` and ``__builtin__`` module. 
 
 *contents of PYTHONPATH* 
     

Modified: pypy/dist/pypy/interpreter/baseobjspace.py
==============================================================================
--- pypy/dist/pypy/interpreter/baseobjspace.py	(original)
+++ pypy/dist/pypy/interpreter/baseobjspace.py	Fri May 20 09:32:35 2005
@@ -117,13 +117,13 @@
     def make_builtins(self):
         "NOT_RPYTHON: only for initializing the space."
 
-        from pypy.module.sys2 import Module 
+        from pypy.module.sys import Module 
         w_name = self.wrap('sys')
         self.sys = Module(self, w_name) 
         w_modules = self.sys.get('modules')
         self.setitem(w_modules, w_name, self.wrap(self.sys))
 
-        from pypy.module.builtin import Module 
+        from pypy.module.__builtin__ import Module 
         w_name = self.wrap('__builtin__')
         self.builtin = Module(self, w_name) 
         w_builtin = self.wrap(self.builtin)

Added: pypy/dist/pypy/module/README.txt
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/module/README.txt	Fri May 20 09:32:35 2005
@@ -0,0 +1,10 @@
+
+this directory contains PyPy's builtin module implementation
+that require access to interpreter level.  See here
+for more information: 
+
+    http://codespeak.net/pypy/index.cgi?doc/coding-guide.html#modules-in-pypy
+
+ATTENTION: don't put any '.py' files directly into pypy/module 
+because you can easily get import mixups on e.g. "import sys" 
+then (Python tries relative imports first). 

Modified: pypy/dist/pypy/module/__builtin__/test/test_complexobject.py
==============================================================================
--- pypy/dist/pypy/module/builtin/test/test_complexobject.py	(original)
+++ pypy/dist/pypy/module/__builtin__/test/test_complexobject.py	Fri May 20 09:32:35 2005
@@ -25,7 +25,7 @@
 import sys
 import types
 
-from pypy.module.builtin.app_complex import complex as pycomplex
+from pypy.module.__builtin__.app_complex import complex as pycomplex
 
 try:
     unicode

Modified: pypy/dist/pypy/translator/ann_override.py
==============================================================================
--- pypy/dist/pypy/translator/ann_override.py	(original)
+++ pypy/dist/pypy/translator/ann_override.py	Fri May 20 09:32:35 2005
@@ -5,7 +5,7 @@
 from pypy.interpreter import error
 from pypy.interpreter import pyframe
 from pypy.objspace.std import fake
-from pypy.module.sys2 import state as sys_state
+from pypy.module.sys import state as sys_state
 import pypy.interpreter.typedef as itypedef
 import pypy.interpreter.pycode as pycode
 import pypy.interpreter.compiler as icompiler