← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_pycurl.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_pycurl.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""http/https transport using pycurl"""
18
18
 
59
59
try:
60
60
    # see if we can actually initialize PyCurl - sometimes it will load but
61
61
    # fail to start up due to this bug:
62
 
    #  
 
62
    #
63
63
    #   32. (At least on Windows) If libcurl is built with c-ares and there's
64
64
    #   no DNS server configured in the system, the ares_init() call fails and
65
65
    #   thus curl_easy_init() fails as well. This causes weird effects for
180
180
 
181
181
        :param curl: The curl object to place the request on
182
182
        :param relpath: The relative path that we want to get
183
 
        :return: (abspath, data, header) 
 
183
        :return: (abspath, data, header)
184
184
                 abspath: full url
185
185
                 data: file that will be filled with the body
186
186
                 header: file that will be filled with the headers