From 33b2a414e9f985da6e2149f4bab4512f00b400d0 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 3 Dec 2015 14:41:38 +0100 Subject: Make it working on python 3.3 --- interpreter.py | 2 +- meson.py | 4 ++-- readme.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interpreter.py b/interpreter.py index cacfe05e3..f4c09a485 100644 --- a/interpreter.py +++ b/interpreter.py @@ -1150,7 +1150,7 @@ class Interpreter(): raise InvalidCode('First argument to set_variable must be a string.') if not self.is_assignable(variable): 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) if varname in self.builtin: raise InvalidCode('Tried to overwrite internal variable "%s"' % varname) diff --git a/meson.py b/meson.py index e7428ddbd..0ba344747 100755 --- a/meson.py +++ b/meson.py @@ -164,8 +164,8 @@ itself as required.''' pickle.dump(b, open(dumpfile, 'wb')) def run(args): - if sys.version_info < (3, 4): - print('Meson works correctly only with python 3.4+.') + if sys.version_info < (3, 3): + print('Meson works correctly only with python 3.3+.') print('You have python %s.' % sys.version) print('Please update your environment') return 1 diff --git a/readme.txt b/readme.txt index f72104ada..2ecc3462e 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ build system. 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/ -- cgit v1.2.3