← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weavefile.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-09 13:35:40 UTC
  • mfrom: (4797.2.11 2.1)
  • mto: This revision was merged to the branch mainline in revision 5017.
  • Revision ID: v.ladeuil+lp@free.fr-20100209133540-roz64ll2o53uw34y
https://launchpad.net/bugs/516183
Merge 2.1 branch including fix for #516183)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
118
118
 
119
119
    from weave import WeaveFormatError
120
120
 
121
 
    try:
122
 
        lines = iter(f.readlines())
123
 
    finally:
124
 
        f.close()
 
121
    lines = iter(f.readlines())
125
122
 
126
123
    try:
127
124
        l = lines.next()