Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Ben Darnell 2010-09-07 16:01:04 -07:00
parent e6d93d9350
commit 2e288577a1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tornado/httpclient.py
View File

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