From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 18 Feb 2013 04:57:38 +0000 (-0500)
Subject: Make Resolver's callback argument optional when the Future result is used.
X-Git-Tag: v3.0.0~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b605c0a5f74aa734daab63fcb84e549b4d5346b1;p=thirdparty%2Ftornado.git

Make Resolver's callback argument optional when the Future result is used.
---

diff --git a/tornado/concurrent.py b/tornado/concurrent.py
index 0e78b916d..502e8a64c 100644
--- a/tornado/concurrent.py
+++ b/tornado/concurrent.py
@@ -105,7 +105,7 @@ dummy_executor = DummyExecutor()
 def run_on_executor(fn):
     @functools.wraps(fn)
     def wrapper(self, *args, **kwargs):
-        callback = kwargs.pop("callback")
+        callback = kwargs.pop("callback", None)
         future = self.executor.submit(fn, self, *args, **kwargs)
         if callback:
             self.io_loop.add_future(future, callback)
diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py
index 4711019fa..e090d3d9f 100644
--- a/tornado/test/netutil_test.py
+++ b/tornado/test/netutil_test.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, division, print_function, with_statement
 import socket
 
 from tornado.netutil import BlockingResolver, ThreadedResolver
-from tornado.testing import AsyncTestCase
+from tornado.testing import AsyncTestCase, gen_test
 from tornado.test.util import unittest
 
 try:
@@ -27,6 +27,17 @@ class _ResolverTestMixin(object):
              ('127.0.0.1', 80)),
             future.result())
 
+    @gen_test
+    def test_future_interface(self):
+        addrinfo = yield self.resolver.getaddrinfo(
+            'localhost', 80, socket.AF_UNSPEC,
+            socket.SOCK_STREAM, socket.IPPROTO_TCP)
+        self.assertIn(
+            (socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP, '',
+             ('127.0.0.1', 80)),
+            addrinfo)
+
+
 
 class BlockingResolverTest(AsyncTestCase, _ResolverTestMixin):
     def setUp(self):