diff options
author | Joe Gordon <jogo@pinterest.com> | 2021-05-27 09:48:08 -0700 |
---|---|---|
committer | Joe Gordon <jogo@pinterest.com> | 2021-07-20 11:46:07 -0700 |
commit | 0bf1baa4f539dedf8e4e4b2e48f8da5d66ed57b5 (patch) | |
tree | 6f780f972e933681c8d26a5a1c3d994f1ad227d0 /pymemcache/pool.py | |
parent | fe2114f01fe9526c3e4336bd409be606a16a7675 (diff) | |
download | pymemcache-0bf1baa4f539dedf8e4e4b2e48f8da5d66ed57b5.tar.gz |
Remove six dependency and run pyupgrade
Now that we don't require Python 2 support no need for six.
Code upgraded with pyupgrade and manual fixes to remove remaining six
usage.
Diffstat (limited to 'pymemcache/pool.py')
-rw-r--r-- | pymemcache/pool.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pymemcache/pool.py b/pymemcache/pool.py index ddb8825..1422835 100644 --- a/pymemcache/pool.py +++ b/pymemcache/pool.py @@ -18,10 +18,8 @@ import sys import threading import time -import six - -class ObjectPool(object): +class ObjectPool: """A pool of objects that release/creates/destroys as needed.""" def __init__(self, obj_creator, @@ -37,7 +35,7 @@ class ObjectPool(object): self._lock = lock_generator() self._after_remove = after_remove max_size = max_size or 2 ** 31 - if not isinstance(max_size, six.integer_types) or max_size < 0: + if not isinstance(max_size, int) or max_size < 0: raise ValueError('"max_size" must be a positive integer') self.max_size = max_size self.idle_timeout = idle_timeout @@ -62,7 +60,7 @@ class ObjectPool(object): self.release(obj) else: self.destroy(obj) - six.reraise(exc_info[0], exc_info[1], exc_info[2]) + raise exc_info[1].with_traceback(exc_info[2]) self.release(obj) def get(self): |