Refactor the code

Author: mdmintz

seleniumbase/behave/behave_sb.py

@@ -1280,15 +1280,9 @@ def _perform_behave_unconfigure_():
     )
     find_it_3 = '<td class="col-result">Untested</td>'
     swap_with_3 = '<td class="col-result">Unreported</td>'
-    if sys.version_info[0] >= 3:
-        # These use caching to prevent extra method calls
-        DASH_PIE_PNG_1 = constants.Dashboard.get_dash_pie_1()
-        DASH_PIE_PNG_2 = constants.Dashboard.get_dash_pie_2()
-    else:
-        from seleniumbase.core import encoded_images
-
-        DASH_PIE_PNG_1 = encoded_images.get_dash_pie_png1()
-        DASH_PIE_PNG_2 = encoded_images.get_dash_pie_png2()
+    # These use caching to prevent extra method calls
+    DASH_PIE_PNG_1 = constants.Dashboard.get_dash_pie_1()
+    DASH_PIE_PNG_2 = constants.Dashboard.get_dash_pie_2()
     find_it_4 = 'href="%s"' % DASH_PIE_PNG_1
     swap_with_4 = 'href="%s"' % DASH_PIE_PNG_2
     try:

seleniumbase/console_scripts/run.py

@@ -1001,7 +1001,6 @@ def main():
             retry_msg_2 = "** Unable to download driver! Retrying in 5s..."
             if " --proxy=" in " ".join(sys.argv):
                 from seleniumbase.core import proxy_helper
-
                 for arg in sys.argv:
                     if arg.startswith("--proxy="):
                         proxy_string = arg.split("--proxy=")[1]
@@ -1036,26 +1035,22 @@ def main():
             show_install_usage()
     elif command == "commander" or command == "gui":
         from seleniumbase.console_scripts import sb_commander
-
         sb_commander.main()
     elif command == "behave-gui" or command == "gui-behave":
         from seleniumbase.console_scripts import sb_behave_gui
-
         sb_behave_gui.main()
     elif (
         command == "caseplans"
         or command == "case-plans"
         or command == "case_plans"
     ):
         from seleniumbase.console_scripts import sb_caseplans
-
         sb_caseplans.main()
     elif (
         command == "recorder"
         or (command == "record" and len(command_args) == 0)
     ):
         from seleniumbase.console_scripts import sb_recorder
-
         sb_recorder.main()
     elif (
         command == "mkrec"
@@ -1064,7 +1059,6 @@ def main():
     ):
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_mkrec
-
             sb_mkrec.main()
         else:
             show_basic_usage()
@@ -1075,70 +1069,55 @@ def main():
     elif command == "mkdir":
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_mkdir
-
             sb_mkdir.main()
         else:
             show_basic_usage()
             show_mkdir_usage()
     elif command == "mkfile":
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_mkfile
-
             sb_mkfile.main()
         else:
             show_basic_usage()
             show_mkfile_usage()
     elif command == "mkpres":
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_mkpres
-
             sb_mkpres.main()
         else:
             show_basic_usage()
             show_mkpres_usage()
     elif command == "mkchart":
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_mkchart
-
             sb_mkchart.main()
         else:
             show_basic_usage()
             show_mkchart_usage()
     elif command == "convert":
         if len(command_args) == 1:
             from seleniumbase.utilities.selenium_ide import convert_ide
-
             convert_ide.main()
         else:
             show_basic_usage()
             show_convert_usage()
     elif command == "print":
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_print
-
             sb_print.main()
         else:
             show_basic_usage()
             show_print_usage()
     elif command == "translate":
         if len(command_args) >= 1:
-            if sys.version_info[0] == 2:
-                c5 = colorama.Fore.RED + colorama.Back.LIGHTYELLOW_EX
-                cr = colorama.Style.RESET_ALL
-                msg = "The SeleniumBase Translator does NOT support Python 2!"
-                message = "\n" + c5 + msg + cr + "\n"
-                print("")
-                raise Exception(message)
             from seleniumbase.translate import translator
-
             translator.main()
         else:
             show_basic_usage()
             show_translate_usage()
     elif command == "extract-objects" or command == "extract_objects":
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_objectify
-
             sb_objectify.extract_objects()
         else:
             show_basic_usage()
@@ -1154,31 +1133,27 @@ def main():
     elif command == "objectify":
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_objectify
-
             sb_objectify.objectify()
         else:
             show_basic_usage()
             show_objectify_usage()
     elif command == "revert-objects" or command == "revert_objects":
         if len(command_args) >= 1:
             from seleniumbase.console_scripts import sb_objectify
-
             sb_objectify.revert_objects()
         else:
             show_basic_usage()
             show_revert_objects_usage()
     elif command == "encrypt" or command == "obfuscate":
         if len(command_args) >= 0:
             from seleniumbase.common import obfuscate
-
             obfuscate.main()
         else:
             show_basic_usage()
             show_encrypt_usage()
     elif command == "decrypt" or command == "unobfuscate":
         if len(command_args) >= 0:
             from seleniumbase.common import unobfuscate
-
             unobfuscate.main()
         else:
             show_basic_usage()
@@ -1188,31 +1163,27 @@ def main():
             from seleniumbase.utilities.selenium_grid import (
                 download_selenium_server,
             )
-
             download_selenium_server.main(force_download=True)
         else:
             show_basic_usage()
             show_download_usage()
     elif command == "grid-hub" or command == "grid_hub":
         if len(command_args) >= 1:
             from seleniumbase.utilities.selenium_grid import grid_hub
-
             grid_hub.main()
         else:
             show_basic_usage()
             show_grid_hub_usage()
     elif command == "grid-node" or command == "grid_node":
         if len(command_args) >= 1:
             from seleniumbase.utilities.selenium_grid import grid_node
-
             grid_node.main()
         else:
             show_basic_usage()
             show_grid_node_usage()
     elif command == "version" or command == "--version" or command == "-v":
         if len(command_args) == 0:
             from seleniumbase.console_scripts import logo_helper
-
             seleniumbase_logo = logo_helper.get_seleniumbase_logo()
             print(seleniumbase_logo)
             print("")
@@ -1231,7 +1202,6 @@ def main():
         import fasteners
         import os
         import warnings
-
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", category=UserWarning)
             pip_find_lock = fasteners.InterProcessLock(

seleniumbase/console_scripts/sb_behave_gui.py

@@ -20,13 +20,6 @@
 from seleniumbase.fixtures import shared_utils
 from tkinter.scrolledtext import ScrolledText
 
-if sys.version_info <= (3, 8):
-    current_version = ".".join(str(ver) for ver in sys.version_info[:3])
-    raise Exception(
-        "\n* SBase Commander requires Python 3.8 or newer!"
-        "\n** You are currently using Python %s" % current_version
-    )
-
 
 def set_colors(use_colors):
     c0 = ""

seleniumbase/console_scripts/sb_caseplans.py

@@ -25,13 +25,6 @@
 from tkinter import messagebox
 from tkinter.scrolledtext import ScrolledText
 
-if sys.version_info <= (3, 8):
-    current_version = ".".join(str(ver) for ver in sys.version_info[:3])
-    raise Exception(
-        "\n* SBase Case Plans Generator requires Python 3.8 or newer!"
-        "\n** You are currently using Python %s" % current_version
-    )
-
 
 def set_colors(use_colors):
     c0 = ""

seleniumbase/console_scripts/sb_commander.py

@@ -25,13 +25,6 @@
 from seleniumbase.fixtures import shared_utils
 from tkinter.scrolledtext import ScrolledText
 
-if sys.version_info <= (3, 8):
-    current_version = ".".join(str(ver) for ver in sys.version_info[:3])
-    raise Exception(
-        "\n* SBase Commander requires Python 3.8 or newer!"
-        "\n** You are currently using Python %s" % current_version
-    )
-
 
 def set_colors(use_colors):
     c0 = ""

seleniumbase/console_scripts/sb_recorder.py

@@ -30,12 +30,6 @@
 sys_executable = sys.executable
 if " " in sys_executable:
     sys_executable = "python"
-if sys.version_info <= (3, 8):
-    current_version = ".".join(str(ver) for ver in sys.version_info[:3])
-    raise Exception(
-        "\n* Recorder Desktop requires Python 3.8 or newer!"
-        "\n*** You are currently using Python %s" % current_version
-    )
 
 
 def set_colors(use_colors):

seleniumbase/core/mysql.py

@@ -19,8 +19,8 @@ def __init__(self, database_env="test", conf_creds=None):
             constants.PipInstall.FINDLOCK
         )
         with pip_find_lock:
-            if sys.version_info >= (3, 7) and sys.version_info < (3, 9):
-                # Fix bug in newer cryptography for Python 3.7 and 3.8:
+            if sys.version_info < (3, 9):
+                # Fix bug with newer cryptography on Python 3.8:
                 # "pyo3_runtime.PanicException: Python API call failed"
                 # (Match the version needed for pdfminer.six functions)
                 try:

seleniumbase/core/style_sheet.py

@@ -1,4 +1,3 @@
-import sys
 import textwrap
 from seleniumbase.fixtures import constants
 
@@ -11,18 +10,12 @@ class Saved:
 def get_report_style():
     if hasattr(Saved, "report_style"):
         return Saved.report_style
-    if sys.version_info[0] >= 3:
-        # Uses caching to prevent extra method calls
-        REPORT_FAVICON = constants.Report.get_favicon()
-    else:
-        from seleniumbase.core import encoded_images
-
-        REPORT_FAVICON = encoded_images.get_report_favicon()
+    # Uses caching to prevent extra method calls
+    REPORT_FAVICON = constants.Report.get_favicon()
     title = """<meta id="OGTitle" property="og:title" content="SeleniumBase">
         <title>Test Report</title>
         <link rel="SHORTCUT ICON"
         href="%s" />""" % REPORT_FAVICON
-
     style = (
         title
         + """<style type="text/css">

seleniumbase/core/visual_helper.py

@@ -1,5 +1,4 @@
 import os
-import sys
 from seleniumbase.core import log_helper
 from seleniumbase.fixtures import constants
 
@@ -22,13 +21,8 @@ def visual_baseline_folder_setup():
 
 
 def get_sbs_head():
-    if sys.version_info[0] >= 3:
-        # Uses caching to prevent extra method calls
-        SIDE_BY_SIDE_PNG = constants.SideBySide.get_favicon()
-    else:
-        from seleniumbase.core import encoded_images
-
-        SIDE_BY_SIDE_PNG = encoded_images.get_side_by_side_png()
+    # Uses caching to prevent extra method calls
+    SIDE_BY_SIDE_PNG = constants.SideBySide.get_favicon()
     head = (
         '<head><meta charset="utf-8">'
         '<meta name="viewport" content="shrink-to-fit=no">'

setup.py

@@ -30,8 +30,10 @@
     confirm_text = ">>> Confirm release PUBLISH to PyPI? (yes/no): "
     reply = str(input_method(confirm_text)).lower().strip()
     if reply == "yes":
-        if sys.version_info < (3, 9):
-            print("\nERROR! Publishing to PyPI requires Python>=3.9")
+        if sys.version_info < (3, 10):
+            current_ver = ".".join(str(ver) for ver in sys.version_info[:3])
+            print("\nERROR! Publishing to PyPI requires Python>=3.10")
+            print("You are currently using Python %s\n" % current_ver)
             sys.exit()
         print("\n*** Checking code health with flake8:\n")
         os.system("python -m pip install 'flake8==7.2.0'")