/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/textfile.py

  • Committer: Robert Collins
  • Date: 2009-02-24 08:09:17 UTC
  • mfrom: (4037 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4038.
  • Revision ID: robertc@robertcollins.net-20090224080917-9k7ib4oj1godlp3k
Merge bzr (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