Merge pull request #1932 from seleniumbase/update-exception-handling

Update exception-handling and more

Author: mdmintz

requirements.txt

@@ -34,7 +34,8 @@ chardet==5.1.0;python_version>="3.7"
 charset-normalizer==2.0.12;python_version<"3.7"
 charset-normalizer==3.1.0;python_version>="3.7"
 urllib3==1.26.12;python_version<"3.7"
-urllib3>=1.26.16,<2.1.0;python_version>="3.7"
+urllib3>=1.26.16,<2;python_version>="3.7" and python_version<"3.10"
+urllib3>=1.26.16,<2.1.0;python_version>="3.10"
 requests==2.27.1;python_version<"3.7"
 requests==2.31.0;python_version>="3.7"
 requests-toolbelt==1.0.0

seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.15.6"
+__version__ = "4.15.7"

seleniumbase/core/mysql.py

@@ -7,6 +7,7 @@ class DatabaseManager:
     def __init__(self, database_env="test", conf_creds=None):
         """Create a connection to the MySQL DB."""
         import fasteners
+        import sys
         import time
         from seleniumbase import config as sb_config
         from seleniumbase.config import settings
@@ -21,7 +22,10 @@ def __init__(self, database_env="test", conf_creds=None):
             try:
                 import pymysql
             except Exception:
-                shared_utils.pip_install("pymysql", version="1.0.2")
+                if sys.version_info < (3, 7):
+                    shared_utils.pip_install("pymysql", version="1.0.2")
+                else:
+                    shared_utils.pip_install("pymysql", version="1.1.0")
                 import pymysql
         db_server = settings.DB_HOST
         db_port = settings.DB_PORT

seleniumbase/fixtures/base_case.py

@@ -6360,13 +6360,13 @@ def assert_pdf_text(
         )
         if type(page) is int:
             if text not in pdf_text:
-                raise Exception(
+                self.fail(
                     "PDF [%s] is missing expected text [%s] on "
                     "page [%s]!" % (pdf, text, page)
                 )
         else:
             if text not in pdf_text:
-                raise Exception(
+                self.fail(
                     "PDF [%s] is missing expected text [%s]!" % (pdf, text)
                 )
         return True
@@ -7115,7 +7115,7 @@ def assert_no_js_errors(self, exclude=[]):
             er_str = str(errors)
             er_str = er_str.replace("[{", "[\n{").replace("}, {", "},\n{")
             current_url = self.get_current_url()
-            raise Exception(
+            self.fail(
                 "JavaScript errors found on %s => %s" % (current_url, er_str)
             )
         if self.demo_mode:
@@ -7670,7 +7670,7 @@ def reset_default_timeout(self):
 
     def fail(self, msg="fail() called!"):
         """Fail immediately, with the given message."""
-        raise self.failureException(msg)
+        super().fail(msg)
 
     def skip(self, reason=""):
         """Mark the test as Skipped."""

setup.py

@@ -160,7 +160,8 @@
         'charset-normalizer==2.0.12;python_version<"3.7"',
         'charset-normalizer==3.1.0;python_version>="3.7"',
         'urllib3==1.26.12;python_version<"3.7"',
-        'urllib3>=1.26.16,<2.1.0;python_version>="3.7"',
+        'urllib3>=1.26.16,<2;python_version>="3.7" and python_version<"3.10"',  # noqa: E501
+        'urllib3>=1.26.16,<2.1.0;python_version>="3.10"',
         'requests==2.27.1;python_version<"3.7"',
         'requests==2.31.0;python_version>="3.7"',
         'requests-toolbelt==1.0.0',