Merge 369193e into bed68d1

symonk · web-flow · commit 26e9216f29da · 2021-11-30T11:30:44.000Z
diff --git a/py/selenium/webdriver/support/relative_locator.py b/py/selenium/webdriver/support/relative_locator.py
@@ -133,7 +133,7 @@ def to_right_of(self, element_or_locator: Union[WebElement, Dict] = None) -> "Re
 
     def near(self, element_or_locator_distance: Union[WebElement, Dict, int] = None) -> "RelativeBy":
         """
-            Add a filter to look for elements above.
+            Add a filter to look for elements near.
             :Args:
                 - element_or_locator_distance: Element to look near by the element or within a distance
         """
diff --git a/py/test/selenium/webdriver/common/webserver.py b/py/test/selenium/webdriver/common/webserver.py
@@ -17,7 +17,7 @@
 
 """A simple web server for testing purpose.
 It serves the testing html pages that are needed by the webdriver unit tests."""
-
+import contextlib
 import logging
 import os
 import re
@@ -75,7 +75,7 @@ def do_GET(self):
             self.end_headers()
             self.wfile.write(html)
         except IOError:
-            self.send_error(404, 'File Not Found: %s' % path)
+            self.send_error(404, f"File Not Found: {path}")
 
     def do_POST(self):
         """POST method handler."""
@@ -141,7 +141,7 @@ def __init__(self, host=DEFAULT_HOST, port=DEFAULT_PORT):
                 self.port = port
                 break
             except socket.error:
-                LOGGER.debug("port %d is in use, trying to next one" % port)
+                LOGGER.debug(f"port {port} is in use, trying to next one")
                 port += 1
 
         self.thread = threading.Thread(target=self._run_web_server)
@@ -160,14 +160,11 @@ def start(self):
     def stop(self):
         """Stops the server."""
         self.stop_serving = True
-        try:
-            # This is to force stop the server loop
-            urllib_request.URLopener().open("http://%s:%d" % (self.host, self.port))
-        except IOError:
-            pass
+        with contextlib.suppress(IOError):
+            _ = urllib_request.urlopen(f"http://{self.host}:{self.port}")
 
-    def where_is(self, path):
-        return "http://%s:%d/%s" % (self.host, self.port, path)
+    def where_is(self, path) -> str:
+        return f"http://{self.host}:{self.port}/{path}"
 
 
 def main(argv=None):
@@ -180,16 +177,16 @@ def main(argv=None):
 
     parser = OptionParser("%prog [options]")
     parser.add_option("-p", "--port", dest="port", type="int",
-                      help="port to listen (default: %s)" % DEFAULT_PORT,
+                      help=f"port to listen (default: {DEFAULT_PORT})",
                       default=DEFAULT_PORT)
 
     opts, args = parser.parse_args(argv[1:])
     if args:
         parser.error("wrong number of arguments")  # Will exit
 
-    server = SimpleWebServer(opts.port)
+    server = SimpleWebServer(port=opts.port)
     server.start()
-    print("Server started on port %s, hit CTRL-C to quit" % opts.port)
+    print(f"Server started on port {opts.port}, hit CTRL-C to quit")
     try:
         while 1:
             sleep(0.1)
