[py]: Simplify some pointer_input code

symonk · symonk · commit fd9d8d89325c · 2022-09-03T14:39:35.000+01:00
diff --git a/py/selenium/webdriver/common/actions/pointer_input.py b/py/selenium/webdriver/common/actions/pointer_input.py
@@ -14,15 +14,15 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from .input_device import InputDevice
-from .interaction import POINTER, POINTER_KINDS
+import typing
 
 from selenium.common.exceptions import InvalidArgumentException
 from selenium.webdriver.remote.webelement import WebElement
+from .input_device import InputDevice
+from .interaction import POINTER, POINTER_KINDS
 
 
 class PointerInput(InputDevice):
-
     DEFAULT_MOVE_DURATION = 250
 
     def __init__(self, kind, name):
@@ -34,20 +34,25 @@ def __init__(self, kind, name):
         self.name = name
 
     def create_pointer_move(self, duration=DEFAULT_MOVE_DURATION, x=0, y=0, origin=None, **kwargs):
-        action = dict(type="pointerMove", duration=duration)
-        action["x"] = x
-        action["y"] = y
-        action.update(**kwargs)
+        action = {
+            "type": "pointerMove",
+            "duration": duration,
+            "x": x,
+            "y": y,
+            **kwargs
+        }
         if isinstance(origin, WebElement):
             action["origin"] = {"element-6066-11e4-a52e-4f735466cecf": origin.id}
-        elif origin:
+        elif origin is not None:
             action["origin"] = origin
-
         self.add_action(self._convert_keys(action))
 
     def create_pointer_down(self, **kwargs):
-        data = dict(type="pointerDown", duration=0)
-        data.update(**kwargs)
+        data = {
+            "type": "pointerDown",
+            "duration": 0,
+            **kwargs
+        }
         self.add_action(self._convert_keys(data))
 
     def create_pointer_up(self, button):
@@ -65,15 +70,15 @@ def encode(self):
                 "id": self.name,
                 "actions": self.actions}
 
-    def _convert_keys(self, actions):
+    def _convert_keys(self, actions: typing.Dict[str, typing.Any]):
         out = {}
-        for k in actions.keys():
-            if actions[k] is None:
+        for k, v in actions.items():
+            if v is None:
                 continue
-            if k == "x" or k == "y":
-                out[k] = int(actions[k])
+            if k in ("x", "y"):
+                out[k] = int(v)
                 continue
             splits = k.split('_')
             new_key = splits[0] + ''.join(v.title() for v in splits[1:])
-            out[new_key] = actions[k]
+            out[new_key] = v
         return out
diff --git a/py/selenium/webdriver/common/proxy.py b/py/selenium/webdriver/common/proxy.py
@@ -320,7 +320,7 @@ def socks_version(self, value) -> None:
         self.socksVersion = value
 
     def _verify_proxy_type_compatibility(self, compatible_proxy):
-        if self.proxyType != ProxyType.UNSPECIFIED and self.proxyType != compatible_proxy:
+        if self.proxyType not in (ProxyType.UNSPECIFIED, compatible_proxy):
             raise Exception(f"Specified proxy type ({compatible_proxy}) not compatible with current setting ({self.proxyType})")
 
     def add_to_capabilities(self, capabilities):
