Code style: Implement suggestions by LGTM to silence alerts

Author: amotl

crate/crash/command.py

@@ -32,7 +32,6 @@
 from collections import namedtuple
 from distutils.version import StrictVersion
 from getpass import getpass
-from logging import NullHandler
 from operator import itemgetter
 
 import urllib3
@@ -50,7 +49,7 @@
 from .sysinfo import SysInfoCommand
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-logging.getLogger('crate').addHandler(NullHandler())
+logging.getLogger('crate').addHandler(logging.NullHandler())
 
 USER_DATA_DIR = user_data_dir("Crate", "Crate")
 HISTORY_FILE_NAME = 'crash_history'

crate/crash/tabulate.py

@@ -294,7 +294,7 @@ def simple_separated_format(separator):
 
 def _isconvertible(conv, string):
     try:
-        n = conv(string)
+        conv(string)
         return True
     except (ValueError, TypeError):
         return False

tests/test_config.py

@@ -64,7 +64,7 @@ def test_create_config(self):
         conf = Configuration(path)
         self.assertTrue(os.path.exists(path))
         self.assertTrue(os.path.exists(conf.path))
-        self.assertTrue('crash' in conf.cfg.sections())
+        self.assertIn('crash', conf.cfg.sections())
 
     def test_init_doesnt_override(self):
         path = os.path.join(self.tmp_dir, 'bar.cfg')

tests/test_integration.py

@@ -122,16 +122,16 @@ def assert_func(self, e, output, err):
             exception_code = e.code
             self.assertEqual(exception_code, 0)
             output = output.getvalue()
-            self.assertTrue('| name         |' in output)
-            self.assertTrue('| Testing44209 |' in output)
+            self.assertIn('| name         |', output)
+            self.assertIn('| Testing44209 |', output)
         self._output_format('tabular', assert_func)
 
     def test_json_output(self):
         def assert_func(self, e, output, err):
             exception_code = e.code
             self.assertEqual(exception_code, 0)
             output = output.getvalue()
-            self.assertTrue('"name": "Testing44209"' in output)
+            self.assertIn('"name": "Testing44209"', output)
         self._output_format('json', assert_func)
 
     def test_json_row_output(self):
@@ -141,7 +141,7 @@ def assert_func(self, e, output, err):
             exception_code = e.code
             self.assertEqual(exception_code, 0)
             output = output.getvalue()
-            self.assertTrue('{"table_name": "cluster"}' in output)
+            self.assertIn('{"table_name": "cluster"}', output)
         self._output_format('json_row', assert_func, query)
 
     def test_csv_obj_output(self):
@@ -151,7 +151,7 @@ def assert_func(self, e, output, err):
             exception_code = e.code
             self.assertEqual(exception_code, 0)
             output = output.getvalue()
-            self.assertTrue("""crate,'{"http": 44209, "psql": 45441, "transport": 44309}'""" in output)
+            self.assertIn("""crate,'{"http": 44209, "psql": 45441, "transport": 44309}'""", output)
 
         self._output_format('csv', assert_func, query)
 
@@ -162,7 +162,7 @@ def assert_func(self, e, output, err):
             exception_code = e.code
             self.assertEqual(exception_code, 0)
             output = output.getvalue()
-            self.assertTrue('["/dev/' in output)
+            self.assertIn('["/dev/', output)
 
         self._output_format('csv', assert_func, query)
 
@@ -171,18 +171,18 @@ def assert_func(self, e, output, err):
             exception_code = e.code
             self.assertEqual(exception_code, 0)
             output = output.getvalue()
-            self.assertTrue('"duration":' in output)
-            self.assertTrue('"rowcount":' in output)
-            self.assertTrue('"rows":' in output)
-            self.assertTrue('"cols":' in output)
+            self.assertIn('"duration":', output)
+            self.assertIn('"rowcount":', output)
+            self.assertIn('"rows":', output)
+            self.assertIn('"cols":', output)
         self._output_format('raw', assert_func)
 
     def test_mixed_output(self):
         def assert_func(self, e, output, err):
             exception_code = e.code
             self.assertEqual(exception_code, 0)
             output = output.getvalue()
-            self.assertTrue("name | Testing44209" in output)
+            self.assertIn("name | Testing44209", output)
         self._output_format('mixed', assert_func)
 
     def test_pprint_duplicate_keys(self):
@@ -224,7 +224,7 @@ def test_stdin_cmd(self):
                     exception_code = e.code
                 self.assertEqual(exception_code, 0)
                 output = output.getvalue()
-                self.assertTrue('via-stdin' in output)
+                self.assertIn('via-stdin', output)
         finally:
             try:
                 os.remove(tmphistory)
@@ -254,8 +254,8 @@ def test_cmd_precedence(self):
                     exception_code = e.code
                 self.assertEqual(exception_code, 0)
                 output = output.getvalue()
-                self.assertTrue('via-command' in output)
-                self.assertFalse('via-stdin' in output)
+                self.assertIn('via-command', output)
+                self.assertNotIn('via-stdin', output)
         finally:
             try:
                 os.remove(tmphistory)

tests/test_keybinding.py

@@ -61,5 +61,5 @@ def test_bindings(self):
         kb = KeyBindings()
         bind_keys(Buffer(), kb)
 
-        self.assertTrue('on_backspace' in handlers_for_key(kb, Keys.Backspace))
-        self.assertTrue('on_tab' in handlers_for_key(kb, Keys.Tab))
+        self.assertIn('on_backspace', handlers_for_key(kb, Keys.Backspace))
+        self.assertIn('on_tab', handlers_for_key(kb, Keys.Tab))