more clear naming

Author: HelloGrayson

Diff for: tchannel/thrift/server.py

@@ -84,11 +84,12 @@ def hello(request, response, tchannel):
     args_type = getattr(service_module, method + '_args')
     result_type = getattr(service_module, method + '_result')
 
-    # only wrap the handler if we arent using the new server api
-    if not dispatcher._handler_returns_response:
+    # if the dispatcher is set to deal with handlers that
+    # return responses, then use new api, else use deprecated
+    if dispatcher._handler_returns_response:
         handler = build_handler(result_type, handler)
     else:
-        handler = new_build_handler(result_type, handler)
+        handler = deprecated_build_handler(result_type, handler)
 
     dispatcher.register(
         endpoint,
@@ -99,7 +100,7 @@ def hello(request, response, tchannel):
     return handler
 
 
-def new_build_handler(result_type, f):
+def build_handler(result_type, f):
     @gen.coroutine
     def handler(request):
 
@@ -129,7 +130,7 @@ def handler(request):
     return handler
 
 
-def build_handler(result_type, f):
+def deprecated_build_handler(result_type, f):
     @gen.coroutine
     def handler(request, response, tchannel):
         req = yield ThriftRequest._from_raw_request(request)

Diff for: tests/thrift/test_server.py

@@ -25,7 +25,7 @@
 from thrift.Thrift import TType
 
 from tchannel.serializer.thrift import ThriftSerializer
-from tchannel.thrift.server import build_handler
+from tchannel.thrift.server import deprecated_build_handler
 from tchannel.tornado.request import Request
 from tchannel.tornado.response import Response
 from tchannel.tornado.stream import InMemStream
@@ -89,7 +89,7 @@ def write(self, proto):
 
 
 @pytest.mark.gen_test
-def test_build_handler():
+def test_deprecated_build_handler():
 
     def call(treq, tres, tchan):
         assert treq.transport.headers == {
@@ -123,7 +123,7 @@ def call(treq, tres, tchan):
     )
     tchannel = mock.Mock()
 
-    handler = build_handler(FakeResult, call)
+    handler = deprecated_build_handler(FakeResult, call)
     yield handler(req, res, tchannel)
 
     serialized_headers = yield response_header.read()
@@ -149,7 +149,7 @@ def call(treq, tres, tchan):
 
 
 @pytest.mark.gen_test
-def test_build_handler_exception():
+def test_deprecated_build_handler_exception():
     def call(treq, tres, tchan):
         raise FakeException('fail')
 
@@ -175,7 +175,7 @@ def call(treq, tres, tchan):
     )
     tchannel = mock.Mock()
 
-    handler = build_handler(FakeResult, call)
+    handler = deprecated_build_handler(FakeResult, call)
     yield handler(req, res, tchannel)
 
     response_body.write.assert_called_once_with(