Fix recent python 3 regressions

Author: davehunt

py/selenium/webdriver/firefox/webdriver.py

@@ -118,12 +118,12 @@ def __init__(self, firefox_profile=None, firefox_binary=None,
         # firefox_binary and firefox_profile
         # override firefox_options
         if firefox_binary is not None:
-            if isinstance(firefox_binary, types.StringTypes):
+            if isinstance(firefox_binary, basestring):
                 firefox_binary = FirefoxBinary(firefox_binary)
             self.binary = firefox_binary
             firefox_options.binary = firefox_binary
         if firefox_profile is not None:
-            if isinstance(firefox_profile, types.StringTypes):
+            if isinstance(firefox_profile, basestring):
                 firefox_profile = FirefoxProfile(firefox_profile)
             self.profile = firefox_profile
             firefox_options.profile = firefox_profile

py/test/selenium/webdriver/firefox/ff_profile_tests.py

@@ -59,7 +59,7 @@ def test_that_prefs_are_written_in_the_correct_format(self):
         assert 'hi there' == profile.default_preferences["sample.preference"]
 
         encoded = profile.encoded
-        decoded = base64.decodestring(encoded)
+        decoded = base64.b64decode(encoded)
         with BytesIO(decoded) as fp:
             zip = zipfile.ZipFile(fp, "r")
             for entry in zip.namelist():
@@ -79,7 +79,7 @@ def test_that_unicode_prefs_are_written_in_the_correct_format(self):
         assert 'hi there' == profile.default_preferences["sample.preference.2"]
 
         encoded = profile.encoded
-        decoded = base64.decodestring(encoded)
+        decoded = base64.b64decode(encoded)
         with BytesIO(decoded) as fp:
             zip = zipfile.ZipFile(fp, "r")
             for entry in zip.namelist():

py/test/selenium/webdriver/marionette/mn_options_tests.py

@@ -16,9 +16,11 @@
 # under the License.
 
 import pytest
-import shutil
-import tempfile
-import types
+
+try:
+    basestring
+except NameError:  # Python 3.x
+    basestring = str
 
 from selenium.webdriver.firefox.firefox_binary import FirefoxBinary
 from selenium.webdriver.firefox.firefox_profile import FirefoxProfile
@@ -92,7 +94,7 @@ def test_to_capabilities(self):
         caps = opts.to_capabilities()
         assert "moz:firefoxOptions" in caps
         assert "profile" in caps["moz:firefoxOptions"]
-        assert isinstance(caps["moz:firefoxOptions"]["profile"], types.StringTypes)
+        assert isinstance(caps["moz:firefoxOptions"]["profile"], basestring)
         assert caps["moz:firefoxOptions"]["profile"] == profile.encoded
 
         opts.add_argument("--foo")
@@ -106,5 +108,5 @@ def test_to_capabilities(self):
         caps = opts.to_capabilities()
         assert "moz:firefoxOptions" in caps
         assert "binary" in caps["moz:firefoxOptions"]
-        assert isinstance(caps["moz:firefoxOptions"]["binary"], types.StringTypes)
+        assert isinstance(caps["moz:firefoxOptions"]["binary"], basestring)
         assert caps["moz:firefoxOptions"]["binary"] == binary._start_cmd