Merge pull request #352 from surfly/pr344

Py3-related random fixes

benchmarks/micro.sh

@@ -11,7 +11,7 @@ python -mtimeit -r 6 -s'from gevent.coros import Semaphore; from gevent import s
 
 python -mtimeit -r 6 -s'from gevent import spawn; f = lambda : 5' 'spawn(f)'
 python -mtimeit -r 6 -s'from gevent import spawn; f = lambda : 5' 'spawn(f).join()'
-python -mtimeit -r 6 -s'from gevent import spawn, run; f = lambda : 5' 'for _ in xrange(10000): spawn(f)' 'run()'
+python -mtimeit -r 6 -s'from gevent import spawn, run; from gevent.hub import xrange; f = lambda : 5' 'for _ in xrange(10000): spawn(f)' 'run()'
 python -mtimeit -r 6 -s'from gevent import spawn_raw; f = lambda : 5' 'spawn_raw(f)'
 
 python -mtimeit -r 6 -s'from gevent import sleep; f = lambda : 5' 'sleep(0)'

benchmarks/micro_greenlet_link.sh

 #!/bin/sh
 set -e -x
-python -mtimeit -r 6 -s'from gevent import spawn; g = spawn(lambda: 5); l = lambda: 5' 'for _ in xrange(1000): g.link(l)'
-python -mtimeit -r 6 -s'from gevent import spawn; g = spawn(lambda: 5); l = lambda *args: 5' 'for _ in xrange(10): g.link(l);' 'g.join()'
-python -mtimeit -r 6 -s'from gevent import spawn; g = spawn(lambda: 5); l = lambda *args: 5' 'for _ in xrange(100): g.link(l);' 'g.join()'
-python -mtimeit -r 6 -s'from gevent import spawn; g = spawn(lambda: 5); l = lambda *args: 5' 'for _ in xrange(1000): g.link(l);' 'g.join()'
-python -mtimeit -r 6 -s'from gevent import spawn; g = spawn(lambda: 5); l = lambda *args: 5' 'for _ in xrange(10000): g.link(l);' 'g.join()'
-python -mtimeit -r 6 -s'from gevent import spawn; g = spawn(lambda: 5); l = lambda *args: 5' 'for _ in xrange(100000): g.link(l);' 'g.join()'
+python -mtimeit -r 6 -s'from gevent import spawn; from gevent.hub import xrange; g = spawn(lambda: 5); l = lambda: 5' 'for _ in xrange(1000): g.link(l)'
+python -mtimeit -r 6 -s'from gevent import spawn; from gevent.hub import xrange; g = spawn(lambda: 5); l = lambda *args: 5' 'for _ in xrange(10): g.link(l);' 'g.join()'
+python -mtimeit -r 6 -s'from gevent import spawn; from gevent.hub import xrange; g = spawn(lambda: 5); l = lambda *args: 5' 'for _ in xrange(100): g.link(l);' 'g.join()'
+python -mtimeit -r 6 -s'from gevent import spawn; from gevent.hub import xrange; g = spawn(lambda: 5); l = lambda *args: 5' 'for _ in xrange(1000): g.link(l);' 'g.join()'
+python -mtimeit -r 6 -s'from gevent import spawn; from gevent.hub import xrange; g = spawn(lambda: 5); l = lambda *args: 5' 'for _ in xrange(10000): g.link(l);' 'g.join()'
+python -mtimeit -r 6 -s'from gevent import spawn; from gevent.hub import xrange; g = spawn(lambda: 5); l = lambda *args: 5' 'for _ in xrange(100000): g.link(l);' 'g.join()'

benchmarks/micro_run_callback.sh

@@ -2,9 +2,9 @@
 set -e -x
 python -mtimeit -r 6 -s'from gevent import run,get_hub; run_cb = get_hub().loop.run_callback; f = lambda : 5' 'run_cb(f)'
 python -mtimeit -r 6 -s'from gevent import run,get_hub; run_cb = get_hub().loop.run_callback; f = lambda : 5' 'run_cb(f)' 'run()'
-python -mtimeit -r 6 -s'from gevent import run,get_hub; run_cb = get_hub().loop.run_callback; f = lambda : 5' 'for _ in xrange(100): run_cb(f)'
-python -mtimeit -r 6 -s'from gevent import run,get_hub; run_cb = get_hub().loop.run_callback; f = lambda : 5' 'for _ in xrange(100): run_cb(f)' 'run()'
-python -mtimeit -r 6 -s'from gevent import run,get_hub; run_cb = get_hub().loop.run_callback; f = lambda : 5' 'for _ in xrange(10000): run_cb(f)'
-python -mtimeit -r 6 -s'from gevent import run,get_hub; run_cb = get_hub().loop.run_callback; f = lambda : 5' 'for _ in xrange(10000): run_cb(f)' 'run()'
+python -mtimeit -r 6 -s'from gevent import run,get_hub; from gevent.hub import xrange; run_cb = get_hub().loop.run_callback; f = lambda : 5' 'for _ in xrange(100): run_cb(f)'
+python -mtimeit -r 6 -s'from gevent import run,get_hub; from gevent.hub import xrange; run_cb = get_hub().loop.run_callback; f = lambda : 5' 'for _ in xrange(100): run_cb(f)' 'run()'
+python -mtimeit -r 6 -s'from gevent import run,get_hub; from gevent.hub import xrange; run_cb = get_hub().loop.run_callback; f = lambda : 5' 'for _ in xrange(10000): run_cb(f)'
+python -mtimeit -r 6 -s'from gevent import run,get_hub; from gevent.hub import xrange; run_cb = get_hub().loop.run_callback; f = lambda : 5' 'for _ in xrange(10000): run_cb(f)' 'run()'
 
 

examples/psycopg2_pool.py

@@ -8,6 +8,12 @@ from gevent.socket import wait_read, wait_write
 from psycopg2 import extensions, OperationalError, connect
 
 
+if sys.version_info[0] >= 3:
+    integer_types = int,
+else:
+    integer_types = int, long
+
+
 def gevent_wait_callback(conn, timeout=None):
     """A wait callback useful to allow gevent to work with Psycopg."""
     while 1:
@@ -29,7 +35,7 @@ extensions.set_wait_callback(gevent_wait_callback)
 class DatabaseConnectionPool(object):
 
     def __init__(self, maxsize=100):
-        if not isinstance(maxsize, (int, long)):
+        if not isinstance(maxsize, integer_types):
             raise TypeError('Expected integer, got %r' % (maxsize, ))
         self.maxsize = maxsize
         self.pool = Queue()

gevent/_threading.py

@@ -5,7 +5,10 @@ or not).
 
 This module is missing 'Thread' class, but includes 'Queue'.
 """
-from Queue import Full, Empty
+try:
+    from Queue import Full, Empty
+except ImportError:
+    from queue import Full, Empty
 from collections import deque
 import heapq
 from time import time as _time, sleep as _sleep

gevent/baseserver.py

@@ -5,7 +5,7 @@ import _socket
 import errno
 from gevent.greenlet import Greenlet, getfuncname
 from gevent.event import Event
-from gevent.hub import string_types, integer_types, get_hub
+from gevent.hub import string_types, integer_types, get_hub, xrange
 
 
 __all__ = ['BaseServer']
@@ -86,7 +86,7 @@ class BaseServer(object):
         elif hasattr(spawn, 'spawn'):
             self.pool = spawn
             self._spawn = spawn.spawn
-        elif isinstance(spawn, (int, long)):
+        elif isinstance(spawn, integer_types):
             from gevent.pool import Pool
             self.pool = Pool(spawn)
             self._spawn = self.pool.spawn

gevent/core.ppyx

@@ -17,6 +17,13 @@ __all__ = ['get_version',
            'time',
            'loop']
 
+cdef tuple integer_types
+
+if sys.version_info[0] >= 3:
+    integer_types = int,
+else:
+    integer_types = (int, long)
+
 
 cdef extern from "callbacks.h":
     void gevent_callback_io(libev.ev_loop, void*, int)
@@ -151,7 +158,7 @@ cpdef unsigned int _flags_to_int(object flags) except? -1:
     # Note, that order does not matter, libev has its own predefined order
     if not flags:
         return 0
-    if isinstance(flags, (int, long)):
+    if isinstance(flags, integer_types):
         return flags
     cdef unsigned int result = 0
     try:
@@ -167,7 +174,7 @@ cpdef unsigned int _flags_to_int(object flags) except? -1:
 
 
 cdef str _str_hex(object flag):
-    if isinstance(flag, (int, long)):
+    if isinstance(flag, integer_types):
         return hex(flag)
     return str(flag)
 

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/hub.py

@@ -33,9 +33,11 @@ PY3 = sys.version_info[0] >= 3
 if PY3:
     string_types = str,
     integer_types = int,
+    xrange = range
 else:
     string_types = basestring,
     integer_types = (int, long)
+    xrange = xrange
 
 
 if sys.version_info[0] <= 2:

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

@@ -2,12 +2,11 @@ from __future__ import absolute_import
 import sys
 import os
 import errno
-import types
 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, string_types, xrange
 from gevent.fileobject import FileObject
 from gevent.greenlet import Greenlet, joinall
 spawn = Greenlet.spawn
@@ -176,7 +175,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()
 
@@ -308,10 +307,6 @@ class Popen(object):
     def poll(self):
         return self._internal_poll()
 
-    def rawlink(self, callback):
-        self.result.rawlink(linkproxy(callback, self))
-    # XXX unlink
-
     if mswindows:
         #
         # Windows methods
@@ -401,7 +396,7 @@ class Popen(object):
                            errread, errwrite):
             """Execute program (MS Windows version)"""
 
-            if not isinstance(args, types.StringTypes):
+            if not isinstance(args, string_types):
                 args = list2cmdline(args)
 
             # Process startup details
@@ -525,6 +520,11 @@ class Popen(object):
         #
         # POSIX methods
         #
+
+        def rawlink(self, callback):
+            self.result.rawlink(linkproxy(callback, self))
+        # XXX unlink
+
         def _get_handles(self, stdin, stdout, stderr):
             """Construct and return tuple with IO objects:
             p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
@@ -617,7 +617,7 @@ class Popen(object):
                            errread, errwrite):
             """Execute program (POSIX version)"""
 
-            if isinstance(args, types.StringTypes):
+            if isinstance(args, string_types):
                 args = [args]
             else:
                 args = list(args)

greentest/bench_sleep0.py

 """Benchmarking sleep(0) performance."""
 import sys
 from time import time
+try:
+    xrange
+except NameError:
+    xrange = range
 
 
 def noop(p):

greentest/bench_spawn.py

@@ -4,6 +4,10 @@ import sys
 import os
 import random
 from time import time
+try:
+    xrange
+except NameError:
+    xrange = range
 
 
 N = 10000