Do some refactoring

Author: mdmintz

seleniumbase/fixtures/js_utils.py

@@ -1269,10 +1269,16 @@ def scroll_to_element(driver, element):
         return False
     try:
         element_location_x = element.location["x"]
+    except Exception:
+        element_location_x = 0
+    try:
         element_width = element.size["width"]
+    except Exception:
+        element_width = 0
+    try:
         screen_width = driver.get_window_size()["width"]
     except Exception:
-        element_location_x = 0
+        screen_width = execute_script("return window.innerWidth;")
     element_location_y = element_location_y - constants.Scroll.Y_OFFSET
     if element_location_y < 0:
         element_location_y = 0
@@ -1312,10 +1318,16 @@ def slow_scroll_to_element(driver, element, *args, **kwargs):
         return
     try:
         element_location_x = element.location["x"]
+    except Exception:
+        element_location_x = 0
+    try:
         element_width = element.size["width"]
+    except Exception:
+        element_width = 0
+    try:
         screen_width = driver.get_window_size()["width"]
     except Exception:
-        element_location_x = 0
+        screen_width = execute_script("return window.innerWidth;")
     element_location_y = element_location_y - constants.Scroll.Y_OFFSET
     if element_location_y < 0:
         element_location_y = 0

setup.py

@@ -9,7 +9,7 @@
 long_description = None
 total_description = None
 try:
-    with open(os.path.join(this_dir, "README.md"), "rb") as f:
+    with open(os.path.join(this_dir, "README.md"), mode="rb") as f:
         total_description = f.read().decode("utf-8")
     description_lines = total_description.split("\n")
     long_description_lines = []
@@ -21,7 +21,9 @@
     long_description = "A complete library for building end-to-end tests."
 about = {}
 # Get the package version from the seleniumbase/__version__.py file
-with open(os.path.join(this_dir, "seleniumbase", "__version__.py"), "rb") as f:
+with open(
+    os.path.join(this_dir, "seleniumbase", "__version__.py"), mode="rb"
+) as f:
     exec(f.read().decode("utf-8"), about)
 
 if sys.argv[-1] == "publish":