/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 bzrlib/transport/http/response.py

resolve a conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/response.py
251
251
        try:
252
252
            content_type = headers['Content-Type']
253
253
        except KeyError:
254
 
            raise errors.InvalidHttpContentType(url, '',
255
 
                msg='Missing Content-Type')
 
254
            # We can't be multipart if there is no Content-Type header
 
255
            is_multipart = False
 
256
        else:
 
257
            is_multipart = _is_multipart(content_type)
256
258
 
257
 
        if _is_multipart(content_type):
 
259
        if is_multipart:
258
260
            # Full fledged multipart response
259
261
            return HttpMultipartRangeResponse(url, content_type, data)
260
262
        else: