From ca899c80ca1210e25433ea5ddff0d917d43de7bd Mon Sep 17 00:00:00 2001 From: "A. Jesse Jiryu Davis" Date: Thu, 18 Apr 2013 16:14:06 -0400 Subject: [PATCH] thread_util.have_gevent is more accurate than has_greenlets now Pool(use_greenlets=True) now requires Gevent, not just greenlet --- pymongo/pool.py | 4 ++-- pymongo/thread_util.py | 6 +++--- test/test_client.py | 2 +- test/test_master_slave_connection.py | 2 +- test/test_thread_util.py | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pymongo/pool.py b/pymongo/pool.py index 2072c150d..48807f041 100644 --- a/pymongo/pool.py +++ b/pymongo/pool.py @@ -142,9 +142,9 @@ class Pool: - `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 index dd50adf49..e87836e44 100644 --- a/pymongo/thread_util.py +++ b/pymongo/thread_util.py @@ -22,13 +22,13 @@ try: 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 @@ class MaxWaitersBoundedSemaphoreThread(MaxWaitersBoundedSemaphore): 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 index e6b9a256b..ea3566d49 100644 --- a/test/test_client.py +++ b/test/test_client.py @@ -143,7 +143,7 @@ class TestClient(unittest.TestCase, TestRequestMixin): 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 index 334097da2..a69bdda35 100644 --- a/test/test_master_slave_connection.py +++ b/test/test_master_slave_connection.py @@ -79,7 +79,7 @@ class TestMasterSlaveConnection(unittest.TestCase, TestRequestMixin): 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 index 179df8332..999e642eb 100644 --- a/test/test_thread_util.py +++ b/test/test_thread_util.py @@ -25,7 +25,7 @@ sys.path[0:0] = [""] 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 @@ class TestIdent(unittest.TestCase): 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 @@ class TestCounter(unittest.TestCase): 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)