SeleniumHQ
diff --git a/‎py/selenium/webdriver/common/options.py‎
Lines changed: 3 additions & 1 deletion b/‎py/selenium/webdriver/common/options.py‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎py/selenium/webdriver/remote/file_detector.py‎
Lines changed: 4 additions & 3 deletions b/‎py/selenium/webdriver/remote/file_detector.py‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎py/selenium/webdriver/remote/webdriver.py‎
Lines changed: 4 additions & 2 deletions b/‎py/selenium/webdriver/remote/webdriver.py‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎py/selenium/webdriver/remote/webelement.py‎
Lines changed: 4 additions & 1 deletion b/‎py/selenium/webdriver/remote/webelement.py‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎py/selenium/webdriver/support/event_firing_webdriver.py‎
Lines changed: 4 additions & 0 deletions b/‎py/selenium/webdriver/support/event_firing_webdriver.py‎
Lines changed: 4 additions & 0 deletions
@@ -17,12 +17,14 @@
 
 from abc import ABCMeta, abstractmethod
 
+from six import add_metaclass
 
+
+@add_metaclass(ABCMeta)
 class BaseOptions(object):
     """
     Base class for individual browser options
     """
-    __metaclass__ = ABCMeta
 
     def __init__(self):
         self._caps = self.default_capabilities
 
@@ -15,19 +15,20 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import abc
+from abc import ABCMeta, abstractmethod
 import os
 from selenium.webdriver.common.utils import keys_to_typing
+from six import add_metaclass
 
 
+@add_metaclass(ABCMeta)
 class FileDetector(object):
     """
     Used for identifying whether a sequence of chars represents the path to a
     file.
     """
-    __metaclass__ = abc.ABCMeta
 
-    @abc.abstractmethod
+    @abstractmethod
     def is_local_file(self, *keys):
         return
 
 
@@ -41,6 +41,8 @@
 from selenium.webdriver.common.html5.application_cache import ApplicationCache
 from selenium.webdriver.support.relative_locator import RelativeBy
 
+from six import add_metaclass
+
 try:
     str = basestring
 except NameError:
@@ -114,14 +116,14 @@ def get_remote_connection(capabilities, command_executor, keep_alive):
     return handler(command_executor, keep_alive=keep_alive)
 
 
+@add_metaclass(ABCMeta)
 class BaseWebDriver(object):
     """
     Abstract Base Class for all Webdriver subtypes.
     ABC's allow custom implementations of Webdriver to be registered so that isinstance type checks
     will succeed.
     """
-    __metaclass__ = ABCMeta
-    # TODO: After dropping Python 2, use ABC instead of ABCMeta and remove all Python 2 metaclass declarations.
+    # TODO: After dropping Python 2, use ABC instead of ABCMeta and remove metaclass decorator.
 
 
 class WebDriver(BaseWebDriver):
 
@@ -29,6 +29,8 @@
 from selenium.webdriver.common.utils import keys_to_typing
 from .command import Command
 
+from six import add_metaclass
+
 # Python 3 imports
 try:
     str = basestring
@@ -48,12 +50,13 @@
 isDisplayed_js = pkgutil.get_data(_pkg, 'isDisplayed.js').decode('utf8')
 
 
+@add_metaclass(ABCMeta)
 class BaseWebElement(object):
     """
     Abstract Base Class for WebElement.
     ABC's will allow custom types to be registered as a WebElement to pass type checks.
     """
-    __metaclass__ = ABCMeta
+    pass
 
 
 class WebElement(BaseWebElement):
 
@@ -26,12 +26,16 @@
 
 
 def _wrap_elements(result, ef_driver):
+    # handle the case if another wrapper wraps EventFiringWebElement
     if isinstance(result, EventFiringWebElement):
         return result
     elif isinstance(result, WebElement):
         return EventFiringWebElement(result, ef_driver)
     elif isinstance(result, list):
         return [_wrap_elements(item, ef_driver) for item in result]
+    # result is a built in type.
+    else:
+        return result
 
 
 class EventFiringWebDriver(object):