← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2009-08-26 05:38:16 UTC
  • mfrom: (4634.6.2 2.0)
  • mto: (4634.6.4 2.0)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: mbp@sourcefrog.net-20090826053816-ht6jpktdm77vi6t5
Merge 2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
617
617
                raise InvalidHttpResponse(
618
618
                    t._remote_path('.bzr/smart'),
619
619
                    'Expected 200 response code, got %r' % (code,))
620
 
        except errors.InvalidHttpResponse, e:
 
620
        except (errors.InvalidHttpResponse, errors.ConnectionReset), e:
621
621
            raise errors.SmartProtocolError(str(e))
622
622
        return body_filelike
623
623