some py3 compatibility

Author: lukeis

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:

py/test/selenium/webdriver/common/executing_javascript_tests.py

@@ -20,7 +20,7 @@
 
 try:
     str = unicode
-except ImportError:
+except NameError:
     pass