← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textfile.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/textfile.py
16
16
 
17
17
"""Utilities for distinguishing binary files from text files"""
18
18
 
19
 
from itertools import chain 
 
19
from itertools import chain
20
20
 
21
21
from bzrlib.errors import BinaryFile
22
22
from bzrlib.iterablefile import IterableFile