← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: Andrew Bennetts
  • Date: 2010-08-17 06:45:33 UTC
  • mfrom: (5050.17.9 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: andrew.bennetts@canonical.com-20100817064533-kof2i2f3r6mr4ayb
Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859, #224373, #300062, #585667, #614404, #617503.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
118
118
        # so buffer them in a StringIO instead
119
119
        if getattr(f, 'tell', None) is not None:
120
120
            return gzip.GzipFile(mode='rb', fileobj=f)
121
 
        else:
 
121
        try:
122
122
            from cStringIO import StringIO
123
123
            sio = StringIO(f.read())
124
124
            return gzip.GzipFile(mode='rb', fileobj=sio)
 
125
        finally:
 
126
            f.close()