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

  • Committer: Vincent Ladeuil
  • Date: 2010-07-13 16:10:20 UTC
  • mfrom: (4797.58.5 2.1)
  • mto: (5050.3.6 2.2)
  • mto: This revision was merged to the branch mainline in revision 5345.
  • Revision ID: v.ladeuil+lp@free.fr-20100713161020-qak83bylrtq5d1gj
Merge 2.1 into 2.2 including fixes for bug #525571 and bug #494221

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
118
118
 
119
119
    from weave import WeaveFormatError
120
120
 
121
 
    lines = iter(f.readlines())
 
121
    try:
 
122
        lines = iter(f.readlines())
 
123
    finally:
 
124
        f.close()
122
125
 
123
126
    try:
124
127
        l = lines.next()