merged the fix for the python detection from waf 1.7 (strings with double quotes...
authorThomas Nagy <tnagy2pow10@gmail.com>
Tue, 19 Jun 2012 23:19:33 +0000 (01:19 +0200)
committerThomas Nagy <tnagy2pow10@gmail.com>
Tue, 19 Jun 2012 23:19:33 +0000 (01:19 +0200)
wafadmin/Tools/python.py

index 511cf09..c2af312 100644 (file)
@@ -136,8 +136,8 @@ def _get_python_variables(python_exe, variables, imports=['import sys']):
                        continue
                if s == 'None':
                        return_values.append(None)
-               elif s[0] == "'" and s[-1] == "'":
-                       return_values.append(s[1:-1])
+               elif (s[0] == "'" and s[-1] == "'") or (s[0] == '"' and s[-1] == '"'):
+                       return_values.append(eval(s))
                elif s[0].isdigit():
                        return_values.append(int(s))
                else: break