From 9609a82d5c614ff84ba11ee97d5b830a7ad6467f Mon Sep 17 00:00:00 2001 From: Keith Yang Date: Mon, 20 Jun 2016 21:41:00 +0800 Subject: [PATCH] Support Python 2.6 by using keywords for string.format. --- thriftpy/http.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/thriftpy/http.py b/thriftpy/http.py index 80f8397..5b5a3e4 100644 --- a/thriftpy/http.py +++ b/thriftpy/http.py @@ -53,6 +53,9 @@ from thriftpy.transport.buffered import TBufferedTransport +HTTP_URI = '{scheme}://{host}:{port}{path}' + + class TFileObjectTransport(TTransportBase): """Wraps a file-like object to make it work as a Thrift transport.""" @@ -256,7 +259,7 @@ def make_client(service, host, port, path='', scheme='http', proto_factory=TBinaryProtocolFactory(), trans_factory=TBufferedTransportFactory(), timeout=4000): - uri = '{}://{}:{}{}'.format(scheme, host, port, path) + uri = HTTP_URI.format(scheme=scheme, host=host, port=port, path=path) http_socket = THttpClient(uri, timeout) transport = trans_factory.get_transport(http_socket) iprot = proto_factory.get_protocol(transport) @@ -269,7 +272,7 @@ def client_context(service, host, port, path='', scheme='http', proto_factory=TBinaryProtocolFactory(), trans_factory=TBufferedTransportFactory(), timeout=4000): - uri = '{}://{}:{}{}'.format(scheme, host, port, path) + uri = HTTP_URI.format(scheme=scheme, host=host, port=port, path=path) http_socket = THttpClient(uri, timeout) transport = trans_factory.get_transport(http_socket) try: