aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-07-02 02:58:42 +0530
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-07-02 07:05:08 +0000
commitcd1d53ee75d89412e1e5b9617b29a4fe02599370 (patch)
treec963da567b6869b6668a9b2d2195ac85bb32dd70
parenta524524ac0ac2b4a6d64346d234d43a855a3e5a6 (diff)
downloadmeson-cd1d53ee75d89412e1e5b9617b29a4fe02599370.zip
meson-cd1d53ee75d89412e1e5b9617b29a4fe02599370.tar.gz
meson-cd1d53ee75d89412e1e5b9617b29a4fe02599370.tar.bz2
FeatureNew: Declare functions as class methods explicitly
-rw-r--r--mesonbuild/interpreterbase.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py
index 22d85a2..0d0e4af 100644
--- a/mesonbuild/interpreterbase.py
+++ b/mesonbuild/interpreterbase.py
@@ -131,6 +131,8 @@ class permittedKwargs:
return f(*wrapped_args, **wrapped_kwargs)
return wrapped
+# TODO: Share code between FeatureNew, FeatureDeprecated, FeatureNewKwargs,
+# and FeatureDeprecatedKwargs
class FeatureNew:
"""Checks for new features"""
# Shared across all instances
@@ -149,12 +151,13 @@ class FeatureNew:
self.feature_versions[self.feature_version].add(self.feature_name)
return True
- def called_features_report():
- if not FeatureNew.feature_warnings:
+ @classmethod
+ def called_features_report(cls):
+ if not cls.feature_warnings:
return
warning_str = 'Invalid minimum meson_version \'{}\' conflicts with:'\
.format(mesonlib.target_version)
- fv = FeatureNew.feature_versions
+ fv = cls.feature_versions
for version in sorted(fv.keys()):
warning_str += '\n * {}: {}'.format(version, fv[version])
mlog.warning(warning_str)
@@ -196,11 +199,12 @@ class FeatureDeprecated:
self.feature_versions[self.feature_version].add(self.feature_name)
return True
- def called_features_report():
- if not FeatureDeprecated.feature_warnings:
+ @classmethod
+ def called_features_report(cls):
+ if not cls.feature_warnings:
return
warning_str = 'Deprecated features used:'.format(mesonlib.target_version)
- fv = FeatureDeprecated.feature_versions
+ fv = cls.feature_versions
for version in sorted(fv.keys()):
warning_str += '\n * {}: {}'.format(version, fv[version])
mlog.warning(warning_str)