← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ignores.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ignores.py
59
59
        # Otherwise go though line by line and pick out the 'good'
60
60
        # decodable lines
61
61
        lines = ignore_file.split('\n')
62
 
        unicode_lines = []    
 
62
        unicode_lines = []
63
63
        for line_number, line in enumerate(lines):
64
64
            try:
65
65
                unicode_lines.append(line.decode('utf-8'))
67
67
                # report error about line (idx+1)
68
68
                warning('.bzrignore: On Line #%d, malformed utf8 character. '
69
69
                        'Ignoring line.' % (line_number+1))
70
 
    
 
70
 
71
71
    # Append each line to ignore list if it's not a comment line
72
72
    for line in unicode_lines:
73
73
        line = line.rstrip('\r\n')