aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/build.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-05-18 19:44:57 +0300
committerGitHub <noreply@github.com>2017-05-18 19:44:57 +0300
commit5ec6151e56140a19ef185052ffb02bd1ff957bd7 (patch)
tree53346478d8e84aefd170ac6226938ca89d6d0a77 /mesonbuild/build.py
parenta31bc4ede5883d449c15c90535b21bc8f9e28d6d (diff)
parent0e56ec2dbdbbd463d608c42e0aa117357e18936a (diff)
downloadmeson-5ec6151e56140a19ef185052ffb02bd1ff957bd7.zip
meson-5ec6151e56140a19ef185052ffb02bd1ff957bd7.tar.gz
meson-5ec6151e56140a19ef185052ffb02bd1ff957bd7.tar.bz2
Merge pull request #1810 from QuLogic/pycharm-warnings
Fix various warnings found in PyCharm
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r--mesonbuild/build.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index ce6405b..242ce6f 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -227,8 +227,6 @@ class ExtractedObjects:
'You can only extract all the object files at once.'
raise MesonException(msg)
- def get_want_all_objects(self):
- return self.want_all_objects
class EnvironmentVariables:
def __init__(self):
@@ -238,7 +236,7 @@ class EnvironmentVariables:
repr_str = "<{0}: {1}>"
return repr_str.format(self.__class__.__name__, self.envvars)
- def get_value(self, name, values, kwargs):
+ def get_value(self, values, kwargs):
separator = kwargs.get('separator', os.pathsep)
value = ''
@@ -247,16 +245,16 @@ class EnvironmentVariables:
return separator, value.strip(separator)
def set(self, env, name, values, kwargs):
- return self.get_value(name, values, kwargs)[1]
+ return self.get_value(values, kwargs)[1]
def append(self, env, name, values, kwargs):
- sep, value = self.get_value(name, values, kwargs)
+ sep, value = self.get_value(values, kwargs)
if name in env:
return env[name] + sep + value
return value
def prepend(self, env, name, values, kwargs):
- sep, value = self.get_value(name, values, kwargs)
+ sep, value = self.get_value(values, kwargs)
if name in env:
return value + sep + env[name]