mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-27 06:41:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pylint: minor code simplifications

Browse Source 
Simplify the code in minor ways. Each of this changes fixes a warning
from Pylint 2.4 that doesn't appear with Pylint 1.7.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2020-03-24 18:36:56 +01:00
parent 184c096e95
commit 8b022359e8
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/scripts/generate_test_code.py
View File

@ -402,8 +402,7 @@ def parse_dependencies(inp_str):
:param inp_str: Input string with macros delimited by ':'. :param inp_str: Input string with macros delimited by ':'.
:return: list of dependencies :return: list of dependencies
""" """
dependencies = [dep for dep in map(validate_dependency, dependencies = list(map(validate_dependency, inp_str.split(':')))
inp_str.split(':'))]
return dependencies return dependencies

2
tests/scripts/mbedtls_test.py
View File

@ -262,7 +262,7 @@ class MbedTlsTest(BaseHostTest):
data_bytes += bytearray(dependencies) data_bytes += bytearray(dependencies)
data_bytes += bytearray([function_id, len(parameters)]) data_bytes += bytearray([function_id, len(parameters)])
for typ, param in parameters: for typ, param in parameters:
if typ == 'int' or typ == 'exp': if typ in ('int', 'exp'):
i = int(param, 0) i = int(param, 0)
data_bytes += b'I' if typ == 'int' else b'E' data_bytes += b'I' if typ == 'int' else b'E'
self.align_32bit(data_bytes) self.align_32bit(data_bytes)

10
tests/scripts/test_generate_test_code.py
View File

@ -1127,9 +1127,8 @@ Diffie-Hellman selftest
dhm_selftest: dhm_selftest:
""" """
stream = StringIOWrapper('test_suite_ut.function', data) stream = StringIOWrapper('test_suite_ut.function', data)
tests = [(name, test_function, dependencies, args) # List of (name, function_name, dependencies, args)
for name, test_function, dependencies, args in tests = list(parse_test_data(stream))
parse_test_data(stream)]
test1, test2, test3, test4 = tests test1, test2, test3, test4 = tests
self.assertEqual(test1[0], 'Diffie-Hellman full exchange #1') self.assertEqual(test1[0], 'Diffie-Hellman full exchange #1')
self.assertEqual(test1[1], 'dhm_do_dhm') self.assertEqual(test1[1], 'dhm_do_dhm')
@ -1170,9 +1169,8 @@ dhm_do_dhm:10:"93450983094850938450983409623":10:"9345098304850938450983409622"
""" """
stream = StringIOWrapper('test_suite_ut.function', data) stream = StringIOWrapper('test_suite_ut.function', data)
tests = [(name, function_name, dependencies, args) # List of (name, function_name, dependencies, args)
for name, function_name, dependencies, args in tests = list(parse_test_data(stream))
parse_test_data(stream)]
test1, test2 = tests test1, test2 = tests
self.assertEqual(test1[0], 'Diffie-Hellman full exchange #1') self.assertEqual(test1[0], 'Diffie-Hellman full exchange #1')
self.assertEqual(test1[1], 'dhm_do_dhm') self.assertEqual(test1[1], 'dhm_do_dhm')

2
tests/scripts/test_psa_constant_names.py
View File

@ -453,7 +453,7 @@ def main():
tests.run_all(inputs) tests.run_all(inputs)
tests.report(sys.stdout) tests.report(sys.stdout)
if tests.errors: if tests.errors:
exit(1) sys.exit(1)
if __name__ == '__main__': if __name__ == '__main__':
main() main()