/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/ignores.py

  • Committer: Martin
  • Date: 2017-05-21 18:16:32 UTC
  • mto: (6621.2.22 py3)
  • mto: This revision was merged to the branch mainline in revision 6624.
  • Revision ID: gzlist@googlemail.com-20170521181632-kll0wqnsq8pipfpj
Use BytesIO or StringIO from bzrlib.sixish

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ignores.py
20
20
 
21
21
import errno
22
22
import os
23
 
from cStringIO import StringIO
24
23
 
25
24
import bzrlib
26
25
from bzrlib.lazy_import import lazy_import
32
31
    trace,
33
32
    )
34
33
""")
 
34
from bzrlib.sixish import (
 
35
    BytesIO,
 
36
    )
35
37
 
36
38
# ~/.bazaar/ignore will be filled out using
37
39
# this ignore list, if it does not exist
211
213
        file_contents = ""
212
214
        newline = os.linesep
213
215
    
214
 
    sio = StringIO(file_contents)
 
216
    sio = BytesIO(file_contents)
215
217
    try:
216
218
        ignores = parse_ignore_file(sio)
217
219
    finally: