/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: Matt Nordhoff
  • Date: 2009-04-17 22:24:54 UTC
  • mto: This revision was merged to the branch mainline in revision 4314.
  • Revision ID: mnordhoff@mattnordhoff.com-20090417222454-frskxbd4w812ecnj
Restore Bazaar's customizations to configobj.py:

* Strip trailing whitespace

* Replace "has_key" with "in"

* Don't import the compiler module; it's slow and we don't need it

Other customizations Bazaar previously made have been merged upstream:

* Replace hasattr with getattr

* Don't use the deprecated "message" attribute on exceptions

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