← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

Merge bzr.dev into cleanup resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
23
23
# ElementTree bits
24
24
 
25
25
from bzrlib.serializer import Serializer
26
 
from bzrlib.trace import mutter, warning
 
26
from bzrlib.trace import mutter
27
27
 
28
28
try:
29
29
    try:
83
83
 
84
84
    def read_inventory(self, f, revision_id=None):
85
85
        try:
86
 
            return self._unpack_inventory(self._read_element(f),
87
 
                revision_id=None)
 
86
            try:
 
87
                return self._unpack_inventory(self._read_element(f),
 
88
                    revision_id=None)
 
89
            finally:
 
90
                f.close()
88
91
        except ParseError, e:
89
92
            raise errors.UnexpectedInventoryFormat(e)
90
93