use integer_types #38

gevent/fileobject.py

@@ -2,6 +2,7 @@ from __future__ import absolute_import, with_statement
 import sys
 import os
 from gevent.hub import get_hub
+from gevent.hub import integer_types
 from gevent.socket import EBADF
 from gevent.os import _read, _write, ignored_errors
 from gevent.lock import Semaphore, DummySemaphore
@@ -51,7 +52,7 @@ else:
         """
 
         def __init__(self, fileno, mode=None, close=True):
-            if not isinstance(fileno, (int, long)):
+            if not isinstance(fileno, integer_types):
                 raise TypeError('fileno must be int: %r' % fileno)
             self._fileno = fileno
             self._mode = mode or 'rb'
@@ -151,7 +152,7 @@ else:
     class FileObjectPosix(_fileobject):
 
         def __init__(self, fobj, mode='rb', bufsize=-1, close=True):
-            if isinstance(fobj, (int, long)):
+            if isinstance(fobj, integer_types):
                 fileno = fobj
                 fobj = None
             else:
@@ -216,7 +217,7 @@ class FileObjectThread(object):
             self.lock = DummySemaphore()
         if not hasattr(self.lock, '__enter__'):
             raise TypeError('Expected a Semaphore or boolean, got %r' % type(self.lock))
-        if isinstance(fobj, (int, long)):
+        if isinstance(fobj, integer_types):
             if not self._close:
                 # we cannot do this, since fdopen object will close the descriptor
                 raise TypeError('FileObjectThread does not support close=False')
@@ -292,7 +293,7 @@ class FileObjectBlock(object):
         self._close = kwargs.pop('close', True)
         if kwargs:
             raise TypeError('Unexpected arguments: %r' % kwargs.keys())
-        if isinstance(fobj, (int, long)):
+        if isinstance(fobj, integer_types):
             if not self._close:
                 # we cannot do this, since fdopen object will close the descriptor
                 raise TypeError('FileObjectBlock does not support close=False')

gevent/select.py

@@ -2,6 +2,7 @@
 from __future__ import absolute_import
 from gevent.event import Event
 from gevent.hub import get_hub
+from gevent.hub import integer_types
 
 __implements__ = ['select']
 __all__ = ['error'] + __implements__
@@ -14,7 +15,7 @@ def get_fileno(obj):
     try:
         fileno_f = obj.fileno
     except AttributeError:
-        if not isinstance(obj, (int, long)):
+        if not isinstance(obj, integer_types):
             raise TypeError('argument must be an int, or have a fileno() method: %r' % (obj, ))
         return obj
     else:

gevent/subprocess.py

@@ -7,7 +7,7 @@ import gc
 import signal
 import traceback
 from gevent.event import AsyncResult
-from gevent.hub import get_hub, linkproxy, sleep, getcurrent
+from gevent.hub import get_hub, linkproxy, sleep, getcurrent, integer_types
 from gevent.fileobject import FileObject
 from gevent.greenlet import Greenlet, joinall
 spawn = Greenlet.spawn
@@ -176,7 +176,7 @@ class Popen(object):
                  cwd=None, env=None, universal_newlines=False,
                  startupinfo=None, creationflags=0, threadpool=None):
         """Create new Popen instance."""
-        if not isinstance(bufsize, (int, long)):
+        if not isinstance(bufsize, integer_types):
             raise TypeError("bufsize must be an integer")
         hub = get_hub()