Updated code format

Signed-off-by: Chin Yeung Li <tli@nexb.com>

Author: chinyeungli

tests/reporting/test_sctk_to_inventory.py

@@ -200,12 +200,12 @@ def check_results(actual_result_file, expected_result_file, regen=False):
     # This is another way to compare the row count but does not use the openpyxl 'max_row' method.
     results_count = 0
     for row in results:
-        if not all([cell.value == None for cell in row]):
+        if not all([cell.value is None for cell in row]):
             results_count += 1
 
     expected_count = 0
     for row in expected:
-        if not all([cell.value == None for cell in row]):
+        if not all([cell.value is None for cell in row]):
             expected_count += 1
 
     assert results_count == expected_count

tests/spreadsheet_toolkit/test_filter.py

@@ -35,7 +35,7 @@ def test_simple_include_filtering():
     assert result1 == input
     include_condition2 = [{u'notes': [u'b']}]
     result2 = filter.include_filtering(input, include_condition2)
-    assert result2 == None
+    assert result2 is None
 
 
 def test_or_include_filtering():
@@ -52,15 +52,15 @@ def test_include_filtering_with_true_condition():
     result1 = filter.include_filtering(input1, include_condition)
     assert result1 == input1
     result2 = filter.include_filtering(input2, include_condition)
-    assert result2 == None
+    assert result2 is None
 
 
 def test_and_include_filtering():
     include_condition = [{u'notes': [u'a', u'b']}, {u'Resource': [u'.java']}]
     input1 = {'notes': 'b', 'Resource': '/project/123/'}
     input2 = {'notes': 'b', 'Resource': '/project/123/test.java'}
     result1 = filter.include_filtering(input1, include_condition)
-    assert result1 == None
+    assert result1 is None
     result2 = filter.include_filtering(input2, include_condition)
     assert result2 == input2
 
@@ -69,7 +69,7 @@ def test_simple_exclude_filtering():
     input = {'notes': 'a', 'Resource': '/project/123/sample1.c'}
     exclude_condition1 = [{u'notes': [u'a']}]
     result1 = filter.exclude_filtering(input, exclude_condition1)
-    assert result1 == None
+    assert result1 is None
     exclude_condition2 = [{u'notes': [u'b']}]
     result2 = filter.exclude_filtering(input, exclude_condition2)
     assert result2 == input
@@ -79,7 +79,7 @@ def test_or_exclude_filtering():
     exclude_condition = [{u'notes': [u'a', u'b'], u'Resource': [u'.java']}]
     input1 = {'notes': 'b', 'Resource': '/project/123/'}
     result1 = filter.exclude_filtering(input1, exclude_condition)
-    assert result1 == None
+    assert result1 is None
     input2 = {'notes': 'c', 'Resource': '/project/123/'}
     result2 = filter.exclude_filtering(input2, exclude_condition)
     assert result2 == input2
@@ -90,7 +90,7 @@ def test_exclude_filtering_with_true_condition():
     input1 = {'license_expression': 'mit'}
     input2 = {'license_expression': ''}
     result1 = filter.exclude_filtering(input1, exclude_condition)
-    assert result1 == None
+    assert result1 is None
     result2 = filter.exclude_filtering(input2, exclude_condition)
     assert result2 == input2
 
@@ -101,9 +101,9 @@ def test_and_exclude_filtering():
     input2 = {'notes': 'b', 'Resource': '/project/123/test.java'}
     input3 = {'notes': 'c', 'Resource': '/project/123/test.c'}
     result1 = filter.exclude_filtering(input1, exclude_condition)
-    assert result1 == None
+    assert result1 is None
     result2 = filter.exclude_filtering(input2, exclude_condition)
-    assert result2 == None
+    assert result2 is None
     result3 = filter.exclude_filtering(input3, exclude_condition)
     assert result3 == input3
 
@@ -115,7 +115,7 @@ def test_simple_startswith_filtering():
     assert result1 == input
     startswith_condition2 = [{u'notes': [u'b']}]
     result2 = filter.startswith_filtering(input, startswith_condition2)
-    assert result2 == None
+    assert result2 is None
 
 
 def test_or_startswith_filtering():
@@ -136,11 +136,11 @@ def test_and_startswith_filtering():
     input2 = {'notes': 'b', 'Resource': '/project/123/test.java'}
     input3 = {'notes': 'c', 'Resource': '/project2/123/test.java'}
     result1 = filter.startswith_filtering(input1, startswith_condition)
-    assert result1 == None
+    assert result1 is None
     result2 = filter.startswith_filtering(input2, startswith_condition)
     assert result2 == input2
     result3 = filter.startswith_filtering(input3, startswith_condition)
-    assert result3 == None
+    assert result3 is None
 
 
 def test_simple_endswith_filtering():
@@ -166,11 +166,11 @@ def test_and_endswith_filtering():
     input2 = {'notes': 'b', 'Resource': '/project/123/test.java'}
     input3 = {'notes': 'c', 'Resource': '/project2/123/test.java'}
     result1 = filter.endswith_filtering(input1, endswith_condition)
-    assert result1 == None
+    assert result1 is None
     result2 = filter.endswith_filtering(input2, endswith_condition)
     assert result2 == input2
     result3 = filter.endswith_filtering(input3, endswith_condition)
-    assert result3 == None
+    assert result3 is None
 
 
 def test_simple_equals_filtering():
@@ -180,7 +180,7 @@ def test_simple_equals_filtering():
     assert result1 == input
     equals_condition2 = [{u'notes': [u'b']}]
     result2 = filter.equals_filtering(input, equals_condition2)
-    assert result2 == None
+    assert result2 is None
 
 
 def test_or_equals_filtering():
@@ -199,6 +199,6 @@ def test_and_equals_filtering():
     result1 = filter.equals_filtering(input1, equals_condition)
     assert result1 == input1
     result2 = filter.equals_filtering(input2, equals_condition)
-    assert result2 == None
+    assert result2 is None
     result3 = filter.equals_filtering(input3, equals_condition)
-    assert result3 == None
+    assert result3 is None

tests/test_bom_utils.py

@@ -59,7 +59,6 @@ def test_remove_version_char(self):
             assert result == expected_val
 
     def test_get_column(self):
-        from openpyxl import Workbook
         ws = load_workbook(self.get_test_loc(
             'bom_utils/get_column.xlsx'), read_only=False).active
         column = bom_utils.get_column(ws, 'A')
@@ -74,7 +73,6 @@ def test_get_column(self):
         assert column is None
 
     def test_count_headers(self):
-        from openpyxl import load_workbook
         wb = load_workbook(self.get_test_loc(
             'bom_utils/count_headers.xlsx'), read_only=True)
         input_list = [wb, wb]
@@ -84,7 +82,6 @@ def test_count_headers(self):
         assert set(result) == set(expected)
 
     def test_count_sheets(self):
-        from openpyxl import load_workbook
         wb = load_workbook(self.get_test_loc(
             'bom_utils/count_sheets.xlsx'), read_only=True)
         input_list = [wb, wb, wb, wb]
@@ -93,7 +90,6 @@ def test_count_sheets(self):
         assert set(result) == set(expected)
 
     def test_get_headers(self):
-        from openpyxl import load_workbook
         workbook = load_workbook(self.get_test_loc(
             'bom_utils/headers.xlsx'), read_only=True)
         worksheet = workbook['Sheet1']
@@ -102,7 +98,6 @@ def test_get_headers(self):
         assert set(result) == set(expected_headers)
 
     def test_curate_value(self):
-        import time
         import datetime
         test_vals = [
             datetime.datetime(2016, 1, 15, 13, 11, 9,
@@ -131,7 +126,6 @@ def test_load_xlsx_files(self):
             self.get_test_loc('bom_utils/load/xlsx_load2.xlsx'),
             self.get_test_loc('bom_utils/load/xlsx_load3.xlsx'),
         ]
-        result = []
         loaded_single = bom_utils.load_xlsx_files([multi[0]])
         loaded_multi = bom_utils.load_xlsx_files(multi)
         expected_file_name = ['xlsx_load1.xlsx']

tests/test_package_management_file_parser.py

@@ -278,8 +278,8 @@ def test_create_packages(self):
 
         assert result[0].name == 'browser-stdout'
         assert result[0].version == '1.3.1'
-        assert result[0].dev == True
+        assert result[0].dev
 
         assert result[1].name == 'commander'
         assert result[1].version == '2.15.1'
-        assert result[1].dev == False
+        assert not result[1].dev

tests/test_vcio_report.py

@@ -103,10 +103,10 @@ def check_results(actual_result_file, expected_result_file, regen=False):
     # This is another way to compare the row count but does not use the openpyxl 'max_row' method.
     results_count = 0
     for row in results:
-        if not all([cell.value == None for cell in row]):
+        if not all([cell.value is None for cell in row]):
             results_count += 1
     expected_count = 0
     for row in expected:
-        if not all([cell.value == None for cell in row]):
+        if not all([cell.value is None for cell in row]):
             expected_count += 1
     assert results_count == expected_count