From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 2 Mar 2013 22:27:02 +0000 (-0500)
Subject: Make DummyFuture class private.
X-Git-Tag: v3.0.0~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e15cdca0d16759048dbdcf54cbed24edaec7b7f;p=thirdparty%2Ftornado.git

Make DummyFuture class private.

It's now only exposed and used when concurrent.futures is not available.
---

diff --git a/tornado/concurrent.py b/tornado/concurrent.py
index 19f1c87be..e24a768ac 100644
--- a/tornado/concurrent.py
+++ b/tornado/concurrent.py
@@ -29,7 +29,7 @@ except ImportError:
 class ReturnValueIgnoredError(Exception):
     pass
 
-class DummyFuture(object):
+class _DummyFuture(object):
     def __init__(self):
         self._done = False
         self._result = None
@@ -87,7 +87,7 @@ class DummyFuture(object):
         self._callbacks = None
 
 if futures is None:
-    Future = DummyFuture
+    Future = _DummyFuture
 else:
     Future = futures.Future
 
diff --git a/tornado/ioloop.py b/tornado/ioloop.py
index 4062661b2..08e6d60f7 100644
--- a/tornado/ioloop.py
+++ b/tornado/ioloop.py
@@ -40,7 +40,7 @@ import threading
 import time
 import traceback
 
-from tornado.concurrent import DummyFuture
+from tornado.concurrent import Future
 from tornado.log import app_log, gen_log
 from tornado import stack_context
 from tornado.util import Configurable
@@ -50,11 +50,6 @@ try:
 except ImportError:
     signal = None
 
-try:
-    from concurrent import futures
-except ImportError:
-    futures = None
-
 try:
     import thread  # py2
 except ImportError:
@@ -352,17 +347,12 @@ class IOLoop(Configurable):
         """
         raise NotImplementedError()
 
-    if futures is not None:
-        _FUTURE_TYPES = (futures.Future, DummyFuture)
-    else:
-        _FUTURE_TYPES = DummyFuture
-
     def add_future(self, future, callback):
         """Schedules a callback on the IOLoop when the given future is finished.
 
         The callback is invoked with one argument, the future.
         """
-        assert isinstance(future, IOLoop._FUTURE_TYPES)
+        assert isinstance(future, Future)
         callback = stack_context.wrap(callback)
         future.add_done_callback(
             lambda future: self.add_callback(callback, future))