[pypy-svn] r75074 - pypy/branch/fast-forward/pypy/module/sys

[benjamin at codespeak.net]

Author: benjamin
Date: Thu Jun  3 21:00:18 2010
New Revision: 75074

Modified:
   pypy/branch/fast-forward/pypy/module/sys/state.py
   pypy/branch/fast-forward/pypy/module/sys/version.py
Log:
move the cpython lib dirname out of a function

Modified: pypy/branch/fast-forward/pypy/module/sys/state.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/sys/state.py	(original)
+++ pypy/branch/fast-forward/pypy/module/sys/state.py	Thu Jun  3 21:00:18 2010
@@ -4,6 +4,7 @@
 import pypy
 from pypy.interpreter.error import OperationError
 from pypy.interpreter.gateway import ObjSpace
+from pypy.module.sys import version
 
 import sys, os, stat, errno
 
@@ -35,12 +36,8 @@
 def getinitialpath(srcdir):
     # build the initial path from the srcdir, which is the path of
     # the "dist" directory of a PyPy checkout.
-    from pypy.module.sys.version import CPYTHON_VERSION
-
-    dirname = '%d.%d.%d' % (CPYTHON_VERSION[0],
-                            CPYTHON_VERSION[1],
-                            CPYTHON_VERSION[2])
     lib_python = os.path.join(srcdir, 'lib-python')
+    dirname = version.CPYTHON_VERSION_DIR
 
     python_std_lib = os.path.join(lib_python, dirname)
     checkdir(python_std_lib)

Modified: pypy/branch/fast-forward/pypy/module/sys/version.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/sys/version.py	(original)
+++ pypy/branch/fast-forward/pypy/module/sys/version.py	Thu Jun  3 21:00:18 2010
@@ -6,6 +6,10 @@
 
 CPYTHON_VERSION            = (2, 7, 0, "beta", 42)
 CPYTHON_API_VERSION        = 1012
+CPYTHON_VERSION_DIR        = '%d.%d.%d' % (CPYTHON_VERSION[0],
+                                           CPYTHON_VERSION[1],
+                                           CPYTHON_VERSION[2])
+
 
 PYPY_VERSION               = (1, 2, 0, "beta", '?')
 # the last item is replaced by the svn revision ^^^