fix: merge conflicts, flake8 issues

Author: poush

autowebcompat/crawler.py

@@ -1,4 +1,5 @@
-from selenium.common.exceptions import NoAlertPresentException, NoSuchWindowException
+from selenium.common.exceptions import NoAlertPresentException
+from selenium.common.exceptions import NoSuchWindowException
 
 
 def close_all_windows_except_first(driver):

autowebcompat/driver.py

@@ -8,7 +8,6 @@
 class Driver:
 
     def __init__(self):
-
         chrome_bin, nightly_bin = get_browser_bin()
 
         os.environ['PATH'] += os.pathsep + os.path.abspath('tools')

autowebcompat/utils.py

@@ -7,13 +7,13 @@
 import sys
 import threading
 
+from PIL import Image
 import keras
 from keras.preprocessing.image import ImageDataGenerator
 from keras.preprocessing.image import img_to_array
 from keras.preprocessing.image import load_img
-from tensorflow.python.client import device_lib
-from PIL import Image
 import numpy as np
+from tensorflow.python.client import device_lib
 
 
 def get_bugs():
@@ -237,7 +237,6 @@ def write_bounding_boxes(bounding_boxes, file_name):
 
 
 def get_browser_bin():
-
     if sys.platform.startswith('linux'):
         chrome_bin = 'tools/chrome-linux/chrome'
         nightly_bin = 'tools/nightly/firefox-bin'

collect.py

@@ -64,53 +64,33 @@ def wait_loaded(driver):
         print('Continuing...')
 
 
-def get_all_attributes(driver, child):
-    child_attributes = driver.execute_script("""
-      let elem_attribute = {};
-
-      for (let i = 0; i < arguments[0].attributes.length; i++) {
-        elem_attribute[arguments[0].attributes[i].name] = arguments[0].attributes[i].value;
-      }
-      return elem_attribute;
-    """, child)
-
-    return child_attributes
-
-
-def get_elements_with_attributes(driver, elem_attributes, children):
-    elems_with_same_attributes = []
-    for child in children:
-        child_attributes = get_all_attributes(driver, child)
-        if child_attributes == elem_attributes:
-            elems_with_same_attributes.append(child)
-    return elems_with_same_attributes
-
-
-def get_elements_with_properties(driver, elem_properties, children):
-    elems_with_same_properties = []
-    for child in children:
-        child_properties = get_element_properties(driver, child)
-        if child_properties == elem_properties:
-            elems_with_same_properties.append(child)
-    return elems_with_same_properties
-
-
 def get_element_properties(driver, child):
     child_properties = driver.execute_script("""
       let elem_properties = {
         tag: '',
         attributes: {},
       };
+
       for (let i = 0; i < arguments[0].attributes.length; i++) {
         elem_properties.attributes[arguments[0].attributes[i].name] = arguments[0].attributes[i].value;
       }
       elem_properties.tag = arguments[0].tagName;
+
       return elem_properties;
     """, child)
 
     return child_properties
 
 
+def get_elements_with_properties(driver, elem_properties, children):
+    elems_with_same_properties = []
+    for child in children:
+        child_properties = get_element_properties(driver, child)
+        if child_properties == elem_properties:
+            elems_with_same_properties.append(child)
+    return elems_with_same_properties
+
+
 def was_visited(current_path, visited_paths, elem_properties):
     current_path_elements = [element for element, _, _ in current_path]
     current_path_elements.append(elem_properties)

pytest.ini

@@ -1,4 +1,4 @@
-from autowebcompat.crawler import close_all_windows_except_first
+from autowebcompat import crawler
 from autowebcompat.driver import Driver
 
 
@@ -17,8 +17,8 @@ def test_close_all_windows_except_first(self):
         self.driver.chrome.execute_script("window.open('https://google.com')")
         assert len(self.driver.firefox.window_handles) == 3, 'More than 3 windows are open'
 
-        close_all_windows_except_first(self.driver.firefox)
-        close_all_windows_except_first(self.driver.chrome)
+        crawler.close_all_windows_except_first(self.driver.firefox)
+        crawler.close_all_windows_except_first(self.driver.chrome)
 
         assert len(self.driver.firefox.window_handles) == 1
         assert len(self.driver.chrome.window_handles) == 1

tests/test_crawler.py

@@ -141,8 +141,8 @@ def test_get_browser_bin():
     chrome_bin, nightly_bin = utils.get_browser_bin()
     assert isinstance(chrome_bin, str)
     assert isinstance(nightly_bin, str)
-    assert os.path.exists(os.path.abspath('./') + '/' + chrome_bin)
-    assert os.path.exists(os.path.abspath('./') + '/' + nightly_bin)
+    assert os.path.exists(os.path.join(os.path.abspath('./'), chrome_bin))
+    assert os.path.exists(os.path.join(os.path.abspath('./'), nightly_bin))
 
 
 def test_create_file_name():