← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/response.py
21
21
responses.
22
22
"""
23
23
 
 
24
from __future__ import absolute_import
24
25
 
25
26
import httplib
26
27
from cStringIO import StringIO
28
29
 
29
30
from bzrlib import (
30
31
    errors,
31
 
    trace,
32
32
    osutils,
33
33
    )
34
34