/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/xml8.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 10:59:35 UTC
  • mfrom: (6383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6385.
  • Revision ID: jelmer@canonical.com-20111219105935-9hilixk0anu39v0f
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml8.py
233
233
    def _unpack_inventory(self, elt, revision_id=None, entry_cache=None,
234
234
                          return_from_cache=False):
235
235
        """Construct from XML Element"""
236
 
        def unpack_entry(entry_elt):
237
 
            return self._unpack_entry(entry_elt,
238
 
                entry_cache=entry_cache, return_from_cache=return_from_cache)
239
 
        inv = unpack_inventory_flat(elt, self.format_num, unpack_entry)
 
236
        inv = unpack_inventory_flat(elt, self.format_num, self._unpack_entry,
 
237
            entry_cache, return_from_cache)
240
238
        self._check_cache_size(len(inv), entry_cache)
241
239
        return inv
242
240