Fix pylint issues in gen_stub_libs.
Test: pylint scriptlib
Bug: None
Change-Id: I7fc9d55a033bab98c318cfb4db1af4eda7187af3
diff --git a/cc/scriptlib/gen_stub_libs.py b/cc/scriptlib/gen_stub_libs.py
index d61dfbb..a9887f9 100755
--- a/cc/scriptlib/gen_stub_libs.py
+++ b/cc/scriptlib/gen_stub_libs.py
@@ -118,7 +118,8 @@
if 'platform-only' in version.tags:
return True
- no_llndk_no_apex = 'llndk' not in version.tags and 'apex' not in version.tags
+ no_llndk_no_apex = ('llndk' not in version.tags
+ and 'apex' not in version.tags)
keep = no_llndk_no_apex or \
('llndk' in version.tags and llndk) or \
('apex' in version.tags and apex)
@@ -205,7 +206,6 @@
class ParseError(RuntimeError):
"""An error that occurred while parsing a symbol file."""
- pass
class MultiplyDefinedSymbolError(RuntimeError):
@@ -217,7 +217,7 @@
self.multiply_defined_symbols = multiply_defined_symbols
-class Version(object):
+class Version:
"""A version block of a symbol file."""
def __init__(self, name, base, tags, symbols):
self.name = name
@@ -237,7 +237,7 @@
return True
-class Symbol(object):
+class Symbol:
"""A symbol definition from a symbol file."""
def __init__(self, name, tags):
self.name = name
@@ -247,7 +247,7 @@
return self.name == other.name and set(self.tags) == set(other.tags)
-class SymbolFileParser(object):
+class SymbolFileParser:
"""Parses NDK symbol files."""
def __init__(self, input_file, api_map, arch, api, llndk, apex):
self.input_file = input_file
@@ -283,11 +283,13 @@
symbol_names = set()
multiply_defined_symbols = set()
for version in versions:
- if should_omit_version(version, self.arch, self.api, self.llndk, self.apex):
+ if should_omit_version(version, self.arch, self.api, self.llndk,
+ self.apex):
continue
for symbol in version.symbols:
- if should_omit_symbol(symbol, self.arch, self.api, self.llndk, self.apex):
+ if should_omit_symbol(symbol, self.arch, self.api, self.llndk,
+ self.apex):
continue
if symbol.name in symbol_names:
@@ -369,7 +371,7 @@
return self.current_line
-class Generator(object):
+class Generator:
"""Output generator that writes stub source files and version scripts."""
def __init__(self, src_file, version_script, arch, api, llndk, apex):
self.src_file = src_file
@@ -386,14 +388,16 @@
def write_version(self, version):
"""Writes a single version block's data to the output files."""
- if should_omit_version(version, self.arch, self.api, self.llndk, self.apex):
+ if should_omit_version(version, self.arch, self.api, self.llndk,
+ self.apex):
return
section_versioned = symbol_versioned_in_api(version.tags, self.api)
version_empty = True
pruned_symbols = []
for symbol in version.symbols:
- if should_omit_symbol(symbol, self.arch, self.api, self.llndk, self.apex):
+ if should_omit_symbol(symbol, self.arch, self.api, self.llndk,
+ self.apex):
continue
if symbol_versioned_in_api(symbol.tags, self.api):
diff --git a/cc/scriptlib/test_gen_stub_libs.py b/cc/scriptlib/test_gen_stub_libs.py
index 0b45e71..de86199 100755
--- a/cc/scriptlib/test_gen_stub_libs.py
+++ b/cc/scriptlib/test_gen_stub_libs.py
@@ -22,6 +22,7 @@
import gen_stub_libs as gsl
+
# pylint: disable=missing-docstring
@@ -164,15 +165,15 @@
class OmitVersionTest(unittest.TestCase):
def test_omit_private(self):
self.assertFalse(
- gsl.should_omit_version(
- gsl.Version('foo', None, [], []), 'arm', 9, False, False))
+ gsl.should_omit_version(gsl.Version('foo', None, [], []), 'arm', 9,
+ False, False))
self.assertTrue(
- gsl.should_omit_version(
- gsl.Version('foo_PRIVATE', None, [], []), 'arm', 9, False, False))
+ gsl.should_omit_version(gsl.Version('foo_PRIVATE', None, [], []),
+ 'arm', 9, False, False))
self.assertTrue(
- gsl.should_omit_version(
- gsl.Version('foo_PLATFORM', None, [], []), 'arm', 9, False, False))
+ gsl.should_omit_version(gsl.Version('foo_PLATFORM', None, [], []),
+ 'arm', 9, False, False))
self.assertTrue(
gsl.should_omit_version(
@@ -181,44 +182,44 @@
def test_omit_llndk(self):
self.assertTrue(
- gsl.should_omit_version(
- gsl.Version('foo', None, ['llndk'], []), 'arm', 9, False, False))
+ gsl.should_omit_version(gsl.Version('foo', None, ['llndk'], []),
+ 'arm', 9, False, False))
self.assertFalse(
- gsl.should_omit_version(
- gsl.Version('foo', None, [], []), 'arm', 9, True, False))
+ gsl.should_omit_version(gsl.Version('foo', None, [], []), 'arm', 9,
+ True, False))
self.assertFalse(
- gsl.should_omit_version(
- gsl.Version('foo', None, ['llndk'], []), 'arm', 9, True, False))
+ gsl.should_omit_version(gsl.Version('foo', None, ['llndk'], []),
+ 'arm', 9, True, False))
def test_omit_apex(self):
self.assertTrue(
- gsl.should_omit_version(
- gsl.Version('foo', None, ['apex'], []), 'arm', 9, False, False))
+ gsl.should_omit_version(gsl.Version('foo', None, ['apex'], []),
+ 'arm', 9, False, False))
self.assertFalse(
- gsl.should_omit_version(
- gsl.Version('foo', None, [], []), 'arm', 9, False, True))
+ gsl.should_omit_version(gsl.Version('foo', None, [], []), 'arm', 9,
+ False, True))
self.assertFalse(
- gsl.should_omit_version(
- gsl.Version('foo', None, ['apex'], []), 'arm', 9, False, True))
+ gsl.should_omit_version(gsl.Version('foo', None, ['apex'], []),
+ 'arm', 9, False, True))
def test_omit_arch(self):
self.assertFalse(
- gsl.should_omit_version(
- gsl.Version('foo', None, [], []), 'arm', 9, False, False))
+ gsl.should_omit_version(gsl.Version('foo', None, [], []), 'arm', 9,
+ False, False))
self.assertFalse(
- gsl.should_omit_version(
- gsl.Version('foo', None, ['arm'], []), 'arm', 9, False, False))
+ gsl.should_omit_version(gsl.Version('foo', None, ['arm'], []),
+ 'arm', 9, False, False))
self.assertTrue(
- gsl.should_omit_version(
- gsl.Version('foo', None, ['x86'], []), 'arm', 9, False, False))
+ gsl.should_omit_version(gsl.Version('foo', None, ['x86'], []),
+ 'arm', 9, False, False))
def test_omit_api(self):
self.assertFalse(
- gsl.should_omit_version(
- gsl.Version('foo', None, [], []), 'arm', 9, False, False))
+ gsl.should_omit_version(gsl.Version('foo', None, [], []), 'arm', 9,
+ False, False))
self.assertFalse(
gsl.should_omit_version(
gsl.Version('foo', None, ['introduced=9'], []), 'arm', 9,
@@ -233,47 +234,51 @@
class OmitSymbolTest(unittest.TestCase):
def test_omit_llndk(self):
self.assertTrue(
- gsl.should_omit_symbol(
- gsl.Symbol('foo', ['llndk']), 'arm', 9, False, False))
+ gsl.should_omit_symbol(gsl.Symbol('foo', ['llndk']), 'arm', 9,
+ False, False))
self.assertFalse(
- gsl.should_omit_symbol(gsl.Symbol('foo', []), 'arm', 9, True, False))
+ gsl.should_omit_symbol(gsl.Symbol('foo', []), 'arm', 9, True,
+ False))
self.assertFalse(
- gsl.should_omit_symbol(
- gsl.Symbol('foo', ['llndk']), 'arm', 9, True, False))
+ gsl.should_omit_symbol(gsl.Symbol('foo', ['llndk']), 'arm', 9,
+ True, False))
def test_omit_apex(self):
self.assertTrue(
- gsl.should_omit_symbol(
- gsl.Symbol('foo', ['apex']), 'arm', 9, False, False))
+ gsl.should_omit_symbol(gsl.Symbol('foo', ['apex']), 'arm', 9,
+ False, False))
self.assertFalse(
- gsl.should_omit_symbol(gsl.Symbol('foo', []), 'arm', 9, False, True))
+ gsl.should_omit_symbol(gsl.Symbol('foo', []), 'arm', 9, False,
+ True))
self.assertFalse(
- gsl.should_omit_symbol(
- gsl.Symbol('foo', ['apex']), 'arm', 9, False, True))
+ gsl.should_omit_symbol(gsl.Symbol('foo', ['apex']), 'arm', 9,
+ False, True))
def test_omit_arch(self):
self.assertFalse(
- gsl.should_omit_symbol(gsl.Symbol('foo', []), 'arm', 9, False, False))
+ gsl.should_omit_symbol(gsl.Symbol('foo', []), 'arm', 9, False,
+ False))
self.assertFalse(
- gsl.should_omit_symbol(
- gsl.Symbol('foo', ['arm']), 'arm', 9, False, False))
+ gsl.should_omit_symbol(gsl.Symbol('foo', ['arm']), 'arm', 9, False,
+ False))
self.assertTrue(
- gsl.should_omit_symbol(
- gsl.Symbol('foo', ['x86']), 'arm', 9, False, False))
+ gsl.should_omit_symbol(gsl.Symbol('foo', ['x86']), 'arm', 9, False,
+ False))
def test_omit_api(self):
self.assertFalse(
- gsl.should_omit_symbol(gsl.Symbol('foo', []), 'arm', 9, False, False))
+ gsl.should_omit_symbol(gsl.Symbol('foo', []), 'arm', 9, False,
+ False))
self.assertFalse(
- gsl.should_omit_symbol(
- gsl.Symbol('foo', ['introduced=9']), 'arm', 9, False, False))
+ gsl.should_omit_symbol(gsl.Symbol('foo', ['introduced=9']), 'arm',
+ 9, False, False))
self.assertTrue(
- gsl.should_omit_symbol(
- gsl.Symbol('foo', ['introduced=14']), 'arm', 9, False, False))
+ gsl.should_omit_symbol(gsl.Symbol('foo', ['introduced=14']), 'arm',
+ 9, False, False))
class SymbolFileParseTest(unittest.TestCase):
@@ -404,7 +409,8 @@
def test_parse_fails_invalid_input(self):
with self.assertRaises(gsl.ParseError):
input_file = io.StringIO('foo')
- parser = gsl.SymbolFileParser(input_file, {}, 'arm', 16, False, False)
+ parser = gsl.SymbolFileParser(input_file, {}, 'arm', 16, False,
+ False)
parser.parse()
def test_parse(self):
@@ -472,7 +478,8 @@
# OmitVersionTest, PrivateVersionTest, and SymbolPresenceTest.
src_file = io.StringIO()
version_file = io.StringIO()
- generator = gsl.Generator(src_file, version_file, 'arm', 9, False, False)
+ generator = gsl.Generator(src_file, version_file, 'arm', 9, False,
+ False)
version = gsl.Version('VERSION_PRIVATE', None, [], [
gsl.Symbol('foo', []),
@@ -500,7 +507,8 @@
# SymbolPresenceTest.
src_file = io.StringIO()
version_file = io.StringIO()
- generator = gsl.Generator(src_file, version_file, 'arm', 9, False, False)
+ generator = gsl.Generator(src_file, version_file, 'arm', 9, False,
+ False)
version = gsl.Version('VERSION_1', None, [], [
gsl.Symbol('foo', ['x86']),
@@ -533,7 +541,8 @@
def test_write(self):
src_file = io.StringIO()
version_file = io.StringIO()
- generator = gsl.Generator(src_file, version_file, 'arm', 9, False, False)
+ generator = gsl.Generator(src_file, version_file, 'arm', 9, False,
+ False)
versions = [
gsl.Version('VERSION_1', None, [], [
@@ -615,12 +624,14 @@
wobble;
} VERSION_4;
"""))
- parser = gsl.SymbolFileParser(input_file, api_map, 'arm', 9, False, False)
+ parser = gsl.SymbolFileParser(input_file, api_map, 'arm', 9, False,
+ False)
versions = parser.parse()
src_file = io.StringIO()
version_file = io.StringIO()
- generator = gsl.Generator(src_file, version_file, 'arm', 9, False, False)
+ generator = gsl.Generator(src_file, version_file, 'arm', 9, False,
+ False)
generator.write(versions)
expected_src = textwrap.dedent("""\
@@ -665,12 +676,14 @@
*;
};
"""))
- parser = gsl.SymbolFileParser(input_file, api_map, 'arm', 9001, False, False)
+ parser = gsl.SymbolFileParser(input_file, api_map, 'arm', 9001, False,
+ False)
versions = parser.parse()
src_file = io.StringIO()
version_file = io.StringIO()
- generator = gsl.Generator(src_file, version_file, 'arm', 9001, False, False)
+ generator = gsl.Generator(src_file, version_file, 'arm', 9001, False,
+ False)
generator.write(versions)
expected_src = textwrap.dedent("""\
@@ -715,10 +728,10 @@
"""))
parser = gsl.SymbolFileParser(input_file, {}, 'arm', 16, False, False)
- with self.assertRaises(gsl.MultiplyDefinedSymbolError) as cm:
+ with self.assertRaises(gsl.MultiplyDefinedSymbolError) as ex_context:
parser.parse()
- self.assertEquals(['bar', 'foo'],
- cm.exception.multiply_defined_symbols)
+ self.assertEqual(['bar', 'foo'],
+ ex_context.exception.multiply_defined_symbols)
def test_integration_with_apex(self):
api_map = {
@@ -759,7 +772,8 @@
wobble;
} VERSION_4;
"""))
- parser = gsl.SymbolFileParser(input_file, api_map, 'arm', 9, False, True)
+ parser = gsl.SymbolFileParser(input_file, api_map, 'arm', 9, False,
+ True)
versions = parser.parse()
src_file = io.StringIO()