thread_util.have_gevent is more accurate than has_greenlets now

A. Jesse Jiryu Davis · A. Jesse Jiryu Davis · commit ca899c80ca12 · 2013-05-22T20:33:15.000-04:00
Pool(use_greenlets=True) now requires Gevent, not just greenlet
diff --git a/pymongo/pool.py b/pymongo/pool.py
@@ -142,9 +142,9 @@ def __init__(self, pair, max_size, net_timeout, conn_timeout, use_ssl,
           - `wait_queue_multiple`: (integer) Multiplied by max_pool_size to give
             the number of threads allowed to wait for a socket at one time.
         """
-        if use_greenlets and not thread_util.have_greenlet:
+        if use_greenlets and not thread_util.have_gevent:
             raise ConfigurationError(
-                "The greenlet module is not available. "
+                "The Gevent module is not available. "
                 "Install the greenlet package from PyPI."
             )
 
diff --git a/pymongo/thread_util.py b/pymongo/thread_util.py
@@ -22,13 +22,13 @@
 except ImportError:
     from time import time as _time
 
-have_greenlet = True
+have_gevent = True
 try:
     import greenlet
     import gevent.coros
     import gevent.thread
 except ImportError:
-    have_greenlet = False
+    have_gevent = False
 
 
 # Do we have to work around http://bugs.python.org/issue1868?
@@ -264,7 +264,7 @@ def __init__(self, value=1, max_waiters=1):
             self, BoundedSemaphore, value, max_waiters)
 
 
-if have_greenlet:
+if have_gevent:
     class MaxWaitersBoundedSemaphoreGevent(MaxWaitersBoundedSemaphore):
         def __init__(self, value=1, max_waiters=1):
             MaxWaitersBoundedSemaphore.__init__(
diff --git a/test/test_client.py b/test/test_client.py
@@ -143,7 +143,7 @@ def test_getters(self):
 
     def test_use_greenlets(self):
         self.assertFalse(MongoClient(host, port).use_greenlets)
-        if thread_util.have_greenlet:
+        if thread_util.have_gevent:
             self.assertTrue(
                 MongoClient(
                     host, port, use_greenlets=True).use_greenlets)
diff --git a/test/test_master_slave_connection.py b/test/test_master_slave_connection.py
@@ -79,7 +79,7 @@ def test_types(self):
     def test_use_greenlets(self):
         self.assertFalse(self.client.use_greenlets)
 
-        if thread_util.have_greenlet:
+        if thread_util.have_gevent:
             master = MongoClient(host, port, use_greenlets=True)
             slaves = [
                 MongoClient(slave.host, slave.port, use_greenlets=True)
diff --git a/test/test_thread_util.py b/test/test_thread_util.py
@@ -25,7 +25,7 @@
 from nose.plugins.skip import SkipTest
 
 from pymongo import thread_util
-if thread_util.have_greenlet:
+if thread_util.have_gevent:
     import greenlet
 
 from test.utils import looplet, RendezvousThread
@@ -148,7 +148,7 @@ def test_thread_ident(self):
         self._test_ident(False)
 
     def test_greenlet_ident(self):
-        if not thread_util.have_greenlet:
+        if not thread_util.have_gevent:
             raise SkipTest('greenlet not installed')
 
         self._test_ident(True)
@@ -212,7 +212,7 @@ def test_thread_counter(self):
         self._test_counter(False)
 
     def test_greenlet_counter(self):
-        if not thread_util.have_greenlet:
+        if not thread_util.have_gevent:
             raise SkipTest('greenlet not installed')
 
         self._test_counter(True)
