diff options
author | Thibault Saunier <tsaunier@gnome.org> | 2015-12-03 14:41:38 +0100 |
---|---|---|
committer | Thibault Saunier <tsaunier@gnome.org> | 2015-12-04 10:17:49 +0100 |
commit | 33b2a414e9f985da6e2149f4bab4512f00b400d0 (patch) | |
tree | 97a3591b986a4fdc9ec5b2e80b608bcb54be49b2 | |
parent | 33558cd9799d7e1d056ccd5946c8cb575c760ffd (diff) | |
download | meson-33b2a414e9f985da6e2149f4bab4512f00b400d0.zip meson-33b2a414e9f985da6e2149f4bab4512f00b400d0.tar.gz meson-33b2a414e9f985da6e2149f4bab4512f00b400d0.tar.bz2 |
Make it working on python 3.3
-rw-r--r-- | interpreter.py | 2 | ||||
-rwxr-xr-x | meson.py | 4 | ||||
-rw-r--r-- | readme.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/interpreter.py b/interpreter.py index cacfe05..f4c09a4 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) @@ -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 @@ -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/ |