← Back to branch summary

~vila/bzr/2.2-integration

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-20 09:02:16 UTC
  • mfrom: (5134.1.1 2.2.5-dev)
  • Revision ID: pqm@pqm.ubuntu.com-20110820090216-xrqcq4me2nstw4to
(vila) Merge 2.1 into 2.2 (including fix for #614713,
 #609187 and #812928) (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_pycurl.py
305
305
                url, 'Unable to handle http code %d%s' % (code,msg))
306
306
 
307
307
    def _debug_cb(self, kind, text):
308
 
        if kind in (pycurl.INFOTYPE_HEADER_IN, pycurl.INFOTYPE_DATA_IN,
309
 
                    pycurl.INFOTYPE_SSL_DATA_IN):
 
308
        if kind in (pycurl.INFOTYPE_HEADER_IN, pycurl.INFOTYPE_DATA_IN):
310
309
            self._report_activity(len(text), 'read')
311
310
            if (kind == pycurl.INFOTYPE_HEADER_IN
312
311
                and 'http' in debug.debug_flags):
313
312
                mutter('< %s' % text)
314
 
        elif kind in (pycurl.INFOTYPE_HEADER_OUT, pycurl.INFOTYPE_DATA_OUT,
315
 
                      pycurl.INFOTYPE_SSL_DATA_OUT):
 
313
        elif kind in (pycurl.INFOTYPE_HEADER_OUT, pycurl.INFOTYPE_DATA_OUT):
316
314
            self._report_activity(len(text), 'write')
317
315
            if (kind == pycurl.INFOTYPE_HEADER_OUT
318
316
                and 'http' in debug.debug_flags):
319
317
                mutter('> %s' % text)
320
 
        elif kind == pycurl.INFOTYPE_TEXT and 'http' in debug.debug_flags:
 
318
        elif (kind in (pycurl.INFOTYPE_TEXT, pycurl.INFOTYPE_SSL_DATA_IN,
 
319
                       pycurl.INFOTYPE_SSL_DATA_OUT)
 
320
              and 'http' in debug.debug_flags):
321
321
            mutter('* %s' % text)
322
322
 
323
323
    def _set_curl_options(self, curl):