[pypy-svn] r38232 - pypy/dist/lib-python

[antocuni at codespeak.net]

Author: antocuni
Date: Fri Feb  9 11:45:39 2007
New Revision: 38232

Modified:
   pypy/dist/lib-python/conftest.py
Log:
- on windows sysexec return value contains \r\n instead of \n. Strip the
  lines to remove potential \r.

- don't remove 'rev' from info, because it will be needed also later.



Modified: pypy/dist/lib-python/conftest.py
==============================================================================
--- pypy/dist/lib-python/conftest.py	(original)
+++ pypy/dist/lib-python/conftest.py	Fri Feb  9 11:45:39 2007
@@ -812,7 +812,7 @@
             'print sys.version; '
             'print sys.pypy_svn_url; '
             'print sys.pypy_translation_info; ')
-        lines = text.split('\n')
+        lines = [line.strip() for line in text.split('\n')]
         assert len(lines) == 4 and lines[3] == ''
         assert lines[2].startswith('{') and lines[2].endswith('}')
         info = eval(lines[2])
@@ -976,7 +976,7 @@
         result['pypy-revision'] = getrev(pypydir) 
         if option.use_compiled:
             execpath, info = getexecutable()
-            result['pypy-revision'] = info.pop('rev')
+            result['pypy-revision'] = info['rev'] # info.pop('rev')
             result['executable'] = execpath.basename
             for key, value in info.items():
                 result['executable-%s' % key] = str(value)