[py]: remove alot of redundant else clauses throughout

symonk · symonk · commit c24ca170caa4 · 2022-09-02T20:30:55.000+01:00
diff --git a/py/selenium/webdriver/chromium/webdriver.py b/py/selenium/webdriver/chromium/webdriver.py
@@ -238,7 +238,4 @@ def quit(self) -> None:
             self.service.stop()
 
     def create_options(self) -> BaseOptions:
-        if self.vendor_prefix == "ms":
-            return EdgeOptions()
-        else:
-            return ChromeOptions()
+        return EdgeOptions() if self.vendor_prefix == "ms" else ChromeOptions()
diff --git a/py/selenium/webdriver/common/service.py b/py/selenium/webdriver/common/service.py
@@ -126,8 +126,7 @@ def send_remote_shutdown_command(self):
         for x in range(30):
             if not self.is_connectable():
                 break
-            else:
-                sleep(1)
+            sleep(1)
 
     def stop(self):
         """
diff --git a/py/selenium/webdriver/common/timeouts.py b/py/selenium/webdriver/common/timeouts.py
@@ -99,8 +99,7 @@ def script(self, _script: float) -> None:
     def _convert(self, timeout: float) -> int:
         if isinstance(timeout, (int, float)):
             return int(float(timeout) * 1000)
-        else:
-            raise TypeError("Timeouts can only be an int or a float")
+        raise TypeError("Timeouts can only be an int or a float")
 
     def _to_json(self) -> JSONTimeouts:
         timeouts: JSONTimeouts = {}
diff --git a/py/selenium/webdriver/common/utils.py b/py/selenium/webdriver/common/utils.py
@@ -126,10 +126,7 @@ def is_url_connectable(port: Union[int, str]) -> bool:
 
     try:
         res = url_request.urlopen("http://127.0.0.1:%s/status" % port)
-        if res.getcode() == 200:
-            return True
-        else:
-            return False
+        return res.getcode() == 200
     except Exception:
         return False
 
diff --git a/py/selenium/webdriver/remote/remote_connection.py b/py/selenium/webdriver/remote/remote_connection.py
@@ -402,9 +402,8 @@ def _request(self, method, url, body=None):
                 if 'value' not in data:
                     data['value'] = None
                 return data
-            else:
-                data = {'status': 0, 'value': data}
-                return data
+            data = {'status': 0, 'value': data}
+            return data
         finally:
             LOGGER.debug("Finished Request")
             response.close()
diff --git a/py/selenium/webdriver/remote/webdriver.py b/py/selenium/webdriver/remote/webdriver.py
@@ -253,8 +253,7 @@ def __init__(self, command_executor='http://127.0.0.1:4444',
             if desired_capabilities:
                 if not isinstance(desired_capabilities, dict):
                     raise WebDriverException("Desired Capabilities must be a dictionary")
-                else:
-                    capabilities.update(desired_capabilities)
+                capabilities.update(desired_capabilities)
         self.command_executor = command_executor
         if isinstance(self.command_executor, (str, bytes)):
             self.command_executor = get_remote_connection(capabilities, command_executor=command_executor,
@@ -329,8 +328,7 @@ def name(self) -> str:
         """
         if 'browserName' in self.caps:
             return self.caps['browserName']
-        else:
-            raise KeyError('browserName not specified in session capabilities')
+        raise KeyError('browserName not specified in session capabilities')
 
     def start_client(self):
         """
