/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/registry.py

  • Committer: Vincent Ladeuil
  • Date: 2009-08-26 09:06:02 UTC
  • mto: (4651.1.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4653.
  • Revision ID: v.ladeuil+lp@free.fr-20090826090602-uu9vapyw6yhbz6ak
Catch up fix for #347649.

* bzrlib/tests/blackbox/test_filesystem_cicp.py:
(TestMisc.test_status): status display parents if modified

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/registry.py
222
222
            yield key, getter.get_obj()
223
223
 
224
224
    def items(self):
225
 
        # We should not use the iteritems() implementation below (see bug
226
 
        # #430510)
227
 
        return sorted([(key, getter.get_obj())
228
 
                       for key, getter in self._dict.items()])
 
225
        return sorted(self.iteritems())
229
226
 
230
227
    def _set_default_key(self, key):
231
228
        if not self._dict.has_key(key):