aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Gnatenko <i.gnatenko.brain@gmail.com>2016-12-31 20:27:52 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2017-01-01 12:02:05 -0500
commitf0bc5568a74d555b332671d0f7f0d950688e2d61 (patch)
tree060cb67e09c06a95d3479c92411fa847b994fdfe
parent969dc7e995fcc19418bf4c6f66ac97b5a4ff2150 (diff)
downloadmeson-f0bc5568a74d555b332671d0f7f0d950688e2d61.zip
meson-f0bc5568a74d555b332671d0f7f0d950688e2d61.tar.gz
meson-f0bc5568a74d555b332671d0f7f0d950688e2d61.tar.bz2
style: fix E703 violations
E703: statement ends with a semicolon Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
-rw-r--r--mesonbuild/build.py2
-rw-r--r--mesonbuild/mconf.py4
-rw-r--r--mesonbuild/mparser.py4
-rw-r--r--mesonbuild/scripts/depfixer.py14
-rwxr-xr-xtools/cmake2meson.py2
5 files changed, 13 insertions, 13 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index fb88ab4..449afe7 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -1433,7 +1433,7 @@ class RunTarget:
class Jar(BuildTarget):
def __init__(self, name, subdir, subproject, is_cross, sources, objects, environment, kwargs):
- super().__init__(name, subdir, subproject, is_cross, sources, objects, environment, kwargs);
+ super().__init__(name, subdir, subproject, is_cross, sources, objects, environment, kwargs)
for s in self.sources:
if not s.endswith('.java'):
raise InvalidArguments('Jar source %s is not a java file.' % s)
diff --git a/mesonbuild/mconf.py b/mesonbuild/mconf.py
index 0d3f702..8ddf4fe 100644
--- a/mesonbuild/mconf.py
+++ b/mesonbuild/mconf.py
@@ -195,10 +195,10 @@ class Conf:
opt = options[key]
if (opt.choices is None) or (len(opt.choices) == 0):
# Zero length list or string
- choices = '';
+ choices = ''
else:
# A non zero length list or string, convert to string
- choices = str(opt.choices);
+ choices = str(opt.choices)
optarr.append([key, opt.description, opt.value, choices])
self.print_aligned(optarr)
print('')
diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py
index 850446d..6b1c8ee 100644
--- a/mesonbuild/mparser.py
+++ b/mesonbuild/mparser.py
@@ -76,7 +76,7 @@ class Lexer:
def lex(self, code, subdir):
lineno = 1
line_start = 0
- loc = 0;
+ loc = 0
par_count = 0
bracket_count = 0
col = 0
@@ -519,7 +519,7 @@ class Parser:
def e9(self):
t = self.current
if self.accept('true'):
- return BooleanNode(t, True);
+ return BooleanNode(t, True)
if self.accept('false'):
return BooleanNode(t, False)
if self.accept('id'):
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
index 708814f..c9ee36c 100644
--- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py
@@ -55,8 +55,8 @@ class DynamicEntry(DataSizes):
super().__init__(ptrsize, is_le)
self.ptrsize = ptrsize
if ptrsize == 64:
- self.d_tag = struct.unpack(self.Sxword, ifile.read(self.SxwordSize))[0];
- self.val = struct.unpack(self.XWord, ifile.read(self.XWordSize))[0];
+ self.d_tag = struct.unpack(self.Sxword, ifile.read(self.SxwordSize))[0]
+ self.val = struct.unpack(self.XWord, ifile.read(self.XWordSize))[0]
else:
self.d_tag = struct.unpack(self.Sword, ifile.read(self.SwordSize))[0]
self.val = struct.unpack(self.Word, ifile.read(self.WordSize))[0]
@@ -77,7 +77,7 @@ class SectionHeader(DataSizes):
else:
is_64 = False
# Elf64_Word
- self.sh_name = struct.unpack(self.Word, ifile.read(self.WordSize))[0];
+ self.sh_name = struct.unpack(self.Word, ifile.read(self.WordSize))[0]
# Elf64_Word
self.sh_type = struct.unpack(self.Word, ifile.read(self.WordSize))[0]
# Elf64_Xword
@@ -86,7 +86,7 @@ class SectionHeader(DataSizes):
else:
self.sh_flags = struct.unpack(self.Word, ifile.read(self.WordSize))[0]
# Elf64_Addr
- self.sh_addr = struct.unpack(self.Addr, ifile.read(self.AddrSize))[0];
+ self.sh_addr = struct.unpack(self.Addr, ifile.read(self.AddrSize))[0]
# Elf64_Off
self.sh_offset = struct.unpack(self.Off, ifile.read(self.OffSize))[0]
# Elf64_Xword
@@ -95,9 +95,9 @@ class SectionHeader(DataSizes):
else:
self.sh_size = struct.unpack(self.Word, ifile.read(self.WordSize))[0]
# Elf64_Word
- self.sh_link = struct.unpack(self.Word, ifile.read(self.WordSize))[0];
+ self.sh_link = struct.unpack(self.Word, ifile.read(self.WordSize))[0]
# Elf64_Word
- self.sh_info = struct.unpack(self.Word, ifile.read(self.WordSize))[0];
+ self.sh_info = struct.unpack(self.Word, ifile.read(self.WordSize))[0]
# Elf64_Xword
if is_64:
self.sh_addralign = struct.unpack(self.XWord, ifile.read(self.XWordSize))[0]
@@ -312,7 +312,7 @@ class Elf(DataSizes):
rpentry = self.dynamic[i]
rpentry.d_tag = 0
self.dynamic = self.dynamic[:i] + self.dynamic[i + 1:] + [rpentry]
- break;
+ break
# DT_MIPS_RLD_MAP_REL is relative to the offset of the tag. Adjust it consequently.
for entry in self.dynamic[i:]:
if entry.d_tag == DT_MIPS_RLD_MAP_REL:
diff --git a/tools/cmake2meson.py b/tools/cmake2meson.py
index 5cf6dfe..7d6d02a 100755
--- a/tools/cmake2meson.py
+++ b/tools/cmake2meson.py
@@ -46,7 +46,7 @@ class Lexer:
def lex(self, code):
lineno = 1
line_start = 0
- loc = 0;
+ loc = 0
col = 0
while(loc < len(code)):
matched = False