/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-09-07 08:52:04 UTC
  • mto: (4677.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4678.
  • Revision ID: v.ladeuil+lp@free.fr-20090907085204-ihbaxqrqzicf3bb9
FreeBSD is more strict than other OSes about deleting the working dir.

* bzrlib/tests/blackbox/test_remove.py:
(TestRemove.test_remove_changed_files_from_child_dir): Don't
delete the working dir... It's amazing this test has never
failed...

* bzrlib/tests/blackbox/test_remove.py:
(TestRemove.test_remove_changed_files_from_child_dir): Add a
working_dir parameter.

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):