diff options
| author | Mathieu Duponchelle <mathieu@centricular.com> | 2018-05-21 00:19:31 +0200 |
|---|---|---|
| committer | Mathieu Duponchelle <mathieu@centricular.com> | 2018-05-21 00:19:31 +0200 |
| commit | 10e7566ed84251dcec6ee4ff3cc721e38fb90457 (patch) | |
| tree | 5e5bf0834cc25ac85038e07ae5d63f0d6bfe07ba | |
| parent | f59d7bafd24c2ff2c96600b471704d825e7c1a7d (diff) | |
| download | meson-10e7566ed84251dcec6ee4ff3cc721e38fb90457.zip meson-10e7566ed84251dcec6ee4ff3cc721e38fb90457.tar.gz meson-10e7566ed84251dcec6ee4ff3cc721e38fb90457.tar.bz2 | |
dict: fix CI issues
| -rw-r--r-- | docs/markdown/snippets/dict_builtin.md | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreterbase.py | 2 | ||||
| -rw-r--r-- | mesonbuild/mparser.py | 2 | ||||
| -rwxr-xr-x | run_unittests.py | 7 |
4 files changed, 7 insertions, 8 deletions
diff --git a/docs/markdown/snippets/dict_builtin.md b/docs/markdown/snippets/dict_builtin.md index b60fd0a..1bd24ce 100644 --- a/docs/markdown/snippets/dict_builtin.md +++ b/docs/markdown/snippets/dict_builtin.md @@ -14,6 +14,6 @@ foo = dict.get('foo') foobar = dict.get('foobar', 'fallback-value') foreach key, value : dict - # Do something with key and value -#endforeach + Do something with key and value +endforeach ``` diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py index 6a979d1..9f323d1 100644 --- a/mesonbuild/interpreterbase.py +++ b/mesonbuild/interpreterbase.py @@ -300,7 +300,7 @@ class InterpreterBase: def evaluate_dictstatement(self, cur): (arguments, kwargs) = self.reduce_arguments(cur.args) - assert (not arguments, 'parser bug, arguments should be empty') + assert (not arguments) return kwargs def evaluate_notstatement(self, cur): diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py index 18ee701..78683be 100644 --- a/mesonbuild/mparser.py +++ b/mesonbuild/mparser.py @@ -657,7 +657,7 @@ class Parser: a.commas.append(potential) else: raise ParseException('Only key:value pairs are valid in dict construction.', - self.getline(), s.lineno, s.colno) + self.getline(), s.lineno, s.colno) s = self.statement() return a diff --git a/run_unittests.py b/run_unittests.py index 162bfcf..f93415b 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -582,7 +582,6 @@ class BasePlatformTests(unittest.TestCase): if inprocess: try: (returncode, out, err) = run_configure(self.meson_mainfile, self.meson_args + args + extra_args) - print (out) if 'MESON_SKIP_TEST' in out: raise unittest.SkipTest('Project requested skipping.') if returncode != 0: @@ -2331,13 +2330,13 @@ class FailureTests(BasePlatformTests): def test_dict_requires_key_value_pairs(self): self.assertMesonRaises("dict = {3, 'foo': 'bar'}", - 'Only key:value pairs are valid in dict construction.') + 'Only key:value pairs are valid in dict construction.') self.assertMesonRaises("{'foo': 'bar', 3}", - 'Only key:value pairs are valid in dict construction.') + 'Only key:value pairs are valid in dict construction.') def test_dict_forbids_duplicate_keys(self): self.assertMesonRaises("dict = {'a': 41, 'a': 42}", - 'Duplicate dictionary key: a.*') + 'Duplicate dictionary key: a.*') class WindowsTests(BasePlatformTests): |