From 859268f70737174bcf10846339eda2e272fa19b5 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Tue, 6 Nov 2012 14:29:58 -0800
Subject: [PATCH] decode Unicode arguments to import -L (GC-457)

---
 beets/ui/commands.py | 2 +-
 docs/changelog.rst   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index 24d7280e7..9a2d05dc5 100644
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -795,7 +795,7 @@ def import_func(lib, config, opts, args):
         quiet_fallback = importer.action.SKIP
 
     if opts.library:
-        query = args
+        query = decargs(args)
         paths = []
     else:
         query = None
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 62737a47d..8fa2ea9a5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -69,6 +69,7 @@ Changelog
 * Fix a crash when input is read from a pipe without a specified encoding.
 * Fix some problem with identifying files on Windows with Unicode directory
   names in their path.
+* Fix a crash when Unicode queries were used with ``import -L`` re-imports.
 * Add human-readable error messages when writing files' tags fails or when a
   directory can't be created.
 * Changed plugin loading so that modules can be imported without