From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 7 Sep 2010 23:01:04 +0000 (-0700)
Subject: Use the older name for threading.activeCount for compatibility with python 2.5
X-Git-Tag: v1.1.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e288577a1145901dc7b4fbeaa4fd9ff6dc06ccf;p=thirdparty%2Ftornado.git

Use the older name for threading.activeCount for compatibility with python 2.5
---

diff --git a/tornado/httpclient.py b/tornado/httpclient.py
index 049a1cd11..3a3ae1c4f 100644
--- a/tornado/httpclient.py
+++ b/tornado/httpclient.py
@@ -585,7 +585,7 @@ def _curl_setup_request(curl, request, buffer, headers):
     else:
         curl.unsetopt(pycurl.USERPWD)
         logging.info("%s %s", request.method, request.url)
-    if threading.active_count() > 1:
+    if threading.activeCount() > 1:
         # libcurl/pycurl is not thread-safe by default.  When multiple threads
         # are used, signals should be disabled.  This has the side effect
         # of disabling DNS timeouts in some environments (when libcurl is
@@ -593,7 +593,7 @@ def _curl_setup_request(curl, request, buffer, headers):
         # thread.  Applications that use many short-lived threads may need
         # to set NOSIGNAL manually in a prepare_curl_callback since
         # there may not be any other threads running at the time we call
-        # threading.active_count.
+        # threading.activeCount.
         curl.setopt(pycurl.NOSIGNAL, 1)
     if request.prepare_curl_callback is not None:
         request.prepare_curl_callback(curl)