← 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: 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/response.py
91
91
 
92
92
    def set_boundary(self, boundary):
93
93
        """Define the boundary used in a multi parts message.
94
 
        
 
94
 
95
95
        The file should be at the beginning of the body, the first range
96
96
        definition is read and taken into account.
97
97
        """
114
114
            # IIS 6 and 7 incorrectly wrap boundary strings in <>
115
115
            # together they make a beautiful bug, which we will be gracious
116
116
            # about here
117
 
            if (self._unquote_boundary(boundary_line) != 
 
117
            if (self._unquote_boundary(boundary_line) !=
118
118
                '--' + self._boundary + '\r\n'):
119
119
                raise errors.InvalidHttpResponse(
120
120
                    self._path,
288
288
    :param msg: An HTTPMessage containing the headers for the response
289
289
    :param data: A file-like object that can be read() to get the
290
290
                 requested data
291
 
    :return: A file-like object that can seek()+read() the 
 
291
    :return: A file-like object that can seek()+read() the
292
292
             ranges indicated by the headers.
293
293
    """
294
294
    rfile = RangeFile(url, data)