summaryrefslogtreecommitdiff
path: root/eventlet/greenthread.py
diff options
context:
space:
mode:
authorSergey Shepelev <temotor@gmail.com>2016-12-22 04:35:14 +0300
committerSergey Shepelev <temotor@gmail.com>2017-01-04 23:42:32 +0300
commite4049a8a0016b28cbbdf3ab01425fc92a623e380 (patch)
tree58d140b6e9f784e5b28a0435fb41ae8f238984af /eventlet/greenthread.py
parent461348f9a8459724be87c281eea4e0408138a82c (diff)
downloadeventlet-is-timeout.tar.gz
WIP https://github.com/eventlet/eventlet/pull/346is-timeout
Diffstat (limited to 'eventlet/greenthread.py')
-rw-r--r--eventlet/greenthread.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/eventlet/greenthread.py b/eventlet/greenthread.py
index 921d7a9..c0f2982 100644
--- a/eventlet/greenthread.py
+++ b/eventlet/greenthread.py
@@ -3,6 +3,7 @@ import sys
from eventlet import event
from eventlet import hubs
+from eventlet import support
from eventlet import timeout
from eventlet.hubs import timer
from eventlet.support import greenlets as greenlet, six
@@ -144,8 +145,11 @@ def exc_after(seconds, *throw_args):
return hub.schedule_call_local(seconds, getcurrent().throw, *throw_args)
# deprecate, remove
-TimeoutError = timeout.Timeout
-with_timeout = timeout.with_timeout
+TimeoutError, with_timeout = (
+ support.wrap_deprecated(old, new)(fun) for old, new, fun in (
+ ('greenthread.TimeoutError', 'Timeout', timeout.Timeout),
+ ('greenthread.with_timeout', 'with_timeout', timeout.with_timeout),
+ ))
def _spawn_n(seconds, func, args, kwargs):