[py] Remove the use of basestring

Basestring is used for python 2 so removing as
it is effectively dead code.

Author: AutomatedTester

py/selenium/webdriver/common/utils.py

@@ -21,14 +21,7 @@
 import socket
 from selenium.webdriver.common.keys import Keys
 
-try:
-    # Python 2
-    basestring
-    _is_connectable_exceptions = (socket.error,)
-except NameError:
-    # Python 3
-    basestring = str
-    _is_connectable_exceptions = (socket.error, ConnectionResetError)
+_is_connectable_exceptions = (socket.error, ConnectionResetError)
 
 
 def free_port():

py/selenium/webdriver/firefox/webdriver.py

@@ -14,10 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-try:
-    basestring
-except NameError:  # Python 3.x
-    basestring = str
 
 from base64 import b64decode
 from shutil import rmtree
@@ -154,12 +150,12 @@ def __init__(self, firefox_profile=None, firefox_binary=None,
         # firefox_binary and firefox_profile
         # override options
         if firefox_binary:
-            if isinstance(firefox_binary, basestring):
+            if isinstance(firefox_binary, str):
                 firefox_binary = FirefoxBinary(firefox_binary)
             self.binary = firefox_binary
             options.binary = firefox_binary
         if firefox_profile:
-            if isinstance(firefox_profile, basestring):
+            if isinstance(firefox_profile, str):
                 firefox_profile = FirefoxProfile(firefox_profile)
             self.profile = firefox_profile
             options.profile = firefox_profile

py/selenium/webdriver/remote/errorhandler.py

@@ -44,11 +44,6 @@
                                         UnknownMethodException,
                                         WebDriverException)
 
-try:
-    basestring
-except NameError:  # Python 3.x
-    basestring = str
-
 
 class ErrorCode(object):
     """
@@ -119,7 +114,7 @@ def check_response(self, response):
         stacktrace = None
         if isinstance(status, int):
             value_json = response.get('value', None)
-            if value_json and isinstance(value_json, basestring):
+            if value_json and isinstance(value_json, str):
                 import json
                 try:
                     value = json.loads(value_json)
@@ -129,7 +124,7 @@ def check_response(self, response):
                     if not status:
                         status = value["status"]
                         message = value["value"]
-                        if not isinstance(message, basestring):
+                        if not isinstance(message, str):
                             value = message
                             message = message.get('message')
                     else:
@@ -201,7 +196,7 @@ def check_response(self, response):
             exception_class = WebDriverException
         if not value:
             value = response['value']
-        if isinstance(value, basestring):
+        if isinstance(value, str):
             raise exception_class(value)
         if message == "" and 'message' in value:
             message = value['message']
@@ -213,7 +208,7 @@ def check_response(self, response):
         stacktrace = None
         st_value = value.get('stackTrace') or value.get('stacktrace')
         if st_value:
-            if isinstance(st_value, basestring):
+            if isinstance(st_value, str):
                 stacktrace = st_value.split('\n')
             else:
                 stacktrace = []

py/selenium/webdriver/remote/switch_to.py

@@ -20,11 +20,6 @@
 from selenium.webdriver.common.by import By
 from selenium.common.exceptions import NoSuchElementException, NoSuchFrameException, NoSuchWindowException
 
-try:
-    basestring
-except NameError:
-    basestring = str
-
 
 class SwitchTo:
     def __init__(self, driver):
@@ -85,7 +80,7 @@ def frame(self, frame_reference):
                 driver.switch_to.frame(1)
                 driver.switch_to.frame(driver.find_elements(By.TAG_NAME, "iframe")[0])
         """
-        if isinstance(frame_reference, basestring) and self._driver.w3c:
+        if isinstance(frame_reference, str) and self._driver.w3c:
             try:
                 frame_reference = self._driver.find_element(By.ID, frame_reference)
             except NoSuchElementException:

py/selenium/webdriver/remote/webdriver.py

@@ -49,11 +49,6 @@
 
 from six import add_metaclass
 
-try:
-    str = basestring
-except NameError:
-    pass
-
 
 _W3C_CAPABILITY_NAMES = frozenset([
     'acceptInsecureCerts',

py/selenium/webdriver/remote/webelement.py

@@ -16,7 +16,7 @@
 # under the License.
 
 import os
-from base64 import b64decode
+from base64 import b64decode, encodebytes
 from hashlib import md5 as md5_hash
 import pkgutil
 import warnings
@@ -31,17 +31,6 @@
 
 from six import add_metaclass
 
-# Python 3 imports
-try:
-    str = basestring
-except NameError:
-    pass
-
-try:
-    from base64 import encodebytes
-except ImportError:  # Python 2
-    from base64 import encodestring as encodebytes
-
 
 # TODO: when dropping Python 2.7, use built in importlib_resources.files
 # not relying on __package__ here as it can be `None` in some situations (see #4558)

py/test/selenium/webdriver/marionette/mn_options_tests.py

@@ -17,10 +17,6 @@
 
 import pytest
 
-try:
-    basestring
-except NameError:  # Python 3.x
-    basestring = str
 
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
@@ -110,7 +106,7 @@ def test_to_capabilities(self):
         caps = opts.to_capabilities()
         assert "moz:firefoxOptions" in caps
         assert "profile" in caps["moz:firefoxOptions"]
-        assert isinstance(caps["moz:firefoxOptions"]["profile"], basestring)
+        assert isinstance(caps["moz:firefoxOptions"]["profile"], str)
         assert caps["moz:firefoxOptions"]["profile"] == profile.encoded
 
         opts.add_argument("--foo")
@@ -124,7 +120,7 @@ def test_to_capabilities(self):
         caps = opts.to_capabilities()
         assert "moz:firefoxOptions" in caps
         assert "binary" in caps["moz:firefoxOptions"]
-        assert isinstance(caps["moz:firefoxOptions"]["binary"], basestring)
+        assert isinstance(caps["moz:firefoxOptions"]["binary"], str)
         assert caps["moz:firefoxOptions"]["binary"] == binary._start_cmd
 
         opts.set_preference("spam", "ham")