/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/transport/http/_urllib2_wrappers.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-05 23:35:09 UTC
  • mfrom: (6658 work)
  • mto: (6653.3.3 bzrwt)
  • mto: This revision was merged to the branch mainline in revision 6667.
  • Revision ID: jelmer@jelmer.uk-20170605233509-30wo916k6meuggqf
Merge lp:brz

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transport/http/_urllib2_wrappers.py
190
190
    def getheaders(self):
191
191
        if self.headers is None:
192
192
            raise httplib.ResponseNotReady()
193
 
        return self.headers.items()
 
193
        return list(self.headers.items())
194
194
 
195
195
 
196
196
class _ReportingFileSocket(object):
761
761
        # before sending the request. And not all versions of python 2.5 do
762
762
        # that. Since we replace urllib2.AbstractHTTPHandler.do_open we do it
763
763
        # ourself below.
764
 
        headers = dict((name.title(), val) for name, val in headers.iteritems())
 
764
        headers = dict((name.title(), val) for name, val in headers.items())
765
765
 
766
766
        try:
767
767
            method = request.get_method()
774
774
            if 'http' in debug.debug_flags:
775
775
                trace.mutter('> %s %s' % (method, url))
776
776
                hdrs = []
777
 
                for k,v in headers.iteritems():
 
777
                for k,v in headers.items():
778
778
                    # People are often told to paste -Dhttp output to help
779
779
                    # debug. Don't compromise credentials.
780
780
                    if k in ('Authorization', 'Proxy-Authorization'):