replace unicode with six.text_type

Author: Johnny Robeson

beets/autotag/hooks.py

@@ -27,6 +27,7 @@
 from beets.autotag import mb
 from jellyfish import levenshtein_distance
 from unidecode import unidecode
+import six
 
 log = logging.getLogger('beets')
 
@@ -205,8 +206,8 @@ def _string_dist_basic(str1, str2):
     transliteration/lowering to ASCII characters. Normalized by string
     length.
     """
-    assert isinstance(str1, unicode)
-    assert isinstance(str2, unicode)
+    assert isinstance(str1, six.text_type)
+    assert isinstance(str2, six.text_type)
     str1 = as_string(unidecode(str1))
     str2 = as_string(unidecode(str2))
     str1 = re.sub(r'[^a-z0-9]', '', str1.lower())

beets/autotag/mb.py

@@ -27,6 +27,7 @@
 import beets
 from beets import util
 from beets import config
+import six
 
 VARIOUS_ARTISTS_ID = '89ad4ac3-39f7-470e-963a-56509c546377'
 BASE_URL = 'http://musicbrainz.org/'
@@ -69,7 +70,8 @@ def configure():
     """Set up the python-musicbrainz-ngs module according to settings
     from the beets configuration. This should be called at startup.
     """
-    musicbrainzngs.set_hostname(config['musicbrainz']['host'].get(unicode))
+    hostname = config['musicbrainz']['host'].get(six.text_type)
+    musicbrainzngs.set_hostname(hostname)
     musicbrainzngs.set_rate_limit(
         config['musicbrainz']['ratelimit_interval'].as_number(),
         config['musicbrainz']['ratelimit'].get(int),
@@ -260,7 +262,7 @@ def album_info(release):
     )
     info.va = info.artist_id == VARIOUS_ARTISTS_ID
     if info.va:
-        info.artist = config['va_name'].get(unicode)
+        info.artist = config['va_name'].get(six.text_type)
     info.asin = release.get('asin')
     info.releasegroup_id = release['release-group']['id']
     info.country = release.get('country')
@@ -329,7 +331,7 @@ def match_album(artist, album, tracks=None):
         # Various Artists search.
         criteria['arid'] = VARIOUS_ARTISTS_ID
     if tracks is not None:
-        criteria['tracks'] = unicode(tracks)
+        criteria['tracks'] = six.text_type(tracks)
 
     # Abort if we have no search terms.
     if not any(criteria.itervalues()):

beets/dbcore/db.py

@@ -29,6 +29,7 @@
 from beets.util.functemplate import Template
 from beets.dbcore import types
 from .query import MatchQuery, NullSort, TrueQuery
+import six
 
 
 class FormattedMapping(collections.Mapping):
@@ -69,7 +70,7 @@ def _get_formatted(self, model, key):
             value = value.decode('utf8', 'ignore')
 
         if self.for_path:
-            sep_repl = beets.config['path_sep_replace'].get(unicode)
+            sep_repl = beets.config['path_sep_replace'].get(six.text_type)
             for sep in (os.path.sep, os.path.altsep):
                 if sep:
                     value = value.replace(sep, sep_repl)

beets/dbcore/query.py

@@ -23,6 +23,7 @@
 from datetime import datetime, timedelta
 import unicodedata
 from functools import reduce
+import six
 
 
 class ParsingError(ValueError):
@@ -246,8 +247,8 @@ def __init__(self, field, pattern):
         # Use a buffer representation of the pattern for SQLite
         # matching. This instructs SQLite to treat the blob as binary
         # rather than encoded Unicode.
-        if isinstance(self.pattern, (unicode, bytes)):
-            if isinstance(self.pattern, unicode):
+        if isinstance(self.pattern, (six.text_type, bytes)):
+            if isinstance(self.pattern, six.text_type):
                 self.pattern = self.pattern.encode('utf8')
             self.buf_pattern = buffer(self.pattern)
         elif isinstance(self.pattern, buffer):
@@ -793,7 +794,7 @@ def sort(self, objs):
 
         def key(item):
             field_val = item.get(self.field, '')
-            if self.case_insensitive and isinstance(field_val, unicode):
+            if self.case_insensitive and isinstance(field_val, six.text_type):
                 field_val = field_val.lower()
             return field_val
 

beets/dbcore/types.py

@@ -19,6 +19,7 @@
 
 from . import query
 from beets.util import str2bool
+import six
 
 
 # Abstract base.
@@ -37,7 +38,7 @@ class Type(object):
     """The `Query` subclass to be used when querying the field.
     """
 
-    model_type = unicode
+    model_type = six.text_type
     """The Python type that is used to represent the value in the model.
 
     The model is guaranteed to return a value of this type if the field
@@ -63,7 +64,7 @@ def format(self, value):
         if isinstance(value, bytes):
             value = value.decode('utf8', 'ignore')
 
-        return unicode(value)
+        return six.text_type(value)
 
     def parse(self, string):
         """Parse a (possibly human-written) string and return the
@@ -102,7 +103,7 @@ def from_sql(self, sql_value):
         """
         if isinstance(sql_value, buffer):
             sql_value = bytes(sql_value).decode('utf8', 'ignore')
-        if isinstance(sql_value, unicode):
+        if isinstance(sql_value, six.text_type):
             return self.parse(sql_value)
         else:
             return self.normalize(sql_value)
@@ -194,7 +195,7 @@ class Boolean(Type):
     model_type = bool
 
     def format(self, value):
-        return unicode(bool(value))
+        return six.text_type(bool(value))
 
     def parse(self, string):
         return str2bool(string)

beets/importer.py

@@ -14,6 +14,7 @@
 # included in all copies or substantial portions of the Software.
 
 from __future__ import division, absolute_import, print_function
+import six
 
 """Provides the basic, interface-agnostic workflow for importing and
 autotagging music files.
@@ -640,7 +641,7 @@ def align_album_level_fields(self):
                 changes['comp'] = False
             else:
                 # VA.
-                changes['albumartist'] = config['va_name'].get(unicode)
+                changes['albumartist'] = config['va_name'].get(six.text_type)
                 changes['comp'] = True
 
         elif self.choice_flag in (action.APPLY, action.RETAG):

beets/library.py

@@ -124,14 +124,15 @@ class DateType(types.Float):
     query = dbcore.query.DateQuery
 
     def format(self, value):
-        return time.strftime(beets.config['time_format'].get(unicode),
+        return time.strftime(beets.config['time_format'].get(six.text_type),
                              time.localtime(value or 0))
 
     def parse(self, string):
         try:
             # Try a formatted date string.
             return time.mktime(
-                time.strptime(string, beets.config['time_format'].get(unicode))
+                time.strptime(string,
+                              beets.config['time_format'].get(six.text_type))
             )
         except ValueError:
             # Fall back to a plain timestamp number.
@@ -153,7 +154,7 @@ def parse(self, string):
         return normpath(bytestring_path(string))
 
     def normalize(self, value):
-        if isinstance(value, unicode):
+        if isinstance(value, six.text_type):
             # Paths stored internally as encoded bytes.
             return bytestring_path(value)
 
@@ -281,11 +282,11 @@ def __unicode__(self):
         """
         return u'{0}: {1}'.format(
             util.displayable_path(self.path),
-            unicode(self.reason)
+            six.text_type(self.reason)
         )
 
     def __str__(self):
-        return unicode(self).encode('utf8')
+        return six.text_type(self).encode('utf8')
 
 
 class ReadError(FileOperationError):
@@ -331,7 +332,7 @@ def add(self, lib=None):
 
     def __format__(self, spec):
         if not spec:
-            spec = beets.config[self._format_config_key].get(unicode)
+            spec = beets.config[self._format_config_key].get(six.text_type)
         result = self.evaluate_template(spec)
         if isinstance(spec, bytes):
             # if spec is a byte string then we must return a one as well
@@ -517,7 +518,7 @@ def __setitem__(self, key, value):
         """
         # Encode unicode paths and read buffers.
         if key == 'path':
-            if isinstance(value, unicode):
+            if isinstance(value, six.text_type):
                 value = bytestring_path(value)
             elif isinstance(value, buffer):
                 value = bytes(value)
@@ -1061,7 +1062,8 @@ def art_destination(self, image, item_dir=None):
         image = bytestring_path(image)
         item_dir = item_dir or self.item_dir()
 
-        filename_tmpl = Template(beets.config['art_filename'].get(unicode))
+        filename_tmpl = Template(
+            beets.config['art_filename'].get(six.text_type))
         subpath = self.evaluate_template(filename_tmpl, True)
         if beets.config['asciify_paths']:
             subpath = unidecode(subpath)
@@ -1179,7 +1181,8 @@ def parse_query_string(s, model_cls):
 
     The string is split into components using shell-like syntax.
     """
-    assert isinstance(s, unicode), u"Query is not unicode: {0!r}".format(s)
+    message = u"Query is not unicode: {0!r}".format(s)
+    assert isinstance(s, six.text_type), message
     try:
         parts = util.shlex_split(s)
     except ValueError as exc:
@@ -1405,7 +1408,7 @@ def tmpl_asciify(s):
     def tmpl_time(s, fmt):
         """Format a time value using `strftime`.
         """
-        cur_fmt = beets.config['time_format'].get(unicode)
+        cur_fmt = beets.config['time_format'].get(six.text_type)
         return time.strftime(fmt, time.strptime(s, cur_fmt))
 
     def tmpl_aunique(self, keys=None, disam=None):

beets/logging.py

@@ -27,6 +27,7 @@
 from logging import *  # noqa
 import subprocess
 import threading
+import six
 
 
 def logsafe(val):
@@ -42,7 +43,7 @@ def logsafe(val):
       example.
     """
     # Already Unicode.
-    if isinstance(val, unicode):
+    if isinstance(val, six.text_type):
         return val
 
     # Bytestring: needs decoding.
@@ -56,7 +57,7 @@ def logsafe(val):
     # A "problem" object: needs a workaround.
     elif isinstance(val, subprocess.CalledProcessError):
         try:
-            return unicode(val)
+            return six.text_type(val)
         except UnicodeDecodeError:
             # An object with a broken __unicode__ formatter. Use __str__
             # instead.