← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/__init__.py

  • Committer: Robert Collins
  • Date: 2005-10-16 08:13:23 UTC
  • mto: This revision was merged to the branch mainline in revision 1459.
  • Revision ID: robertc@lifelesslap.robertcollins.net-20051016081323-8393c2878dc4dc9e
convert all users of __getitem__ into TransportStores to use .get instead

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/__init__.py
52
52
    def __len__(self):
53
53
        raise NotImplementedError('Children should define their length')
54
54
 
 
55
    def get(self, file_id):
 
56
        """Returns a file reading from a particular entry."""
 
57
 
55
58
    def __getitem__(self, fileid):
56
 
        """Returns a file reading from a particular entry."""
 
59
        """DEPRECATED. Please use .get(file_id) instead."""
57
60
        raise NotImplementedError
58
61
 
59
62
    def __contains__(self, fileid):
146
149
            buffered_requests = []
147
150
            for fileid in to_copy:
148
151
                try:
149
 
                    f = other[fileid]
 
152
                    f = other.get(fileid)
150
153
                except KeyError:
151
154
                    if permit_failure:
152
155
                        failed.add(fileid)
206
209
        if '\\' in fileid or '/' in fileid:
207
210
            raise ValueError("invalid store id %r" % fileid)
208
211
 
209
 
    def __getitem__(self, fileid):
 
212
    def get(self, fileid):
210
213
        """Returns a file reading from a particular entry."""
211
214
        fn = self._relpath(fileid)
212
215
        try:
272
275
            raise StoreError("fileid %s already in the store" % fileid)
273
276
        self._contents[fileid] = stream.read()
274
277
 
275
 
    def __getitem__(self, fileid):
 
278
    def get(self, fileid):
276
279
        """Returns a file reading from a particular entry."""
277
280
        if not self._contents.has_key(fileid):
278
281
            raise IndexError
308
311
        # or something. RBC 20051003
309
312
        self.cache_store = store.__class__(LocalTransport(cache_dir))
310
313
 
311
 
    def __getitem__(self, id):
 
314
    def get(self, id):
312
315
        mutter("Cache add %s" % id)
313
316
        if id not in self.cache_store:
314
 
            self.cache_store.add(self.source_store[id], id)
315
 
        return self.cache_store[id]
 
317
            self.cache_store.add(self.source_store.get(id), id)
 
318
        return self.cache_store.get(id)
316
319
 
317
320
    def __contains__(self, fileid):
318
321
        if fileid in self.cache_store: