Update code related to deprecated methods

Author: mdmintz

seleniumbase/common/decorators.py

@@ -1,8 +1,6 @@
-import inspect
 import logging
 import math
 import sys
-import threading
 import time
 import warnings
 from functools import wraps
@@ -55,6 +53,8 @@ def rate_limited(max_per_second):
     If the limit is exceeded, the call will be held in a queue until
     enough time has passed.
     Useful when trying to avoid overloading a system with rapid calls."""
+    import threading
+
     min_interval = 1.0 / float(max_per_second)
 
     def decorate(func):
@@ -88,23 +88,24 @@ def rate_limited_function(*args, **kargs):
 def deprecated(message=None):
     """This decorator marks methods as deprecated.
     A warning is displayed if the method is called."""
+    import inspect
 
     def decorated_method_to_deprecate(func):
         if inspect.isclass(func):
             # Handle a deprecated class differently from a deprecated method
-            msg = "Class {}() is DEPRECATED! *** ".format(func.__name__)
+            msg = "Class {}() is DEPRECATED!".format(func.__name__)
             if message:
-                msg += "<> %s <>" % message
+                msg += " *** %s ***" % message
             warnings.simplefilter("always", DeprecationWarning)  # See Warnings
             warnings.warn(msg, category=DeprecationWarning, stacklevel=2)
             warnings.simplefilter("default", DeprecationWarning)  # Set Default
             return func
 
         @wraps(func)
         def new_func(*args, **kwargs):
-            msg = "Method {}() is DEPRECATED! *** ".format(func.__name__)
+            msg = "Method {}() is DEPRECATED!".format(func.__name__)
             if message:
-                msg += "<> %s <>" % message
+                msg += " *** %s ***" % message
             warnings.simplefilter("always", DeprecationWarning)  # See Warnings
             warnings.warn(msg, category=DeprecationWarning, stacklevel=2)
             warnings.simplefilter("default", DeprecationWarning)  # Set Default

seleniumbase/fixtures/base_case.py

@@ -10095,12 +10095,9 @@ def __highlight_with_jquery_2(self, message, selector, o_bs):
 
     from seleniumbase.common import decorators
 
-    # Deprecated Methods (Replace these if they're still in your code!)
-    @decorators.deprecated(
-        "jq_format() is deprecated. Use re.escape() instead!"
-    )
+    @decorators.deprecated("You should use re.escape() instead.")
     def jq_format(self, code):
-        # DEPRECATED - re.escape() already performs the intended action!
+        # DEPRECATED - re.escape() already performs the intended action.
         return js_utils._jq_format(code)
 
     ############

seleniumbase/fixtures/js_utils.py

@@ -8,7 +8,6 @@
 from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import WebDriverException
 from seleniumbase import config as sb_config
-from seleniumbase.common import decorators
 from seleniumbase.config import settings
 from seleniumbase.fixtures import constants
 from seleniumbase.fixtures import shared_utils
@@ -976,7 +975,6 @@ def clear_out_console_logs(driver):
         pass
 
 
-@decorators.deprecated("Use re.escape() instead, which does what you want!")
 def _jq_format(code):
     """
     DEPRECATED - Use re.escape() instead, which performs the intended action.