← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
63
63
 
64
64
    def _try_put(self, fn, f):
65
65
        try:
66
 
            self._transport.put(fn, f, mode=self._file_mode)
 
66
            self._transport.put_file(fn, f, mode=self._file_mode)
67
67
        except NoSuchFile:
68
68
            if not self._prefixed:
69
69
                raise
71
71
                self._transport.mkdir(os.path.dirname(fn), mode=self._dir_mode)
72
72
            except FileExists:
73
73
                pass
74
 
            self._transport.put(fn, f, mode=self._file_mode)
 
74
            self._transport.put_file(fn, f, mode=self._file_mode)
75
75
 
76
76
    def _get(self, fn):
77
77
        if fn.endswith('.gz'):
114
114
        # gzip.GzipFile.read() requires a tell() function
115
115
        # but some transports return objects that cannot seek
116
116
        # so buffer them in a StringIO instead
117
 
        if hasattr(f, 'tell'):
 
117
        if getattr(f, 'tell', None) is not None:
118
118
            return gzip.GzipFile(mode='rb', fileobj=f)
119
119
        else:
120
120
            from cStringIO import StringIO