Fri Oct 24 17:16:04 CEST 2008

Author: fijal
Date: Fri Oct 24 17:16:02 2008
New Revision: 59378

Modified:
   pypy/trunk/pypy/annotation/test/autopath.py
   pypy/trunk/pypy/bin/autopath.py
   pypy/trunk/pypy/config/autopath.py
   pypy/trunk/pypy/doc/config/autopath.py
   pypy/trunk/pypy/interpreter/astcompiler/test/stdlib_testall.py
   pypy/trunk/pypy/lang/gameboy/tool/autopath.py
   pypy/trunk/pypy/lang/js/autopath.py
   pypy/trunk/pypy/lang/prolog/interpreter/autopath.py
   pypy/trunk/pypy/lang/scheme/autopath.py
   pypy/trunk/pypy/lang/smalltalk/tool/autopath.py
   pypy/trunk/pypy/lib/test2/autopath.py
   pypy/trunk/pypy/module/__builtin__/test/autopath.py
   pypy/trunk/pypy/module/__builtin__/test/test_buffer.py
   pypy/trunk/pypy/module/_codecs/test/autopath.py
   pypy/trunk/pypy/module/_file/test/test_file_extra.py
   pypy/trunk/pypy/module/_sre/test/autopath.py
   pypy/trunk/pypy/module/sys/test/autopath.py
   pypy/trunk/pypy/objspace/std/test/test_complexobject.py
   pypy/trunk/pypy/objspace/std/test/test_set.py
   pypy/trunk/pypy/rlib/parsing/test/autopath.py
   pypy/trunk/pypy/rlib/rsdl/test/autopath.py
   pypy/trunk/pypy/rpython/microbench/autopath.py
   pypy/trunk/pypy/tool/algo/test/autopath.py
   pypy/trunk/pypy/tool/autopath.py
   pypy/trunk/pypy/tool/pytest/autopath.py
   pypy/trunk/pypy/tool/stdlib_opcode.py
   pypy/trunk/pypy/tool/test/autopath.py
   pypy/trunk/pypy/translator/autopath.py
   pypy/trunk/pypy/translator/benchmark/autopath.py
   pypy/trunk/pypy/translator/benchmark/benchmarks.py
   pypy/trunk/pypy/translator/c/autopath.py
   pypy/trunk/pypy/translator/c/test/autopath.py
   pypy/trunk/pypy/translator/cli/test/autopath.py
   pypy/trunk/pypy/translator/goal/autopath.py
   pypy/trunk/pypy/translator/goal/test2/autopath.py
   pypy/trunk/pypy/translator/js/autopath.py
   pypy/trunk/pypy/translator/js/examples/autopath.py
   pypy/trunk/pypy/translator/js/examples/bnb/autopath.py
   pypy/trunk/pypy/translator/microbench/pybench/autopath.py
   pypy/trunk/pypy/translator/sandbox/autopath.py
   pypy/trunk/pypy/translator/sandbox/test/autopath.py
   pypy/trunk/pypy/translator/sandbox/test/test_pypy_interact.py
   pypy/trunk/pypy/translator/test/autopath.py
   pypy/trunk/pypy/translator/tool/autopath.py
Log:
Change 2.4.1 to 2.5.2. Add a new dir in autopath.


Modified: pypy/trunk/pypy/annotation/test/autopath.py
==============================================================================

--- pypy/trunk/pypy/annotation/test/autopath.py	(original)
+++ pypy/trunk/pypy/annotation/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/bin/autopath.py
==============================================================================
--- pypy/trunk/pypy/bin/autopath.py	(original)
+++ pypy/trunk/pypy/bin/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/config/autopath.py
==============================================================================
--- pypy/trunk/pypy/config/autopath.py	(original)
+++ pypy/trunk/pypy/config/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/doc/config/autopath.py
==============================================================================
--- pypy/trunk/pypy/doc/config/autopath.py	(original)
+++ pypy/trunk/pypy/doc/config/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/interpreter/astcompiler/test/stdlib_testall.py
==============================================================================
--- pypy/trunk/pypy/interpreter/astcompiler/test/stdlib_testall.py	(original)
+++ pypy/trunk/pypy/interpreter/astcompiler/test/stdlib_testall.py	Fri Oct 24 17:16:02 2008
@@ -1,4 +1,4 @@
-import pypy 
+from pypy.toolautopath import libpythondir
 import py
 from pypy.interpreter.astcompiler.test.test_compiler import \
         compile_with_astcompiler
@@ -12,8 +12,7 @@
         compile_with_astcompiler(source, mode='exec', space=space)
 
     def test_all(self):
-        p = py.path.local(pypy.__file__).dirpath().dirpath('lib-python',
-                                                           '2.4.1')
+        p = py.path.local(libpythondir)
         files = p.listdir("*.py")
         files.sort()
         for s in files:

Modified: pypy/trunk/pypy/lang/gameboy/tool/autopath.py
==============================================================================
--- pypy/trunk/pypy/lang/gameboy/tool/autopath.py	(original)
+++ pypy/trunk/pypy/lang/gameboy/tool/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/lang/js/autopath.py
==============================================================================
--- pypy/trunk/pypy/lang/js/autopath.py	(original)
+++ pypy/trunk/pypy/lang/js/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/lang/prolog/interpreter/autopath.py
==============================================================================
--- pypy/trunk/pypy/lang/prolog/interpreter/autopath.py	(original)
+++ pypy/trunk/pypy/lang/prolog/interpreter/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/lang/scheme/autopath.py
==============================================================================
--- pypy/trunk/pypy/lang/scheme/autopath.py	(original)
+++ pypy/trunk/pypy/lang/scheme/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/lang/smalltalk/tool/autopath.py
==============================================================================
--- pypy/trunk/pypy/lang/smalltalk/tool/autopath.py	(original)
+++ pypy/trunk/pypy/lang/smalltalk/tool/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/lib/test2/autopath.py
==============================================================================
--- pypy/trunk/pypy/lib/test2/autopath.py	(original)
+++ pypy/trunk/pypy/lib/test2/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/module/__builtin__/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/module/__builtin__/test/autopath.py	(original)
+++ pypy/trunk/pypy/module/__builtin__/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/module/__builtin__/test/test_buffer.py
==============================================================================
--- pypy/trunk/pypy/module/__builtin__/test/test_buffer.py	(original)
+++ pypy/trunk/pypy/module/__builtin__/test/test_buffer.py	Fri Oct 24 17:16:02 2008
@@ -1,5 +1,5 @@
 """Tests some behaviour of the buffer type that is not tested in
-lib-python/2.4.1/test/test_types.py where the stdlib buffer tests live."""
+lib-python/2.5.2/test/test_types.py where the stdlib buffer tests live."""
 import autopath
 
 class AppTestBuffer:

Modified: pypy/trunk/pypy/module/_codecs/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/module/_codecs/test/autopath.py	(original)
+++ pypy/trunk/pypy/module/_codecs/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/module/_file/test/test_file_extra.py
==============================================================================
--- pypy/trunk/pypy/module/_file/test/test_file_extra.py	(original)
+++ pypy/trunk/pypy/module/_file/test/test_file_extra.py	Fri Oct 24 17:16:02 2008
@@ -525,7 +525,7 @@
 
     def test_weakref_dies_before_file_closes(self):
         # Hard-to-reproduce failure (which should now be fixed).
-        # I think that this is how lib-python/modified-2.4.1/test_file.py
+        # I think that this is how lib-python/modified-2.5.2/test_file.py
         # sometimes failed on a Boehm pypy-c.
         import weakref, gc
         fn = self.temptestfile

Modified: pypy/trunk/pypy/module/_sre/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/module/_sre/test/autopath.py	(original)
+++ pypy/trunk/pypy/module/_sre/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/module/sys/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/module/sys/test/autopath.py	(original)
+++ pypy/trunk/pypy/module/sys/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/objspace/std/test/test_complexobject.py
==============================================================================
--- pypy/trunk/pypy/objspace/std/test/test_complexobject.py	(original)
+++ pypy/trunk/pypy/objspace/std/test/test_complexobject.py	Fri Oct 24 17:16:02 2008
@@ -73,7 +73,7 @@
         h = self.helper
         from random import random
         # XXX this test passed but took waaaaay to long
-        # look at dist/lib-python/modified-2.4.1/test/test_complex.py
+        # look at dist/lib-python/modified-2.5.2/test/test_complex.py
         #simple_real = [float(i) for i in xrange(-5, 6)]
         simple_real = [-2.0, 0.0, 1.0]
         simple_complex = [complex(x, y) for x in simple_real for y in simple_real]

Modified: pypy/trunk/pypy/objspace/std/test/test_set.py
==============================================================================
--- pypy/trunk/pypy/objspace/std/test/test_set.py	(original)
+++ pypy/trunk/pypy/objspace/std/test/test_set.py	Fri Oct 24 17:16:02 2008
@@ -1,7 +1,7 @@
 """
 The main test for the set implementation is located
 at:
-    pypy-dist/lib-python/modified-2.4.1/test/test_set.py
+    pypy-dist/lib-python/modified-2.5.2/test/test_set.py
     go there and invoke
     ../../../pypy/bin/py.py test_set.py
 This file just contains some basic tests that make sure, the implementation

Modified: pypy/trunk/pypy/rlib/parsing/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/rlib/parsing/test/autopath.py	(original)
+++ pypy/trunk/pypy/rlib/parsing/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/rlib/rsdl/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/rlib/rsdl/test/autopath.py	(original)
+++ pypy/trunk/pypy/rlib/rsdl/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/rpython/microbench/autopath.py
==============================================================================
--- pypy/trunk/pypy/rpython/microbench/autopath.py	(original)
+++ pypy/trunk/pypy/rpython/microbench/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/tool/algo/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/tool/algo/test/autopath.py	(original)
+++ pypy/trunk/pypy/tool/algo/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/tool/autopath.py
==============================================================================
--- pypy/trunk/pypy/tool/autopath.py	(original)
+++ pypy/trunk/pypy/tool/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/tool/pytest/autopath.py
==============================================================================
--- pypy/trunk/pypy/tool/pytest/autopath.py	(original)
+++ pypy/trunk/pypy/tool/pytest/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/tool/stdlib_opcode.py
==============================================================================
--- pypy/trunk/pypy/tool/stdlib_opcode.py	(original)
+++ pypy/trunk/pypy/tool/stdlib_opcode.py	Fri Oct 24 17:16:02 2008
@@ -6,7 +6,7 @@
 
 def load_opcode():
     import py
-    opcode_path = py.path.local(__file__).dirpath().dirpath().dirpath('lib-python/modified-2.4.1/opcode.py')
+    opcode_path = py.path.local(__file__).dirpath().dirpath().dirpath('lib-python/modified-2.5.2/opcode.py')
     d = {}
     execfile(str(opcode_path), d)
     return d

Modified: pypy/trunk/pypy/tool/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/tool/test/autopath.py	(original)
+++ pypy/trunk/pypy/tool/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/autopath.py	(original)
+++ pypy/trunk/pypy/translator/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/benchmark/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/benchmark/autopath.py	(original)
+++ pypy/trunk/pypy/translator/benchmark/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/benchmark/benchmarks.py
==============================================================================
--- pypy/trunk/pypy/translator/benchmark/benchmarks.py	(original)
+++ pypy/trunk/pypy/translator/benchmark/benchmarks.py	Fri Oct 24 17:16:02 2008
@@ -63,8 +63,9 @@
     return r
 
 def run_pystone(executable='/usr/local/bin/python', n=''):
-    distdir = py.magic.autopath().dirpath().dirpath().dirpath().dirpath()
-    pystone = distdir.join('lib-python').join('2.4.1').join('test').join('pystone.py')
+    from pypy.tool import autopath
+    distdir = py.path.local(autopath.pypydir).dirpath()
+    pyston = py.path.local(autopath.libpythondir).join('test', 'pystone.py')
     txt = run_cmd('"%s" "%s" %s' % (executable, pystone, n))
     return get_result(txt, PYSTONE_PATTERN)
 

Modified: pypy/trunk/pypy/translator/c/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/c/autopath.py	(original)
+++ pypy/trunk/pypy/translator/c/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/c/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/c/test/autopath.py	(original)
+++ pypy/trunk/pypy/translator/c/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/cli/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/cli/test/autopath.py	(original)
+++ pypy/trunk/pypy/translator/cli/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/goal/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/goal/autopath.py	(original)
+++ pypy/trunk/pypy/translator/goal/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/goal/test2/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/goal/test2/autopath.py	(original)
+++ pypy/trunk/pypy/translator/goal/test2/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/js/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/js/autopath.py	(original)
+++ pypy/trunk/pypy/translator/js/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/js/examples/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/js/examples/autopath.py	(original)
+++ pypy/trunk/pypy/translator/js/examples/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/js/examples/bnb/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/js/examples/bnb/autopath.py	(original)
+++ pypy/trunk/pypy/translator/js/examples/bnb/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/microbench/pybench/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/microbench/pybench/autopath.py	(original)
+++ pypy/trunk/pypy/translator/microbench/pybench/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/sandbox/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/sandbox/autopath.py	(original)
+++ pypy/trunk/pypy/translator/sandbox/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/sandbox/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/sandbox/test/autopath.py	(original)
+++ pypy/trunk/pypy/translator/sandbox/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/sandbox/test/test_pypy_interact.py
==============================================================================
--- pypy/trunk/pypy/translator/sandbox/test/test_pypy_interact.py	(original)
+++ pypy/trunk/pypy/translator/sandbox/test/test_pypy_interact.py	Fri Oct 24 17:16:02 2008
@@ -3,8 +3,7 @@
 from pypy.translator.sandbox.pypy_interact import PyPySandboxedProc
 from pypy.translator.interactive import Translation
 
-SITE_PY_CONTENT = open(os.path.join(autopath.pypydir, os.pardir,
-                                    'lib-python', 'modified-2.4.1', 'site.py'),
+SITE_PY_CONTENT = open(os.path.join(autopath.libpythonmodifieddir, 'site.py'),
                        'rb').read()
 ERROR_TEXT = os.strerror(errno.ENOENT)
 
@@ -25,7 +24,7 @@
     assert_(argv[0] == '/bin/pypy-c', "bad argv[0]")
     st = os.lstat('/bin/pypy-c')
     assert_(stat.S_ISREG(st.st_mode), "bad st_mode for /bin/pypy-c")
-    for dirname in ['/bin/lib-python/2.4.1', '/bin/pypy/lib']:
+    for dirname in ['/bin/lib-python/2.5.2', '/bin/pypy/lib']:
         st = os.stat(dirname)
         assert_(stat.S_ISDIR(st.st_mode), "bad st_mode for " + dirname)
     assert_(os.environ.get('PYTHONPATH') is None, "unexpected $PYTHONPATH")
@@ -35,9 +34,9 @@
         pass
     else:
         assert_(False, "os.stat('site') should have failed")
-    st = os.stat('/bin/lib-python/modified-2.4.1/site.py')
+    st = os.stat('/bin/lib-python/modified-2.5.2/site.py')
     assert_(stat.S_ISREG(st.st_mode), "bad st_mode for .../site.py")
-    fd = os.open('/bin/lib-python/modified-2.4.1/site.py', os.O_RDONLY, 0666)
+    fd = os.open('/bin/lib-python/modified-2.5.2/site.py', os.O_RDONLY, 0666)
     length = 8192
     ofs = 0
     while True:

Modified: pypy/trunk/pypy/translator/test/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/test/autopath.py	(original)
+++ pypy/trunk/pypy/translator/test/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

Modified: pypy/trunk/pypy/translator/tool/autopath.py
==============================================================================
--- pypy/trunk/pypy/translator/tool/autopath.py	(original)
+++ pypy/trunk/pypy/translator/tool/autopath.py	Fri Oct 24 17:16:02 2008
@@ -21,6 +21,7 @@
 
 """
 
+import py
 
 def __dirinfo(part):
     """ return (partdir, this_dir) and insert parent of partdir
@@ -128,6 +129,8 @@
 # set guaranteed attributes
 
 pypydir, this_dir = __dirinfo('pypy')
+libpythondir = str(py.path.local(pypydir).dirpath().join('lib-python', '2.5.2'))
+libpythonmodifieddir = str(py.path.local(libpythondir).dirpath().join('modified-2.5.2'))
 
 if __name__ == '__main__':
     __clone()

