Refactoring

Author: mdmintz

seleniumbase/__init__.py

@@ -18,6 +18,7 @@
 from seleniumbase.plugins.sb_manager import SB  # noqa
 from seleniumbase.plugins.driver_manager import Driver  # noqa
 from seleniumbase.plugins.driver_manager import DriverContext  # noqa
+from seleniumbase import translate  # noqa
 
 if sys.version_info[0] < 3 and "pdbp" in locals():
     # With Python3, "import pdbp" is all you need
@@ -33,8 +34,6 @@
         pdb.DefaultConfig.enable_hidden_frames = False
         pdb.DefaultConfig.truncate_long_lines = True
         pdb.DefaultConfig.sticky_by_default = True
-if sys.version_info[0] >= 3:
-    from seleniumbase import translate  # noqa
 if sys.version_info >= (3, 7):
     webdriver.TouchActions = None  # Lifeline for past selenium-wire versions
 if sys.version_info >= (3, 10):

seleniumbase/behave/behave_helper.py

@@ -1,16 +1,11 @@
-# -*- coding: utf-8 -*-
-import sys
-
-python3 = True
-if sys.version_info[0] < 3:
-    python3 = False
+"""Generating Gherkin-formatted code from the Recorder."""
 
 
 def generate_gherkin(srt_actions):
     sb_actions = []
     for action in srt_actions:
         if action[0] == "begin" or action[0] == "_url_":
-            if "%" in action[2] and python3:
+            if "%" in action[2]:
                 try:
                     from urllib.parse import unquote
 
@@ -24,7 +19,7 @@ def generate_gherkin(srt_actions):
             else:
                 sb_actions.append('Open "%s"' % action[2].replace('"', '\\"'))
         elif action[0] == "f_url":
-            if "%" in action[2] and python3:
+            if "%" in action[2]:
                 try:
                     from urllib.parse import unquote
 

seleniumbase/common/encryption.py

@@ -1,6 +1,4 @@
-# -\*- coding: utf-8 -\*-
-
-""" This is mainly for string obfuscation. """
+"""This is mainly for string obfuscation."""
 
 import base64
 import codecs

seleniumbase/common/unobfuscate.py

@@ -9,16 +9,11 @@
 """
 
 from seleniumbase.common import encryption
-import sys
 import time
 
 
 def main():
-    if sys.version_info[0] >= 3:
-        input_method = input  # Using Python 3 (or higher)
-    else:
-        # Python 2 has the raw_input() method. Python 3 does not.
-        input_method = raw_input  # noqa: ignore=F821
+    input_method = input
     try:
         while 1:
             code = input_method(

seleniumbase/console_scripts/rich_helper.py

@@ -19,7 +19,7 @@ def display_markdown(code):
     try:
         markdown = Markdown(code)
         console = Console()
-        console.print(markdown)  # noqa
+        console.print(markdown)
         return True  # Success
     except Exception:
         return False  # Failure
@@ -28,7 +28,7 @@ def display_markdown(code):
 def display_code(code):
     try:
         console = Console()
-        console.print(code)  # noqa
+        console.print(code)
         return True  # Success
     except Exception:
         return False  # Failure

seleniumbase/console_scripts/sb_behave_gui.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Launches SeleniumBase Behave Commander | GUI for Behave.
 

seleniumbase/console_scripts/sb_caseplans.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Launches the SeleniumBase Case Plans Generator.
 

seleniumbase/console_scripts/sb_commander.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Launches SeleniumBase Commander | GUI for pytest.
 

seleniumbase/console_scripts/sb_mkchart.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Creates a new SeleniumBase chart presentation with boilerplate code.
 

seleniumbase/console_scripts/sb_mkdir.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Creates a new folder for running SeleniumBase scripts.
 
@@ -493,10 +492,7 @@ def main():
     data.append("")
     data.append("class BaseTestCase(BaseCase):")
     data.append("    def setUp(self):")
-    if sys.version_info[0] >= 3:
-        data.append("        super().setUp()")
-    else:
-        data.append("        super(BaseTestCase, self).setUp()")
+    data.append("        super().setUp()")
     data.append("        # <<< Run custom code AFTER the super() line >>>")
     data.append("")
     data.append("    def tearDown(self):")
@@ -509,10 +505,7 @@ def main():
     data.append("            pass")
     data.append("        # (Wrap unreliable code in a try/except block.)")
     data.append("        # <<< Run custom code BEFORE the super() line >>>")
-    if sys.version_info[0] >= 3:
-        data.append("        super().tearDown()")
-    else:
-        data.append("        super(BaseTestCase, self).tearDown()")
+    data.append("        super().tearDown()")
     data.append("")
     data.append("    def login(self):")
     data.append("        # <<< Placeholder. Add your code here. >>>")