/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: John Arbash Meinel
  • Date: 2010-08-06 19:54:45 UTC
  • mfrom: (5050.3.21 2.2-final)
  • mto: This revision was merged to the branch mainline in revision 5371.
  • Revision ID: john@arbash-meinel.com-20100806195445-7vsjls3uf8o6t7kt
Merge the 2.2-final branch into trunk, in preparation for release.

Had to fix up one NEWS entry that accidentally got merged into the 2.2 section.

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