Applied a few more fixes

Author: tleonhardt

tests/test_history.py

@@ -668,7 +668,7 @@ def test_history_output_file():
     run_cmd(app, 'history -o "{}"'.format(fname))
     assert app.last_result is True
 
-    expected = normalize('\n'.join(['help', 'shortcuts', 'help history', 'alias create my_alias history;']))
+    expected = normalize('help\nshortcuts\nhelp history\nalias create my_alias history;')
     with open(fname) as f:
         content = normalize(f.read())
     assert content == expected

tests/test_table_creator.py

@@ -230,7 +230,7 @@ def test_wrap_long_word():
                       'Name        Col 2     ')
 
     # Test data row
-    row_data = list()
+    row_data = []
 
     # Long word should start on the first line (style should not affect width)
     row_data.append(ansi.style("LongerThan10", fg=Fg.GREEN))
@@ -267,7 +267,7 @@ def test_wrap_long_word_max_data_lines():
     columns = [column_1, column_2, column_3, column_4]
     tc = TableCreator(columns)
 
-    row_data = list()
+    row_data = []
 
     # This long word will exactly fit the last line and it's the final word in the text. No ellipsis should appear.
     row_data.append("LongerThan10FitsLast")
@@ -341,7 +341,7 @@ def test_simple_table_creation():
     column_1 = Column("Col 1", width=16)
     column_2 = Column("Col 2", width=16)
 
-    row_data = list()
+    row_data = []
     row_data.append(["Col 1 Row 1", "Col 2 Row 1"])
     row_data.append(["Col 1 Row 2", "Col 2 Row 2"])
 
@@ -495,7 +495,7 @@ def test_simple_table_width():
     column_1 = Column("Col 1", width=16)
     column_2 = Column("Col 2", width=16)
 
-    row_data = list()
+    row_data = []
     row_data.append(["Col 1 Row 1", "Col 2 Row 1"])
     row_data.append(["Col 1 Row 2", "Col 2 Row 2"])
 
@@ -518,7 +518,7 @@ def test_bordered_table_creation():
     column_1 = Column("Col 1", width=15)
     column_2 = Column("Col 2", width=15)
 
-    row_data = list()
+    row_data = []
     row_data.append(["Col 1 Row 1", "Col 2 Row 1"])
     row_data.append(["Col 1 Row 2", "Col 2 Row 2"])
 
@@ -637,7 +637,7 @@ def test_bordered_table_width():
     column_1 = Column("Col 1", width=15)
     column_2 = Column("Col 2", width=15)
 
-    row_data = list()
+    row_data = []
     row_data.append(["Col 1 Row 1", "Col 2 Row 1"])
     row_data.append(["Col 1 Row 2", "Col 2 Row 2"])
 
@@ -660,7 +660,7 @@ def test_alternating_table_creation():
     column_1 = Column("Col 1", width=15)
     column_2 = Column("Col 2", width=15)
 
-    row_data = list()
+    row_data = []
     row_data.append(["Col 1 Row 1", "Col 2 Row 1"])
     row_data.append(["Col 1 Row 2", "Col 2 Row 2"])
 

tests/test_utils.py

@@ -272,7 +272,7 @@ def pr_none():
 
     # Start a long running process so we have time to run tests on it before it finishes
     # Put the new process into a separate group so its signal are isolated from ours
-    kwargs = dict()
+    kwargs = {}
     if sys.platform.startswith('win'):
         command = 'timeout -t 5 /nobreak'
         kwargs['creationflags'] = subprocess.CREATE_NEW_PROCESS_GROUP

tests_isolated/test_commandset/test_commandset.py

@@ -1100,10 +1100,10 @@ def __init__(self):
 
     # verify the settable shows up
     out, err = run_cmd(app, 'set')
-    any(['arbitrary_value' in line and '5' in line for line in out])
+    any('arbitrary_value' in line and '5' in line for line in out)
 
     out, err = run_cmd(app, 'set arbitrary_value')
-    any(['arbitrary_value' in line and '5' in line for line in out])
+    any('arbitrary_value' in line and '5' in line for line in out)
 
     # change the value and verify the value changed
     out, err = run_cmd(app, 'set arbitrary_value 10')
@@ -1113,7 +1113,7 @@ def __init__(self):
 """
     assert out == normalize(expected)
     out, err = run_cmd(app, 'set arbitrary_value')
-    any(['arbitrary_value' in line and '10' in line for line in out])
+    any('arbitrary_value' in line and '10' in line for line in out)
 
     # can't add to cmd2 now because commandset already has this settable
     with pytest.raises(KeyError):
@@ -1172,10 +1172,10 @@ def __init__(self):
     assert 'some.arbitrary_value' in app.settables.keys()
 
     out, err = run_cmd(app, 'set')
-    any(['some.arbitrary_value' in line and '5' in line for line in out])
+    any('some.arbitrary_value' in line and '5' in line for line in out)
 
     out, err = run_cmd(app, 'set some.arbitrary_value')
-    any(['some.arbitrary_value' in line and '5' in line for line in out])
+    any('some.arbitrary_value' in line and '5' in line for line in out)
 
     # verify registering a commandset with duplicate prefix and settable names fails
     with pytest.raises(CommandSetRegistrationError):