Python 3 compat

2 files changed, 7 insertions, 1 deletions

diff --git a/cffi/api.py b/cffi/api.py
index d1e6f7d..ad293f2 100644
--- a/cffi/api.py
+++ b/cffi/api.py
@@ -7,6 +7,12 @@ except NameError:
     from collections import Callable
     callable = lambda x: isinstance(x, Callable)
 
+try:
+    basestring
+except NameError:
+    # Python 3.x
+    basestring = str
+
 
 class FFIError(Exception):
     pass
diff --git a/testing/test_zintegration.py b/testing/test_zintegration.py
index af7984a..18454ee 100644
--- a/testing/test_zintegration.py
+++ b/testing/test_zintegration.py
@@ -9,7 +9,7 @@ def create_venv(name):
         subprocess.check_call(['virtualenv', '--distribute',
                                '-p', sys.executable,
                                str(tmpdir)])
-    except OSError, e:
+    except OSError as e:
         py.test.skip("Cannot execute virtualenv: %s" % (e,))
 
     site_packages = None