← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ui/text.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ui/text.py
233
233
 
234
234
    def show_warning(self, msg):
235
235
        self.clear_term()
 
236
        if isinstance(msg, unicode):
 
237
            te = osutils.get_terminal_encoding()
 
238
            msg = msg.encode(te, 'replace')
236
239
        self.stderr.write("bzr: warning: %s\n" % msg)
237
240
 
238
241
    def _progress_updated(self, task):