Merge Python 3.3 fix.

pull/329/head
Jussi Pakkanen 9 years ago
commit 66ff4a0e91
  1. 7
      compilers.py
  2. 2
      interpreter.py
  3. 4
      meson.py
  4. 2
      readme.txt

@ -406,7 +406,12 @@ int someSymbolHereJustForFun;
cmdlist = self.exe_wrapper + [exename] cmdlist = self.exe_wrapper + [exename]
else: else:
cmdlist = exename cmdlist = exename
pe = subprocess.Popen(cmdlist, stdout=subprocess.PIPE, stderr=subprocess.PIPE) try:
pe = subprocess.Popen(cmdlist, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
except Exception as e:
mlog.debug('Could not run: %s (error: %s)\n' % (cmdlist, e))
return RunResult(False)
(so, se) = pe.communicate() (so, se) = pe.communicate()
so = so.decode() so = so.decode()
se = se.decode() se = se.decode()

@ -1150,7 +1150,7 @@ class Interpreter():
raise InvalidCode('First argument to set_variable must be a string.') raise InvalidCode('First argument to set_variable must be a string.')
if not self.is_assignable(variable): if not self.is_assignable(variable):
raise InvalidCode('Assigned value not of assignable type.') raise InvalidCode('Assigned value not of assignable type.')
if re.fullmatch('[_a-zA-Z][_0-9a-zA-Z]*', varname) is None: if re.match('[_a-zA-Z][_0-9a-zA-Z]*$', varname) is None:
raise InvalidCode('Invalid variable name: ' + varname) raise InvalidCode('Invalid variable name: ' + varname)
if varname in self.builtin: if varname in self.builtin:
raise InvalidCode('Tried to overwrite internal variable "%s"' % varname) raise InvalidCode('Tried to overwrite internal variable "%s"' % varname)

@ -164,8 +164,8 @@ itself as required.'''
pickle.dump(b, open(dumpfile, 'wb')) pickle.dump(b, open(dumpfile, 'wb'))
def run(args): def run(args):
if sys.version_info < (3, 4): if sys.version_info < (3, 3):
print('Meson works correctly only with python 3.4+.') print('Meson works correctly only with python 3.3+.')
print('You have python %s.' % sys.version) print('You have python %s.' % sys.version)
print('Please update your environment') print('Please update your environment')
return 1 return 1

@ -4,7 +4,7 @@ build system.
Dependencies Dependencies
Python http://python.org (version 3.4 or newer) Python http://python.org (version 3.3 or newer)
Ninja http://martine.github.com/ninja/ Ninja http://martine.github.com/ninja/

Loading…
Cancel
Save