[py] python3.7+ syntax throughout *.py files. (#10647)

* upgrading python to `3.7+` throughout

* additional `f` conversions

* fix `flake8` violations; tidy up formatting

* make python3 changes apply to only `/py`

Author: symonk

py/conftest.py

@@ -88,7 +88,7 @@ def driver(request):
         pytest.skip("Webkit tests can only run on Linux")
 
     # conditionally mark tests as expected to fail based on driver
-    marker = request.node.get_closest_marker('xfail_{0}'.format(driver_class.lower()))
+    marker = request.node.get_closest_marker(f'xfail_{driver_class.lower()}')
 
     if marker is not None:
         if "run" in marker.kwargs:
@@ -149,7 +149,7 @@ def get_options(driver_class, config):
 
     if browser_path or browser_args:
         if not options:
-            options = getattr(webdriver, '{}Options'.format(driver_class))()
+            options = getattr(webdriver, f'{driver_class}Options')()
         if driver_class == 'WebKitGTK':
             options.overlay_scrollbars_enabled = False
         if browser_path is not None:
@@ -213,21 +213,21 @@ def wait_for_server(url, timeout):
             try:
                 urlopen(url)
                 return 1
-            except IOError:
+            except OSError:
                 time.sleep(0.2)
         return 0
 
     _socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    url = 'http://{}:{}/status'.format(_host, _port)
+    url = f'http://{_host}:{_port}/status'
     try:
         _socket.connect((_host, _port))
         print('The remote driver server is already running or something else'
               'is using port {}, continuing...'.format(_port))
     except Exception:
         print('Starting the Selenium server')
         process = subprocess.Popen(['java', '-jar', _path, 'standalone', '--port', '4444'])
-        print('Selenium server running as process: {}'.format(process.pid))
-        assert wait_for_server(url, 10), 'Timed out waiting for Selenium server at {}'.format(url)
+        print(f'Selenium server running as process: {process.pid}')
+        assert wait_for_server(url, 10), f'Timed out waiting for Selenium server at {url}'
         print('Selenium server is ready')
         yield process
         process.terminate()

py/docs/source/conf.py

@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from __future__ import unicode_literals
 
 import sys
 import os

py/generate.py

@@ -124,7 +124,7 @@ def inline_doc(description):
         return ''
 
     description = escape_backticks(description)
-    lines = ['#: {}'.format(l) for l in description.split('\n')]
+    lines = [f'#: {l}' for l in description.split('\n')]
     return '\n'.join(lines)
 
 
@@ -162,7 +162,7 @@ def ref_to_python(ref):
     '''
     if '.' in ref:
         domain, subtype = ref.split('.')
-        ref = '{}.{}'.format(snake_case(domain), subtype)
+        ref = f'{snake_case(domain)}.{subtype}'
     return f"{ref}"
 
 
@@ -228,7 +228,7 @@ def py_annotation(self):
         if self.items:
             if self.items.ref:
                 py_ref = ref_to_python(self.items.ref)
-                ann = "typing.List[{}]".format(py_ref)
+                ann = f"typing.List[{py_ref}]"
             else:
                 ann = 'typing.List[{}]'.format(
                     CdpPrimitiveType.get_annotation(self.items.type))
@@ -500,7 +500,7 @@ def generate_code(self):
                 py_type = f'typing.List[{nested_type}]'
         else:
             if self.ref:
-                py_type = "{}".format(ref_to_python(self.ref))
+                py_type = f"{ref_to_python(self.ref)}"
             else:
                 py_type = CdpPrimitiveType.get_annotation(
                     typing.cast(str, self.type))
@@ -939,7 +939,7 @@ def parse(json_path, output_path):
     :returns: a list of CDP domain objects
     '''
     global current_version
-    with open(json_path, "r") as json_file:
+    with open(json_path) as json_file:
         schema = json.load(json_file)
     version = schema['version']
     assert (version['major'], version['minor']) == ('1', '3')
@@ -960,7 +960,7 @@ def generate_init(init_path, domains):
     with open(init_path, "w") as init_file:
         init_file.write(INIT_HEADER)
         for domain in domains:
-            init_file.write('from . import {}\n'.format(domain.module))
+            init_file.write(f'from . import {domain.module}\n')
         init_file.write('from . import util\n\n')
 
 

py/selenium/common/exceptions.py

@@ -138,11 +138,11 @@ class UnexpectedAlertPresentException(WebDriverException):
     """
 
     def __init__(self, msg: Optional[str] = None, screen: Optional[str] = None, stacktrace: Optional[Sequence[str]] = None, alert_text: Optional[str] = None) -> None:
-        super(UnexpectedAlertPresentException, self).__init__(msg, screen, stacktrace)
+        super().__init__(msg, screen, stacktrace)
         self.alert_text = alert_text
 
     def __str__(self) -> str:
-        return "Alert Text: %s\n%s" % (self.alert_text, super(UnexpectedAlertPresentException, self).__str__())
+        return f"Alert Text: {self.alert_text}\n{super().__str__()}"
 
 
 class NoAlertPresentException(WebDriverException):

py/selenium/webdriver/chrome/service.py

@@ -39,7 +39,7 @@ def __init__(self, executable_path: str = DEFAULT_EXECUTABLE_PATH,
          - service_args : List of args to pass to the chromedriver service
          - log_path : Path for the chromedriver service to log to"""
 
-        super(Service, self).__init__(
+        super().__init__(
             executable_path,
             port,
             service_args,

py/selenium/webdriver/chrome/webdriver.py

@@ -20,7 +20,6 @@
 from .service import DEFAULT_EXECUTABLE_PATH, Service
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 
-
 DEFAULT_PORT = 0
 DEFAULT_SERVICE_LOG_PATH = None
 DEFAULT_KEEP_ALIVE = None
@@ -67,7 +66,7 @@ def __init__(self, executable_path=DEFAULT_EXECUTABLE_PATH, port=DEFAULT_PORT,
         if not service:
             service = Service(executable_path, port, service_args, service_log_path)
 
-        super(WebDriver, self).__init__(DesiredCapabilities.CHROME['browserName'], "goog",
-                                        port, options,
-                                        service_args, desired_capabilities,
-                                        service_log_path, service, keep_alive)
+        super().__init__(DesiredCapabilities.CHROME['browserName'], "goog",
+                         port, options,
+                         service_args, desired_capabilities,
+                         service_log_path, service, keep_alive)

py/selenium/webdriver/chromium/options.py

@@ -28,7 +28,7 @@ class ChromiumOptions(ArgOptions):
     KEY = "goog:chromeOptions"
 
     def __init__(self) -> None:
-        super(ChromiumOptions, self).__init__()
+        super().__init__()
         self._binary_location = ''
         self._extension_files = []
         self._extensions = []
@@ -98,7 +98,7 @@ def add_extension(self, extension: str) -> None:
             if os.path.exists(extension_to_add):
                 self._extension_files.append(extension_to_add)
             else:
-                raise IOError("Path to the extension doesn't exist")
+                raise OSError("Path to the extension doesn't exist")
         else:
             raise ValueError("argument can not be null")
 

py/selenium/webdriver/chromium/remote_connection.py

@@ -27,10 +27,10 @@ def __init__(self, remote_server_addr, vendor_prefix, browser_name, keep_alive=T
         self._commands["setNetworkConditions"] = ('POST', '/session/$sessionId/chromium/network_conditions')
         self._commands["getNetworkConditions"] = ('GET', '/session/$sessionId/chromium/network_conditions')
         self._commands["deleteNetworkConditions"] = ('DELETE', '/session/$sessionId/chromium/network_conditions')
-        self._commands['executeCdpCommand'] = ('POST', '/session/$sessionId/{}/cdp/execute'.format(vendor_prefix))
-        self._commands['getSinks'] = ('GET', '/session/$sessionId/{}/cast/get_sinks'.format(vendor_prefix))
-        self._commands['getIssueMessage'] = ('GET', '/session/$sessionId/{}/cast/get_issue_message'.format(vendor_prefix))
-        self._commands['setSinkToUse'] = ('POST', '/session/$sessionId/{}/cast/set_sink_to_use'.format(vendor_prefix))
-        self._commands['startDesktopMirroring'] = ('POST', '/session/$sessionId/{}/cast/start_desktop_mirroring'.format(vendor_prefix))
-        self._commands['startTabMirroring'] = ('POST', '/session/$sessionId/{}/cast/start_tab_mirroring'.format(vendor_prefix))
-        self._commands['stopCasting'] = ('POST', '/session/$sessionId/{}/cast/stop_casting'.format(vendor_prefix))
+        self._commands['executeCdpCommand'] = ('POST', f'/session/$sessionId/{vendor_prefix}/cdp/execute')
+        self._commands['getSinks'] = ('GET', f'/session/$sessionId/{vendor_prefix}/cast/get_sinks')
+        self._commands['getIssueMessage'] = ('GET', f'/session/$sessionId/{vendor_prefix}/cast/get_issue_message')
+        self._commands['setSinkToUse'] = ('POST', f'/session/$sessionId/{vendor_prefix}/cast/set_sink_to_use')
+        self._commands['startDesktopMirroring'] = ('POST', f'/session/$sessionId/{vendor_prefix}/cast/start_desktop_mirroring')
+        self._commands['startTabMirroring'] = ('POST', f'/session/$sessionId/{vendor_prefix}/cast/start_tab_mirroring')
+        self._commands['stopCasting'] = ('POST', f'/session/$sessionId/{vendor_prefix}/cast/stop_casting')

py/selenium/webdriver/common/actions/interaction.py

@@ -20,13 +20,13 @@
 POINTER = "pointer"
 NONE = "none"
 WHEEL = "wheel"
-SOURCE_TYPES = set([KEY, POINTER, NONE])
+SOURCE_TYPES = {KEY, POINTER, NONE}
 
 POINTER_MOUSE = "mouse"
 POINTER_TOUCH = "touch"
 POINTER_PEN = "pen"
 
-POINTER_KINDS = set([POINTER_MOUSE, POINTER_TOUCH, POINTER_PEN])
+POINTER_KINDS = {POINTER_MOUSE, POINTER_TOUCH, POINTER_PEN}
 
 
 class Interaction:

py/selenium/webdriver/common/actions/key_actions.py

@@ -25,7 +25,7 @@ def __init__(self, source=None):
         if not source:
             source = KeyInput(KEY)
         self.source = source
-        super(KeyActions, self).__init__(source)
+        super().__init__(source)
 
     def key_down(self, letter):
         return self._key_action("create_key_down", letter)