Merge pull request #1153 from seleniumbase/refactoring-and-dependencies

Refactoring and dependencies

Author: mdmintz

examples/edge_test.py

@@ -1,17 +1,19 @@
 """
 This test is only for Microsoft Edge (Chromium)!
-(Tested on Edge Version 89.0.774.54)
+(Tested on Edge Version 96.0.1054.62)
 """
 from seleniumbase import BaseCase
 
 
 class EdgeTests(BaseCase):
     def test_edge(self):
         if self.browser != "edge":
+            self.open("data:,")
             print("\n  This test is only for Microsoft Edge (Chromium)!")
             print('  (Run this test using "--edge" or "--browser=edge")')
             self.skip('Use "--edge" or "--browser=edge"')
         if self.headless:
+            self.open("data:,")
             print("\n  This test is NOT designed for Headless Mode!")
             self.skip('Do NOT use "--headless" with this test!')
         self.open("edge://settings/help")

examples/test_shadow_dom.py

@@ -20,9 +20,11 @@ def download_tar_file_from_pypi(self, package):
 
     def test_shadow_dom(self):
         if self.browser != "chrome":
+            self.open("data:,")
             print("\n  This test is for Google Chrome only!")
             self.skip("This test is for Google Chrome only!")
         if self.headless:
+            self.open("data:,")
             print("\n  This test doesn't run in headless mode!")
             self.skip("This test doesn't run in headless mode!")
 

requirements.txt

@@ -27,11 +27,11 @@ idna==2.10;python_version<"3.6"
 idna==3.3;python_version>="3.6"
 chardet==3.0.4;python_version<"3.5"
 chardet==4.0.0;python_version>="3.5"
-charset-normalizer==2.0.9;python_version>="3.5"
+charset-normalizer==2.0.10;python_version>="3.5"
 urllib3==1.26.7
-requests==2.26.0;python_version<"3.5"
+requests==2.27.0;python_version<"3.5"
 requests==2.25.1;python_version>="3.5" and python_version<"3.6"
-requests==2.26.0;python_version>="3.6"
+requests==2.27.0;python_version>="3.6"
 nose==1.3.7
 sniffio==1.2.0;python_version>="3.7"
 trio==0.19.0;python_version>="3.7"
@@ -105,7 +105,8 @@ virtualenv>=20.13.0
 pycparser==2.21
 pymysql==0.10.1;python_version<"3.6"
 pymysql==1.0.2;python_version>="3.6"
-pyotp==2.6.0
+pyotp==2.3.0;python_version<"3.5"
+pyotp==2.6.0;python_version>="3.5"
 boto==2.49.0
 cffi==1.15.0
 toml==0.10.2

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "2.3.7"
+__version__ = "2.3.8"

seleniumbase/fixtures/base_case.py

@@ -66,7 +66,9 @@ def test_anything(self):
 logging.getLogger("urllib3").setLevel(logging.ERROR)
 urllib3.disable_warnings()
 LOGGER.setLevel(logging.WARNING)
+python3 = True
 if sys.version_info[0] < 3:
+    python3 = False
     reload(sys)  # noqa: F821
     sys.setdefaultencoding("utf8")
 selenium4 = False
@@ -144,9 +146,8 @@ def open(self, url):
             pre_action_url = self.driver.current_url
         except Exception:
             pass
-        if type(url) is str:
-            url = url.strip()  # Remove leading and trailing whitespace
-        if (type(url) is not str) or not self.__looks_like_a_page_url(url):
+        url = str(url).strip()  # Remove leading and trailing whitespace
+        if not self.__looks_like_a_page_url(url):
             # url should start with one of the following:
             # "http:", "https:", "://", "data:", "file:",
             # "about:", "chrome:", "opera:", or "edge:".
@@ -742,7 +743,7 @@ def refresh(self):
     def get_current_url(self):
         self.__check_scope()
         current_url = self.driver.current_url
-        if "%" in current_url and sys.version_info[0] >= 3:
+        if "%" in current_url and python3:
             try:
                 from urllib.parse import unquote
 
@@ -2386,6 +2387,8 @@ def open_html_file(self, html_file):
     def execute_script(self, script, *args, **kwargs):
         self.__check_scope()
         self.__check_browser()
+        if not python3:
+            script = unicode(script.decode('latin-1'))  # noqa: F821
         return self.driver.execute_script(script, *args, **kwargs)
 
     def execute_async_script(self, script, timeout=None):
@@ -2520,6 +2523,8 @@ def set_content_to_frame(self, frame, timeout=None):
             url = self.execute_script(
                 """return document.querySelector('%s').src;""" % frame
             )
+            if not python3:
+                url = str(url)
             if url and len(url) > 0:
                 if ("http:") in url or ("https:") in url or ("file:") in url:
                     pass
@@ -3547,7 +3552,7 @@ def __process_recorded_actions(self):
             cleaned_actions.append(srt_actions[n])
         for action in srt_actions:
             if action[0] == "begin" or action[0] == "_url_":
-                if "%" in action[2] and sys.version_info[0] >= 3:
+                if "%" in action[2] and python3:
                     try:
                         from urllib.parse import unquote
 
@@ -3556,7 +3561,7 @@ def __process_recorded_actions(self):
                         pass
                 sb_actions.append('self.open("%s")' % action[2])
             elif action[0] == "f_url":
-                if "%" in action[2] and sys.version_info[0] >= 3:
+                if "%" in action[2] and python3:
                     try:
                         from urllib.parse import unquote
 
@@ -10464,7 +10469,7 @@ def __recalculate_selector(self, selector, by, xp_ok=True):
         used to make the ":contains()" selector valid outside JS calls."""
         _type = type(selector)  # First make sure the selector is a string
         not_string = False
-        if sys.version_info[0] < 3:
+        if not python3:
             if _type is not str and _type is not unicode:  # noqa: F821
                 not_string = True
         else:
@@ -11123,7 +11128,7 @@ def __set_last_page_source(self):
     def __get_exception_info(self):
         exc_message = None
         if (
-            sys.version_info[0] >= 3
+            python3
             and hasattr(self, "_outcome")
             and (hasattr(self._outcome, "errors") and self._outcome.errors)
         ):
@@ -11234,11 +11239,11 @@ def __has_exception(self):
         has_exception = False
         if hasattr(sys, "last_traceback") and sys.last_traceback is not None:
             has_exception = True
-        elif sys.version_info[0] >= 3 and hasattr(self, "_outcome"):
+        elif python3 and hasattr(self, "_outcome"):
             if hasattr(self._outcome, "errors") and self._outcome.errors:
                 has_exception = True
         else:
-            if sys.version_info[0] >= 3:
+            if python3:
                 has_exception = sys.exc_info()[1] is not None
             else:
                 if not hasattr(self, "_using_sb_fixture_class") and (
@@ -11247,7 +11252,10 @@ def __has_exception(self):
                     has_exception = sys.exc_info()[1] is not None
                 else:
                     has_exception = len(str(sys.exc_info()[1]).strip()) > 0
-        if hasattr(self, "_using_sb_fixture") and self.__will_be_skipped:
+        if (
+            self.__will_be_skipped
+            and (hasattr(self, "_using_sb_fixture") or not python3)
+        ):
             has_exception = False
         return has_exception
 

setup.py

@@ -147,11 +147,11 @@
         'idna==3.3;python_version>="3.6"',  # Must stay in sync with "requests"
         'chardet==3.0.4;python_version<"3.5"',  # Stay in sync with "requests"
         'chardet==4.0.0;python_version>="3.5"',  # Stay in sync with "requests"
-        'charset-normalizer==2.0.9;python_version>="3.5"',  # Sync "requests"
+        'charset-normalizer==2.0.10;python_version>="3.5"',  # Sync "requests"
         "urllib3==1.26.7",  # Must stay in sync with "requests"
-        'requests==2.26.0;python_version<"3.5"',
+        'requests==2.27.0;python_version<"3.5"',
         'requests==2.25.1;python_version>="3.5" and python_version<"3.6"',
-        'requests==2.26.0;python_version>="3.6"',
+        'requests==2.27.0;python_version>="3.6"',
         "nose==1.3.7",
         'sniffio==1.2.0;python_version>="3.7"',
         'trio==0.19.0;python_version>="3.7"',
@@ -225,7 +225,8 @@
         "pycparser==2.21",
         'pymysql==0.10.1;python_version<"3.6"',
         'pymysql==1.0.2;python_version>="3.6"',
-        "pyotp==2.6.0",
+        'pyotp==2.3.0;python_version<"3.5"',
+        'pyotp==2.6.0;python_version>="3.5"',
         "boto==2.49.0",
         "cffi==1.15.0",
         "toml==0.10.2",