some py3 compatibility

SeleniumHQ · Dec 12, 2013 · bda568d · bda568d
1 parent a1df581
commit bda568d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/py/selenium/webdriver/remote/remote_connection.py b/py/selenium/webdriver/remote/remote_connection.py
@@ -409,7 +409,8 @@ def _request(self, url, data=None, method=None):
                                                   HttpErrorHandler())
             resp = opener.open(request)
             statuscode = resp.code
-            resp.getheader = lambda x: resp.headers.getheader(x)
+            if not hasattr(resp, 'getheader'):
+                resp.getheader = lambda x: resp.headers.getheader(x)
 
         data = resp.read()
         try:

diff --git a/py/test/selenium/webdriver/common/executing_javascript_tests.py b/py/test/selenium/webdriver/common/executing_javascript_tests.py
@@ -20,7 +20,7 @@
 
 try:
     str = unicode
-except ImportError:
+except NameError:
     pass
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ @@
     try:
         str = unicode
-    except ImportError:
+    except NameError:
         pass
@@ Expand Down @@