← 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: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_pycurl.py
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