[Scipy-svn] r6804 - trunk

scipy-svn@scip... scipy-svn@scip...
Mon Sep 13 14:53:39 CDT 2010


Author: ptvirtan
Date: 2010-09-13 14:53:39 -0500 (Mon, 13 Sep 2010)
New Revision: 6804

Modified:
   trunk/setup.py
Log:
3K: setup.py: fix svn_version on Python 3

Modified: trunk/setup.py
===================================================================
--- trunk/setup.py	2010-09-12 22:11:24 UTC (rev 6803)
+++ trunk/setup.py	2010-09-13 19:53:39 UTC (rev 6804)
@@ -54,6 +54,8 @@
 
 # Return the svn version as a string, raise a ValueError otherwise
 def svn_version():
+    from numpy.compat import asstr
+
     env = os.environ.copy()
     env['LC_ALL'] = 'C'
     try:
@@ -65,7 +67,7 @@
 
     r = re.compile('Revision: ([0-9]+)')
     svnver = None
-    for line in out.split('\n'):
+    for line in asstr(out).split('\n'):
         m = r.match(line)
         if m:
             svnver = m.group(1)



More information about the Scipy-svn mailing list