aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/scripts
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2016-12-31 20:02:15 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2017-01-01 12:02:05 -0500
commit2017d8578af20d2f82cefb3a91889a15105c06b2 (patch)
treef72c0140e1f700561a83445102bb2ef3783e6bd3 /mesonbuild/scripts
parentf0b30baa39180a1047da362eb1411157228d18b7 (diff)
downloadmeson-2017d8578af20d2f82cefb3a91889a15105c06b2.zip
meson-2017d8578af20d2f82cefb3a91889a15105c06b2.tar.gz
meson-2017d8578af20d2f82cefb3a91889a15105c06b2.tar.bz2
style: fix E226 violations
E226: missing whitespace around arithmetic operator Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to 'mesonbuild/scripts')
-rw-r--r--mesonbuild/scripts/depfixer.py24
-rw-r--r--mesonbuild/scripts/meson_install.py4
-rw-r--r--mesonbuild/scripts/symbolextractor.py2
-rw-r--r--mesonbuild/scripts/yelphelper.py4
4 files changed, 17 insertions, 17 deletions
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
index baa401e..1a19a8a 100644
--- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py
@@ -29,25 +29,25 @@ class DataSizes():
p = '<'
else:
p = '>'
- self.Half = p+'h'
+ self.Half = p + 'h'
self.HalfSize = 2
- self.Word = p+'I'
+ self.Word = p + 'I'
self.WordSize = 4
- self.Sword = p+'i'
+ self.Sword = p + 'i'
self.SwordSize = 4
if ptrsize == 64:
- self.Addr = p+'Q'
+ self.Addr = p + 'Q'
self.AddrSize = 8
- self.Off = p+'Q'
+ self.Off = p + 'Q'
self.OffSize = 8
- self.XWord = p+'Q'
+ self.XWord = p + 'Q'
self.XWordSize = 8
- self.Sxword = p+'q'
+ self.Sxword = p + 'q'
self.SxwordSize = 8
else:
- self.Addr = p+'I'
+ self.Addr = p + 'I'
self.AddrSize = 4
- self.Off = p+'I'
+ self.Off = p + 'I'
self.OffSize = 4
class DynamicEntry(DataSizes):
@@ -273,7 +273,7 @@ class Elf(DataSizes):
name = self.read_str()
if name.startswith(prefix):
basename = name.split(b'/')[-1]
- padding = b'\0'*(len(name) - len(basename))
+ padding = b'\0' * (len(name) - len(basename))
newname = basename + padding
assert(len(newname) == len(name))
self.bf.seek(offset)
@@ -299,7 +299,7 @@ class Elf(DataSizes):
sys.exit("New rpath must not be longer than the old one.")
self.bf.seek(rp_off)
self.bf.write(new_rpath)
- self.bf.write(b'\0'*(len(old_rpath) - len(new_rpath) + 1))
+ self.bf.write(b'\0' * (len(old_rpath) - len(new_rpath) + 1))
if len(new_rpath) == 0:
self.remove_rpath_entry(entrynum)
@@ -311,7 +311,7 @@ class Elf(DataSizes):
if entry.d_tag == entrynum:
rpentry = self.dynamic[i]
rpentry.d_tag = 0
- self.dynamic = self.dynamic[:i] + self.dynamic[i+1:] + [rpentry]
+ self.dynamic = self.dynamic[:i] + self.dynamic[i + 1:] + [rpentry]
break;
# DT_MIPS_RLD_MAP_REL is relative to the offset of the tag. Adjust it consequently.
for entry in self.dynamic[i:]:
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index f497f2c..881615d 100644
--- a/mesonbuild/scripts/meson_install.py
+++ b/mesonbuild/scripts/meson_install.py
@@ -51,7 +51,7 @@ def do_copydir(src_prefix, src_dir, dst_dir):
for root, dirs, files in os.walk(src_prefix):
for d in dirs:
abs_src = os.path.join(src_dir, root, d)
- filepart = abs_src[len(src_dir)+1:]
+ filepart = abs_src[len(src_dir) + 1:]
abs_dst = os.path.join(dst_dir, filepart)
if os.path.isdir(abs_dst):
continue
@@ -62,7 +62,7 @@ def do_copydir(src_prefix, src_dir, dst_dir):
shutil.copystat(abs_src, abs_dst)
for f in files:
abs_src = os.path.join(src_dir, root, f)
- filepart = abs_src[len(src_dir)+1:]
+ filepart = abs_src[len(src_dir) + 1:]
abs_dst = os.path.join(dst_dir, filepart)
if os.path.isdir(abs_dst):
print('Tried to copy file %s but a directory of that name already exists.' % abs_dst)
diff --git a/mesonbuild/scripts/symbolextractor.py b/mesonbuild/scripts/symbolextractor.py
index bfd629f..976d2f0 100644
--- a/mesonbuild/scripts/symbolextractor.py
+++ b/mesonbuild/scripts/symbolextractor.py
@@ -80,7 +80,7 @@ def osx_syms(libfilename, outfilename):
if 'LC_ID_DYLIB' in val:
match = i
break
- result = [arr[match+2], arr[match+5]] # Libreoffice stores all 5 lines but the others seem irrelevant.
+ result = [arr[match + 2], arr[match + 5]] # Libreoffice stores all 5 lines but the others seem irrelevant.
pnm, output = Popen_safe(['nm', '-g', '-P', libfilename])[0:2]
if pnm.returncode != 0:
raise RuntimeError('nm does not work.')
diff --git a/mesonbuild/scripts/yelphelper.py b/mesonbuild/scripts/yelphelper.py
index e5b3b11..85d89b8 100644
--- a/mesonbuild/scripts/yelphelper.py
+++ b/mesonbuild/scripts/yelphelper.py
@@ -33,7 +33,7 @@ def build_pot(srcdir, project_id, sources):
# Must be relative paths
sources = [os.path.join('C', source) for source in sources]
outfile = os.path.join(srcdir, project_id + '.pot')
- subprocess.call(['itstool', '-o', outfile]+sources)
+ subprocess.call(['itstool', '-o', outfile] + sources)
def update_po(srcdir, project_id, langs):
potfile = os.path.join(srcdir, project_id + '.pot')
@@ -55,7 +55,7 @@ def merge_translations(blddir, sources, langs):
subprocess.call([
'itstool', '-m', os.path.join(blddir, lang, lang + '.gmo'),
'-o', os.path.join(blddir, lang)
- ]+sources)
+ ] + sources)
def install_help(srcdir, blddir, sources, media, langs, install_dir, destdir, project_id, symlinks):
c_install_dir = os.path.join(install_dir, 'C', project_id)