From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 23 Feb 2011 22:51:35 +0000 (-0800)
Subject: Make SimpleAsyncHTTPClient the default.
X-Git-Tag: v2.0.0~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e42c99ffcab1073c3b4f62c47e2d8a83778706c0;p=thirdparty%2Ftornado.git

Make SimpleAsyncHTTPClient the default.

Get rid of the environment variable hack for selecting client
implementations.
---

diff --git a/tornado/httpclient.py b/tornado/httpclient.py
index 0c6515a08..63107dd8f 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