From e42c99ffcab1073c3b4f62c47e2d8a83778706c0 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Wed, 23 Feb 2011 14:51:35 -0800 Subject: [PATCH] Make SimpleAsyncHTTPClient the default. Get rid of the environment variable hack for selecting client implementations. --- tornado/httpclient.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/tornado/httpclient.py b/tornado/httpclient.py index 0c6515a0..63107dd8 100644 --- a/tornado/httpclient.py +++ b/tornado/httpclient.py @@ -87,20 +87,8 @@ class AsyncHTTPClient(object): else: if cls is AsyncHTTPClient: if cls._impl_class is None: - # If the environment variable - # USE_SIMPLE_HTTPCLIENT is set to a non-empty - # string, use simple_httpclient instead of - # curl_httpclient. This is provided as a - # convenience for testing simple_httpclient, and - # may be removed or replaced with a better way of - # specifying the preferred HTTPClient - # implementation before the next release. - if os.environ.get("USE_SIMPLE_HTTPCLIENT"): - from tornado.simple_httpclient import SimpleAsyncHTTPClient - AsyncHTTPClient._impl_class = SimpleAsyncHTTPClient - else: - from tornado.curl_httpclient import CurlAsyncHTTPClient - AsyncHTTPClient._impl_class = CurlAsyncHTTPClient + from tornado.simple_httpclient import SimpleAsyncHTTPClient + AsyncHTTPClient._impl_class = SimpleAsyncHTTPClient impl = cls._impl_class else: impl = cls