← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Martin
  • Date: 2011-05-21 16:36:51 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521163651-rzthrj6ll0ak4gvn
Use unicode() not str() to stringify conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
72
72
                    continue
73
73
                self.outf.write(conflict.path + '\n')
74
74
            else:
75
 
                self.outf.write(str(conflict) + '\n')
 
75
                self.outf.write(unicode(conflict) + '\n')
76
76
 
77
77
 
78
78
resolve_action_registry = registry.Registry()
291
291
    def to_strings(self):
292
292
        """Generate strings for the provided conflicts"""
293
293
        for conflict in self:
294
 
            yield str(conflict)
 
294
            yield unicode(conflict)
295
295
 
296
296
    def remove_files(self, tree):
297
297
        """Remove the THIS, BASE and OTHER files for listed conflicts"""