From ac8109bb5f7769a8a27a244bec6a937568668c40 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Fri, 26 Oct 2012 20:19:33 -0700
Subject: [PATCH] fix calls to _pick_format

---
 beets/ui/__init__.py | 5 ++---
 beets/ui/commands.py | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py
index 2cab9c813..81c254ec4 100644
--- a/beets/ui/__init__.py
+++ b/beets/ui/__init__.py
@@ -409,7 +409,7 @@ def get_replacements():
     # FIXME handle regex compilation errors
     return [(re.compile(k), v) for (k, v) in pairs]
 
-def _pick_format(album=False, fmt=None):
+def _pick_format(album, fmt=None):
     """Pick a format string for printing Album or Item objects,
     falling back to config options and defaults.
     """
@@ -425,8 +425,7 @@ def print_obj(obj, lib, fmt=None):
     format string. Otherwise, use the configured template.
     """
     album = isinstance(obj, library.Album)
-    if not fmt:
-        fmt = _pick_format(album=album)
+    fmt = _pick_format(album, fmt)
     if isinstance(fmt, Template):
         template = fmt
     else:
diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index e80370112..069c4b7e1 100644
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -709,7 +709,7 @@ def list_items(lib, query, album, fmt):
     """Print out items in lib matching query. If album, then search for
     albums instead of single items.
     """
-    tmpl = Template(fmt) if fmt else Template(ui._pick_format(config, album))
+    tmpl = Template(ui._pick_format(album, fmt))
     if album:
         for album in lib.albums(query):
             ui.print_obj(album, lib, tmpl)