From d768d0f10f9b96b9a82cd516a175781800a335d1 Mon Sep 17 00:00:00 2001 From: hellmanj Date: Mon, 8 Dec 2014 13:20:30 -0500 Subject: [PATCH] don't pass service_args when creating browser unless it's accepted by webdriver --- robotpageobjects/base.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/robotpageobjects/base.py b/robotpageobjects/base.py index a4e71b3..dfb327c 100755 --- a/robotpageobjects/base.py +++ b/robotpageobjects/base.py @@ -757,10 +757,13 @@ def go_to(self, *args): def _generic_make_browser(self, webdriver_type, desired_cap_type, remote_url, desired_caps): """Override Selenium2Library's _generic_make_browser to allow for extra params to driver constructor.""" + kwargs = {} if not remote_url: - browser = webdriver_type(service_args=self.service_args) + if 'service_args' in inspect.getargspec(webdriver_type.__init__).args: + kwargs['service_args'] = self.service_args + browser = webdriver_type(**kwargs) else: - browser = self._create_remote_web_driver(desired_cap_type,remote_url , desired_caps) + browser = self._create_remote_web_driver(desired_cap_type, remote_url, desired_caps) return browser def _make_browser(self, browser_name, desired_capabilities=None, profile_dir=None, remote=None):