← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Fix some more PEP8isms and delete useless import

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/response.py
24
24
 
25
25
import httplib
26
26
from cStringIO import StringIO
 
27
import rfc822
27
28
 
28
29
from bzrlib import (
29
30
    errors,
107
108
            # string entity.
108
109
            # To be on the safe side we allow it before any boundary line
109
110
            boundary_line = self._file.readline()
 
111
 
110
112
        if boundary_line != '--' + self._boundary + '\r\n':
111
 
            raise errors.InvalidHttpResponse(
112
 
                self._path,
113
 
                "Expected a boundary (%s) line, got '%s'" % (self._boundary,
114
 
                                                             boundary_line))
 
113
            # rfc822.unquote() incorrectly unquotes strings enclosed in <>
 
114
            # IIS 6 and 7 incorrectly wrap boundary strings in <>
 
115
            # together they make a beautiful bug, which we will be gracious
 
116
            # about here
 
117
            if (self._unquote_boundary(boundary_line) != 
 
118
                '--' + self._boundary + '\r\n'):
 
119
                raise errors.InvalidHttpResponse(
 
120
                    self._path,
 
121
                    "Expected a boundary (%s) line, got '%s'"
 
122
                    % (self._boundary, boundary_line))
 
123
 
 
124
    def _unquote_boundary(self, b):
 
125
        return b[:2] + rfc822.unquote(b[2:-2]) + b[-2:]
115
126
 
116
127
    def read_range_definition(self):
117
128
        """Read a new range definition in a multi parts message.