[py] Correct deprecations in IE bindings. Fixes #9818

Author: AutomatedTester

py/selenium/webdriver/common/desired_capabilities.py

@@ -55,7 +55,7 @@ class DesiredCapabilities(object):
 
     INTERNETEXPLORER = {
         "browserName": "internet explorer",
-        "platformName": "WINDOWS",
+        "platformName": "windows",
     }
 
     EDGE = {
@@ -72,7 +72,7 @@ class DesiredCapabilities(object):
 
     SAFARI = {
         "browserName": "safari",
-        "platformName": "MAC",
+        "platformName": "mac",
     }
 
     HTMLUNIT = {
@@ -91,13 +91,13 @@ class DesiredCapabilities(object):
     IPHONE = {
         "browserName": "iPhone",
         "version": "",
-        "platform": "MAC",
+        "platform": "mac",
     }
 
     IPAD = {
         "browserName": "iPad",
         "version": "",
-        "platform": "MAC",
+        "platform": "mac",
     }
 
     WEBKITGTK = {

py/selenium/webdriver/ie/webdriver.py

@@ -61,7 +61,7 @@ def __init__(self, executable_path='IEDriverServer.exe', capabilities=None,
                           DeprecationWarning, stacklevel=2)
         if capabilities:
             warnings.warn('capabilities has been deprecated, please pass in an Options object.'
-                          'This field will be ignored if an Options object is also used.',
+                          'This field will be ignored.',
                           DeprecationWarning, stacklevel=2)
         if port != DEFAULT_PORT:
             warnings.warn('port has been deprecated, please pass in a Service object',
@@ -79,32 +79,23 @@ def __init__(self, executable_path='IEDriverServer.exe', capabilities=None,
             warnings.warn('service_log_path has been deprecated, please pass in a Service object',
                           DeprecationWarning, stacklevel=2)
         if desired_capabilities:
-            warnings.warn('desired_capabilities has been deprecated, please pass in an Options object',
+            warnings.warn('desired_capabilities has been deprecated, please pass in an Options object.'
+                          'This field will be ignored',
                           DeprecationWarning, stacklevel=2)
         if keep_alive != DEFAULT_KEEP_ALIVE:
             warnings.warn('keep_alive has been deprecated, please pass in a Service object',
                           DeprecationWarning, stacklevel=2)
         else:
-            keep_alive = False
+            keep_alive = True
 
         self.host = host
         self.port = port
         if self.port == 0:
             self.port = utils.free_port()
 
-        # If both capabilities and desired capabilities are set, ignore desired capabilities.
-        if not capabilities and desired_capabilities:
-            capabilities = desired_capabilities
-
         if not options:
-            if not capabilities:
-                capabilities = self.create_options().to_capabilities()
-        else:
-            if not capabilities:
-                capabilities = options.to_capabilities()
-            else:
-                # desired_capabilities stays as passed in
-                capabilities.update(options.to_capabilities())
+            options = self.create_options()
+
         if service:
             self.iedriver = service
         else: