From eb68177feeaae63e5a8c7facaeb9c01a45f1f6e7 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Sat, 21 Nov 2015 12:40:45 -0800
Subject: [PATCH] Fix #1735: `convert --pretend` encoding error

---
 beetsplug/convert.py | 2 +-
 docs/changelog.rst   | 2 ++
 test/test_convert.py | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/beetsplug/convert.py b/beetsplug/convert.py
index fd82e80f2..a262f216d 100644
--- a/beetsplug/convert.py
+++ b/beetsplug/convert.py
@@ -189,7 +189,7 @@ class ConvertPlugin(BeetsPlugin):
             })
 
         if pretend:
-            self._log.info(' '.join(args))
+            self._log.info(' '.join(ui.decargs(args)))
             return
 
         try:
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 87b7819e5..ce707ab88 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -64,6 +64,8 @@ Fixes:
   :bug:`1666`
 * :doc:`/plugins/thumbnails`: Fix a nasty segmentation fault crash that arose
   with some library versions. :bug:`1433`
+* :doc:`/plugins/convert`: Fix a crash with Unicode paths in ``--pretend``
+  mode. :bug:`1735`
 
 .. _Emby Server: http://emby.media
 
diff --git a/test/test_convert.py b/test/test_convert.py
index 86c6e5d2a..7cd565b3a 100644
--- a/test/test_convert.py
+++ b/test/test_convert.py
@@ -180,6 +180,11 @@ class ConvertCliTest(unittest.TestCase, TestHelper):
         with open(converted, 'r') as f:
             self.assertEqual(f.read(), 'XXX')
 
+    def test_pretend(self):
+        self.run_command('convert', '--pretend', self.item.path)
+        converted = os.path.join(self.convert_dest, 'converted.mp3')
+        self.assertFalse(os.path.exists(converted))
+
 
 class NeverConvertLossyFilesTest(unittest.TestCase, TestHelper):
     """Test the effect of the `never_convert_lossy_files` option.