Pylint fixes

5 files changed, 6 insertions, 7 deletions

diff --git a/src/configs/pylint.rc b/src/configs/pylint.rc
index da0457c47..aea9463e6 100644
--- a/src/configs/pylint.rc
+++ b/src/configs/pylint.rc
@@ -226,7 +226,7 @@ ignored-modules=
 # List of classes names for which member attributes should not be checked
 # (useful for classes with attributes dynamically set). This supports can work
 # with qualified names.
-ignored-classes=LexResult
+ignored-classes=LexResult,argv
 
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E1101 when accessed. Python regular
@@ -241,7 +241,7 @@ init-import=no
 
 # A regular expression matching the name of dummy variables (i.e. expectedly
 # not used).
-dummy-variables-rgx=_$|dummy
+dummy-variables-rgx=_[a-z]*$
 
 # List of additional names supposed to be defined in builtins. Remember that
 # you should avoid to define new builtins when possible.
diff --git a/src/scripts/bench.py b/src/scripts/bench.py
index 13de0c077..1cc626366 100755
--- a/src/scripts/bench.py
+++ b/src/scripts/bench.py
@@ -129,7 +129,7 @@ def run_botan_bench(botan, runtime, buf_sizes, algo):
     runtime = .05
 
     cmd = [botan, 'speed', '--format=json', '--msec=%d' % int(runtime * 1000),
-           '--buf-size=%s' % (','.join(map(str, buf_sizes))), algo]
+           '--buf-size=%s' % (','.join([str(i) for i in buf_sizes])), algo]
     output = run_command(cmd)
     output = json.loads(output)
 
diff --git a/src/scripts/dist.py b/src/scripts/dist.py
index a27784453..8a37a2581 100755
--- a/src/scripts/dist.py
+++ b/src/scripts/dist.py
@@ -311,7 +311,7 @@ def main(args=None):
         try:
             logging.info('Creating release for version %s' % (target_version))
 
-            (major, minor, patch) = map(int, target_version.split('.'))
+            (major, minor, patch) = [int(x) for x in target_version.split('.')]
 
             assert target_version == '%d.%d.%d' % (major, minor, patch)
             target_version = target_version
diff --git a/src/scripts/install.py b/src/scripts/install.py
index 03a15ba3e..a539a8930 100755
--- a/src/scripts/install.py
+++ b/src/scripts/install.py
@@ -16,6 +16,7 @@ import os
 import shutil
 import sys
 import subprocess
+import traceback
 
 def parse_command_line(args):
 
@@ -269,6 +270,5 @@ if __name__ == '__main__':
         sys.exit(main(sys.argv))
     except Exception as e: # pylint: disable=broad-except
         logging.error('Failure: %s' % (e))
-        import traceback
         logging.info(traceback.format_exc())
         sys.exit(1)
diff --git a/src/scripts/test_cli.py b/src/scripts/test_cli.py
index 6445a3669..239c05175 100755
--- a/src/scripts/test_cli.py
+++ b/src/scripts/test_cli.py
@@ -42,7 +42,6 @@ def setup_logging(options):
 
 def test_cli(cmd, cmd_options, expected_output=None, cmd_input=None, expected_stderr=None):
     global TESTS_RUN
-    global TESTS_FAILED
 
     TESTS_RUN += 1
 
@@ -518,7 +517,7 @@ def cli_tls_socket_tests():
 
     (stdout, stderr) = tls_client.communicate()
 
-    if len(stderr) != 0: # pylint: disable=len-as-condition
+    if stderr:
         logging.error("Got unexpected stderr output %s" % (stderr))
 
     if b'Handshake complete' not in stdout: