diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py
index 1fdc28c9c42dfde7479a2be59888747930c1d604..367fe9813ed8a71e49881e3174d70304cab9f86a 100644
--- a/pyopencl/cffi_cl.py
+++ b/pyopencl/cffi_cl.py
@@ -26,6 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
 
+import six
 from six.moves import map, range, zip
 
 import warnings
@@ -479,7 +480,7 @@ class Error(Exception):
 
         def __init__(self, msg='', code=0, routine=''):
             self._routine = routine
-            assert isinstance(code, (int, long))
+            assert isinstance(code, six.integer_types)
             self._code = code
             self._what = msg