[damned-lies] Improved meson makefile variable read

[Claude Paroz <claudep src gnome org>]

commit 5274de774b1793eaaa2dc89e9a1889c4ac182dfc
Author: Claude Paroz <claude 2xlibre net>
Date:   Fri Jan 26 11:21:47 2018 +0100

    Improved meson makefile variable read

 stats/tests/meson-ui.build |    2 +-
 stats/utils.py             |   11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/stats/tests/meson-ui.build b/stats/tests/meson-ui.build
index 4791291..f65ee27 100644
--- a/stats/tests/meson-ui.build
+++ b/stats/tests/meson-ui.build
@@ -1,4 +1,4 @@
 i18n = import('i18n')
 
-i18n.gettext(gnomebt_gettext_package, preset : 'glib')
+i18n.gettext(gnomebt_gettext_package + meson.project_name(), preset : 'glib')
 install_data('Makefile.in.in')
diff --git a/stats/utils.py b/stats/utils.py
index 9d2e5fe..8066c1a 100644
--- a/stats/utils.py
+++ b/stats/utils.py
@@ -7,7 +7,7 @@ import shutil
 import time
 from itertools import islice
 from subprocess import Popen, PIPE
-from unittest.mock import Mock
+from unittest.mock import MagicMock
 
 try:
     from translate.tools import pogrep, pocount
@@ -193,7 +193,10 @@ class MesonfileWrapper(MakefileWrapper):
                         catched[var_name] = kwargs[var_name]
 
         catcher = VarCatcher()
-        meson_locals = {'gnome': catcher, 'i18n': catcher, 'install_data': Mock(), 'meson': Mock()}
+        meson_locals = {
+            'gnome': catcher, 'i18n': catcher,
+            'install_data': MagicMock(), 'meson': MagicMock(),
+        }
         while True:
             try:
                 exec(self.content, {}, meson_locals)
@@ -203,13 +206,13 @@ class MesonfileWrapper(MakefileWrapper):
                 m = re.search(r"name '([^']*)' is not defined", str(exc))
                 if m:
                     name = m.groups()[0]
-                    meson_locals[name] = Mock()
+                    meson_locals[name] = MagicMock()
                 else:
                     break
             except Exception:
                 break
         for var in variables:
-            if var in catched and not isinstance(catched[var], Mock):
+            if var in catched and not isinstance(catched[var], MagicMock):
                 return catched[var]