Commit d4b00714 authored by Ron Rothman's avatar Ron Rothman Committed by Jason Madden

derive pool.PoolFull from Queue.Full

parent 92287c85
...@@ -23,6 +23,7 @@ except ImportError: ...@@ -23,6 +23,7 @@ except ImportError:
from gevent.hub import GreenletExit, getcurrent, kill as _kill from gevent.hub import GreenletExit, getcurrent, kill as _kill
from gevent.greenlet import joinall, Greenlet from gevent.greenlet import joinall, Greenlet
from gevent.queue import Full as QueueFull
from gevent.timeout import Timeout from gevent.timeout import Timeout
from gevent.event import Event from gevent.event import Event
from gevent.lock import Semaphore, DummySemaphore from gevent.lock import Semaphore, DummySemaphore
...@@ -646,7 +647,7 @@ class Failure(object): ...@@ -646,7 +647,7 @@ class Failure(object):
raise self.exc raise self.exc
class Full(Exception): class PoolFull(QueueFull):
""" """
Raised when a Pool is full and an attempt was made to Raised when a Pool is full and an attempt was made to
add a new greenlet to it. add a new greenlet to it.
...@@ -733,7 +734,7 @@ class Pool(Group): ...@@ -733,7 +734,7 @@ class Pool(Group):
:keyword float timeout: The maximum number of seconds this method will :keyword float timeout: The maximum number of seconds this method will
block, if ``blocking`` is True. (Ignored if ``blocking`` is False.) block, if ``blocking`` is True. (Ignored if ``blocking`` is False.)
Raises ``Timeout`` on timeout, or `Full` if ``blocking`` is False and Raises ``Timeout`` on timeout, or `PoolFull` if ``blocking`` is False and
the pool is full. the pool is full.
.. seealso:: :meth:`Group.add` .. seealso:: :meth:`Group.add`
...@@ -745,7 +746,7 @@ class Pool(Group): ...@@ -745,7 +746,7 @@ class Pool(Group):
# We failed to acquire the semaphore. # We failed to acquire the semaphore.
# If blocking was True, then there was a timeout. If blocking was # If blocking was True, then there was a timeout. If blocking was
# False, then there was no capacity. # False, then there was no capacity.
raise Timeout() if blocking else Full() raise Timeout() if blocking else PoolFull()
try: try:
Group.add(self, greenlet) Group.add(self, greenlet)
......
...@@ -212,7 +212,7 @@ class PoolBasicTests(greentest.TestCase): ...@@ -212,7 +212,7 @@ class PoolBasicTests(greentest.TestCase):
second = gevent.spawn(gevent.sleep, 1000) second = gevent.spawn(gevent.sleep, 1000)
try: try:
p.add(first) p.add(first)
with self.assertRaises(pool.Full): with self.assertRaises(pool.PoolFull):
p.add(second, blocking=False) p.add(second, blocking=False)
finally: finally:
second.kill() second.kill()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment