~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/ftp.py

MergeĀ fromĀ jam-integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
177
177
            ret.seek(0)
178
178
            return ret
179
179
        except ftplib.error_perm, e:
180
 
            raise NoSuchFile(self.abspath(relpath), extra=extra)
 
180
            raise NoSuchFile(self.abspath(relpath), extra=str(e))
181
181
 
182
182
    def put(self, relpath, fp, mode=None):
183
183
        """Copy the file-like or string object into the location.