~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: Vincent Ladeuil
  • Date: 2010-03-10 09:33:04 UTC
  • mto: (5082.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5083.
  • Revision ID: v.ladeuil+lp@free.fr-20100310093304-4245t4tazd4sxoav
Cleanup test from overly cautious checks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
20
20
do any sort of delta compression.
21
21
"""
22
22
 
23
 
from __future__ import absolute_import
24
 
 
25
23
import gzip
26
24
import os
 
25
from cStringIO import StringIO
27
26
 
28
27
from bzrlib import osutils
29
28
from bzrlib.errors import BzrError, NoSuchFile, FileExists
119
118
        # so buffer them in a StringIO instead
120
119
        if getattr(f, 'tell', None) is not None:
121
120
            return gzip.GzipFile(mode='rb', fileobj=f)
122
 
        try:
 
121
        else:
123
122
            from cStringIO import StringIO
124
123
            sio = StringIO(f.read())
125
124
            return gzip.GzipFile(mode='rb', fileobj=sio)
126
 
        finally:
127
 
            f.close()