Rev 5231: (vila, in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5231 [merge]
revision-id: pqm at pqm.ubuntu.com-20100514094851-mju4y69uma6kwsqe
parent: pqm at pqm.ubuntu.com-20100514082757-jbg7ncvtca1bjdtu
parent: v.ladeuil+lp at free.fr-20100514082126-wgll7jsmagkzzfwm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-05-14 10:48:51 +0100
message:
  (vila,
  	Martin [gz]) Make bt._rmtree_temp_dir more robust against non-ascii
  	exceptions
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-05-11 08:44:59 +0000
+++ b/bzrlib/tests/__init__.py	2010-05-14 08:10:35 +0000
@@ -4101,8 +4101,11 @@
         if test_id != None:
             ui.ui_factory.clear_term()
             sys.stderr.write('\nWhile running: %s\n' % (test_id,))
+        # Ugly, but the last thing we want here is fail, so bear with it.
+        printable_e = str(e).decode(osutils.get_user_encoding(), 'replace'
+                                    ).encode('ascii', 'replace')
         sys.stderr.write('Unable to remove testing dir %s\n%s'
-                         % (os.path.basename(dirname), e))
+                         % (os.path.basename(dirname), printable_e))
 
 
 class Feature(object):