[pypy-svn] r59892 - pypy/build/benchmem

[xoraxax at codespeak.net]

Author: xoraxax
Date: Wed Nov 12 15:08:54 2008
New Revision: 59892

Modified:
   pypy/build/benchmem/runbench.py
Log:
Do the pythonpath setup differently to allow import of packages from benchmem.

Modified: pypy/build/benchmem/runbench.py
==============================================================================
--- pypy/build/benchmem/runbench.py	(original)
+++ pypy/build/benchmem/runbench.py	Wed Nov 12 15:08:54 2008
@@ -34,7 +34,7 @@
     def getbenchsource(self):
         preamble = """
             import sys
-            sys.path.append(%r)
+            sys.path.insert(0, %r)
         """ % (str(benchmarkdir), )
         return py.code.Source(preamble, self.benchpath.read())
 
@@ -237,10 +237,10 @@
         runner_file = self.tmpdir.join("runner.py")
         runner_file.write(py.code.Source("""
             import sys
-            sys.path.append(%r)
-            from %s import init
+            sys.path.insert(0, %r)
+            from generatedbenchmark import init
             init()
-        """ % (str(self.tmpdir), self.benchpath.basename[:-3])))
+        """ % (str(self.tmpdir), )))
         source = py.code.Source("""
             import sys, gc, os
             def write(c):
@@ -258,7 +258,7 @@
                 sys.stdin.close()
 
         """ %(name, arglist))
-        p = self.tmpdir.join(self.benchpath.basename)
+        p = self.tmpdir.join("generatedbenchmark.py")
         p.write(source)
         return runner_file