Updated beets library to 1.0b11

lib/beets/ui/__init__.py

@@ -52,6 +52,21 @@ class UserError(Exception):
 
 # Utilities.
 
+def _encoding():
+    """Tries to guess the encoding uses by the terminal."""
+    try:
+        return locale.getdefaultlocale()[1] or 'utf8'
+    except ValueError:
+        # Invalid locale environment variable setting. To avoid
+        # failing entirely for no good reason, assume UTF-8.
+        return 'utf8'
+
+def decargs(arglist):
+    """Given a list of command-line argument bytestrings, attempts to
+    decode them to Unicode strings.
+    """
+    return [s.decode(_encoding()) for s in arglist]
+
 def print_(*strings):
     """Like print, but rather than raising an error when a character
     is not in the terminal's encoding's character set, just silently
@@ -65,13 +80,7 @@ def print_(*strings):
     else:
         txt = u''
     if isinstance(txt, unicode):
-        try:
-            encoding = locale.getdefaultlocale()[1] or 'utf8'
-        except ValueError:
-            # Invalid locale environment variable setting. To avoid
-            # failing entirely for no good reason, assume UTF-8.
-            encoding = 'utf8'
-        txt = txt.encode(encoding, 'replace')
+        txt = txt.encode(_encoding(), 'replace')
     print txt
 
 def input_options(options, require=False, prompt=None, fallback_prompt=None,
@@ -247,10 +256,6 @@ def input_yn(prompt, require=False, color=False):
     )
     return sel == 'y'
 
-def make_query(criteria):
-    """Make query string for the list of criteria."""
-    return ' '.join(criteria).strip() or None
-
 def config_val(config, section, name, default, vtype=None):
     """Queries the configuration file for a value (given by the
     section and name). If no value is present, returns default.
@@ -326,9 +331,20 @@ def colorize(color, text):
     return escape + text + RESET_COLOR
 
 def colordiff(a, b, highlight='red'):
-    """Given two strings, return the same pair of strings except with
-    their differences highlighted in the specified color.
+    """Given two values, return the same pair of strings except with
+    their differences highlighted in the specified color. Strings are
+    highlighted intelligently to show differences; other values are
+    stringified and highlighted in their entirety.
     """
+    if not isinstance(a, basestring) or not isinstance(b, basestring):
+        # Non-strings: use ordinary equality.
+        a = unicode(a)
+        b = unicode(b)
+        if a == b:
+            return a, b
+        else:
+            return colorize(highlight, a), colorize(highlight, b)
+
     a_out = []
     b_out = []
     
@@ -351,7 +367,7 @@ def colordiff(a, b, highlight='red'):
         else:
             assert(False)
     
-    return ''.join(a_out), ''.join(b_out)
+    return u''.join(a_out), u''.join(b_out)
 
 
 # Subcommand parsing infrastructure.