← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: Martin
  • Date: 2011-05-18 09:13:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5890.
  • Revision ID: gzlist@googlemail.com-20110518091314-ottoskmtfpnych7v
Try reintroducing fp.close() earlier in Transport._seek_and_read

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
712
712
                    try:
713
713
                        cur_offset_and_size = offset_stack.next()
714
714
                    except StopIteration:
 
715
                        fp.close()
715
716
                        cur_offset_and_size = None
716
717
                    yield this_offset, this_data
717
 
        except:
 
718
        finally:
718
719
            fp.close()
719
 
            raise
720
 
        fp.close()
721
720
 
722
721
    def _sort_expand_and_combine(self, offsets, upper_limit):
723
722
        """Helper for readv.