← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-20 17:19:44 UTC
  • mfrom: (4973.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100120171944-8gkub20gotjcye67
(spiv) Implement a per-file merge hook

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
1
 
# Copyright (C) 2005, 2006, 2008, 2009, 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
        # 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
 
        try:
 
121
        else:
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()