some more py3 support

SeleniumHQ · Dec 9, 2013 · fac5e0b · fac5e0b
1 parent 6999ca2
commit fac5e0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/py/selenium/webdriver/common/proxy.py b/py/selenium/webdriver/common/proxy.py
@@ -30,12 +30,12 @@ class ProxyType:
 
     @classmethod
     def load(cls, value):
-        if isinstance(value, dict) and value.has_key('string'):
+        if isinstance(value, dict) and 'string' in value:
             value = value['string']
         value = str(value).upper()
         for attr in dir(cls):
             attr_value = getattr(cls, attr)
-            if isinstance(attr_value, dict) and attr_value.has_key('string') and \
+            if isinstance(attr_value, dict) and 'string' in attr_value and \
                 attr_value['string'] is not None and attr_value['string'] == value:
                 return attr_value
         raise Exception("No proxy type is found for %s" % (value))

diff --git a/py/test/selenium/webdriver/common/executing_javascript_tests.py b/py/test/selenium/webdriver/common/executing_javascript_tests.py
@@ -18,6 +18,11 @@
 import unittest
 from selenium.webdriver.remote.webelement import WebElement
 
+try:
+    str = unicode
+except ImportError:
+    pass
+
 
 class ExecutingJavaScriptTests(unittest.TestCase):
 
@@ -26,7 +31,7 @@ def testShouldBeAbleToExecuteSimpleJavascriptAndReturnAString(self):
 
         result = self.driver.execute_script("return document.title")
 
-        self.assertTrue(type(result) == unicode,
+        self.assertTrue(type(result) == str,
             "The type of the result is %s" % type(result))
         self.assertEqual("XHTML Test Page", result)