[pypy-svn] r8665 - in pypy/dist: lib-2.3.4 lib-python-2.3.4 pypy/lib pypy/lib/test pypy/module

[hpk at codespeak.net]

Author: hpk
Date: Fri Jan 28 17:28:53 2005
New Revision: 8665

Added:
   pypy/dist/lib-2.3.4/
      - copied from r8664, vendor/cpython/Python-r234/dist/src/Lib/
   pypy/dist/pypy/lib/   (props changed)
   pypy/dist/pypy/lib/_exceptions.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/_exceptions.py
   pypy/dist/pypy/lib/_file.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/_file.py
   pypy/dist/pypy/lib/_float_formatting.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/_float_formatting.py
   pypy/dist/pypy/lib/_formatting.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/_formatting.py
   pypy/dist/pypy/lib/_types.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/_types.py
   pypy/dist/pypy/lib/cStringIO.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/cStringIO.py
   pypy/dist/pypy/lib/cmath.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/cmath.py
   pypy/dist/pypy/lib/dumbre.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/dumbre.py
   pypy/dist/pypy/lib/imp.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/imp.py
   pypy/dist/pypy/lib/md5.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/md5.py
   pypy/dist/pypy/lib/operator.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/operator.py
   pypy/dist/pypy/lib/plexre.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/plexre.py
   pypy/dist/pypy/lib/sha.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/sha.py
   pypy/dist/pypy/lib/sio.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/sio.py
   pypy/dist/pypy/lib/sre_parse.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/sre_parse.py
   pypy/dist/pypy/lib/struct.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/struct.py
   pypy/dist/pypy/lib/test/   (props changed)
   pypy/dist/pypy/lib/test/__init__.py   (contents, props changed)
   pypy/dist/pypy/lib/test/conftest.py   (contents, props changed)
   pypy/dist/pypy/lib/test/pystone.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/test/pystone.py
   pypy/dist/pypy/lib/test/test_sio.py
      - copied, changed from r8660, pypy/dist/lib-python-2.3.4/test/test_sio.py
   pypy/dist/pypy/lib/types.py
      - copied unchanged from r8660, pypy/dist/lib-python-2.3.4/types.py
Removed:
   pypy/dist/lib-python-2.3.4/
Modified:
   pypy/dist/pypy/module/sysinterp.py
Log:
ok, after discussion with armin, samuele and christian 
this is the first step to implement the new structure: 

    dist/lib-2.3.4 (soon to be dist/lib-python-2.3.4.) 
        contains the original cpython 2.3.4 library + tests 

    dist/pypy/lib 
        contains the pypy overrides and modifications 
        at applevel 

    dist/pypy/module 
        contains the pypy overrides at interplevel 
       
Probably we'll discover that we want to do it slightly
differently at some point but this should provide a
sane starting point and more exact references ... 



Added: pypy/dist/pypy/lib/test/__init__.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/lib/test/__init__.py	Fri Jan 28 17:28:53 2005
@@ -0,0 +1 @@
+#

Added: pypy/dist/pypy/lib/test/conftest.py
==============================================================================
--- (empty file)
+++ pypy/dist/pypy/lib/test/conftest.py	Fri Jan 28 17:28:53 2005
@@ -0,0 +1,5 @@
+import py
+
+class Directory(py.test.collect.Directory): 
+    def __iter__(self): 
+        return iter([])

Copied: pypy/dist/pypy/lib/test/test_sio.py (from r8660, pypy/dist/lib-python-2.3.4/test/test_sio.py)
==============================================================================
--- pypy/dist/lib-python-2.3.4/test/test_sio.py	(original)
+++ pypy/dist/pypy/lib/test/test_sio.py	Fri Jan 28 17:28:53 2005
@@ -4,8 +4,6 @@
 import time
 from pypy.tool.udir import udir
 
-from pypy.appspace import sio 
-
 class TestSource(object):
 
     def __init__(self, packets):

Modified: pypy/dist/pypy/module/sysinterp.py
==============================================================================
--- pypy/dist/pypy/module/sysinterp.py	(original)
+++ pypy/dist/pypy/module/sysinterp.py	Fri Jan 28 17:28:53 2005
@@ -61,14 +61,15 @@
 import os
 from pypy.interpreter import autopath
 srcdir = os.path.dirname(autopath.pypydir)
-appdir = os.path.join(autopath.pypydir, 'appspace')
-python_std_lib = os.path.join(autopath.pypydir, '..','lib-python-2.3.4') 
+python_std_lib = os.path.normpath(
+        os.path.join(autopath.pypydir, '..','lib-2.3.4'))
+pypy_override_lib = os.path.join(autopath.pypydir, 'lib') 
 assert os.path.exists(python_std_lib) 
 del os, autopath # XXX for the translator. Something is very wrong around here.
 
 w_initialpath = space.newlist([space.wrap(''), 
+                       space.wrap(pypy_override_lib), 
                        space.wrap(python_std_lib), 
-                       #space.wrap(appdir), 
                        ] +
                        [space.wrap(p) for p in cpy_sys.path if p!= srcdir])