fix: Flake8 fixes, merge conflicts

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/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():

collect.py

@@ -64,37 +64,6 @@ 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 = {
@@ -111,6 +80,15 @@ def get_element_properties(driver, 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)