From 01ac9f8430ca668a6b72df37d0e44aca92d46c50 Mon Sep 17 00:00:00 2001 From: AutomatedTester Date: Thu, 13 Apr 2017 11:56:55 +0100 Subject: [PATCH] Use W3C check from parent object instead of assuming from capabilities --- py/selenium/webdriver/firefox/webdriver.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/py/selenium/webdriver/firefox/webdriver.py b/py/selenium/webdriver/firefox/webdriver.py index a69d7d4607b50..64416c35ec53f 100644 --- a/py/selenium/webdriver/firefox/webdriver.py +++ b/py/selenium/webdriver/firefox/webdriver.py @@ -104,7 +104,6 @@ def __init__(self, firefox_profile=None, firefox_binary=None, self.binary = None self.profile = None self.service = None - self._w3c = False if capabilities is None: capabilities = DesiredCapabilities.FIREFOX.copy() @@ -138,8 +137,7 @@ def __init__(self, firefox_profile=None, firefox_binary=None, # TODO(ato): Perform conformance negotiation if capabilities.get("marionette"): - self._w3c = True - + capabilities.pop("marionette") self.service = Service(executable_path, log_path=log_path) self.service.start() @@ -186,7 +184,7 @@ def quit(self): # the socket. pass - if self._w3c: + if self.w3c: self.service.stop() else: self.binary.kill()