← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
44
44
    def _add_compressed(self, fn, f):
45
45
        from cStringIO import StringIO
46
46
        from bzrlib.osutils import pumpfile
47
 
        
 
47
 
48
48
        if isinstance(f, basestring):
49
49
            f = StringIO(f)
50
 
            
 
50
 
51
51
        sio = StringIO()
52
52
        gf = gzip.GzipFile(mode='wb', fileobj=sio)
53
53
        # if pumpfile handles files that don't fit in ram,