~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/stub_sftp.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
143
143
            fstr = 'rb'
144
144
        try:
145
145
            f = os.fdopen(fd, fstr)
146
 
        except OSError, e:
 
146
        except (IOError, OSError), e:
147
147
            return SFTPServer.convert_errno(e.errno)
148
148
        fobj = StubSFTPHandle()
149
149
        fobj.filename = path