Fixes types for both python 2.7 and 3.x.

src/Selenium2Library/keywords/_browsermanagement.py

@@ -12,6 +12,10 @@
 
 from .keywordgroup import KeywordGroup
 
+try:
+ unicode = unicode
+except:
+ unicode = str
 
 ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 FIREFOX_PROFILE_DIR = os.path.join(ROOT_DIR, 'resources', 'firefoxprofile')

src/Selenium2Library/keywords/_element.py

@@ -8,6 +8,11 @@
 
 from .keywordgroup import KeywordGroup
 
+try:
+ unicode = unicode
+except NameError:
+ basestring = (str,bytes)
+
 
 class _ElementKeywords(KeywordGroup):
 

src/Selenium2Library/keywords/_logging.py

@@ -2,6 +2,7 @@
 
 from robot.api import logger
 from robot.libraries.BuiltIn import BuiltIn
+
 try:
  from robot.libraries.BuiltIn import RobotNotRunningError
 except ImportError: # Support RF < 2.8.5

src/Selenium2Library/keywords/keywordgroup.py

@@ -1,7 +1,7 @@
 import sys
 import inspect
-
 from decorator import decorator
+from future.utils import with_metaclass
 
 
 def _run_on_failure_decorator(method, *args, **kwargs):
@@ -32,6 +32,5 @@ def __new__(cls, clsname, bases, dict):
  dict[name] = decorator(_run_on_failure_decorator, method)
  return type.__new__(cls, clsname, bases, dict)
 
-
-class KeywordGroup(object):
- __metaclass__ = KeywordGroupMetaClass
+class KeywordGroup(with_metaclass(KeywordGroupMetaClass, object)):
+ pass

src/Selenium2Library/locators/customlocator.py

@@ -1,5 +1,11 @@
+from builtins import object
 from robot.libraries.BuiltIn import BuiltIn
 
+try:
+ unicode = unicode
+except NameError:
+ basestring = (str,bytes)
+
 
 class CustomLocator(object):
 

src/Selenium2Library/utils/__init__.py

@@ -1,10 +1,11 @@
+from builtins import str
 from . import events
 from .browsercache import BrowserCache
 from .librarylistener import LibraryListener
 
 
 def escape_xpath_value(value):
- value = unicode(value)
+ value = str(value)
  if '"' in value and '\'' in value:
  parts_wo_apos = value.split('\'')
  return "concat('%s')" % "', \"'\", '".join(parts_wo_apos)

src/Selenium2Library/utils/events/event.py

@@ -1,4 +1,5 @@
 import abc
+from builtins import object
 
 
 class Event(object):