remove import of unicode_literals

.travis.yml

@@ -1,10 +1,6 @@
 language: python
 sudo: false
 
-branches:
-    only:
-        - master
-
 matrix:
     include:
         - python: 2.7

beets/__init__.py

@@ -13,15 +13,15 @@
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import division, absolute_import, print_function
 
 import os
 
 import beets.library
 from beets.util import confit
 
-__version__ = '1.3.18'
-__author__ = 'Adrian Sampson <adrian@radbox.org>'
+__version__ = u'1.3.18'
+__author__ = u'Adrian Sampson <adrian@radbox.org>'
 
 Library = beets.library.Library
 

beets/autotag/__init__.py

@@ -16,8 +16,7 @@
 """Facilities for automatically determining files' correct metadata.
 """
 
-from __future__ import (division, absolute_import, print_function,
-                        unicode_literals)
+from __future__ import division, absolute_import, print_function
 
 from beets import logging
 from beets import config

beets/autotag/hooks.py

@@ -14,8 +14,7 @@
 # included in all copies or substantial portions of the Software.
 
 """Glue between metadata sources and the matching logic."""
-from __future__ import (division, absolute_import, print_function,
-                        unicode_literals)
+from __future__ import division, absolute_import, print_function
 
 from collections import namedtuple
 import re
@@ -394,7 +393,7 @@ def update(self, dist):
         """
         if not isinstance(dist, Distance):
             raise ValueError(
-                '`dist` must be a Distance object, not {0}'.format(type(dist))
+                u'`dist` must be a Distance object, not {0}'.format(type(dist))
             )
         for key, penalties in dist._penalties.iteritems():
             self._penalties.setdefault(key, []).extend(penalties)
@@ -418,7 +417,7 @@ def add(self, key, dist):
         """
         if not 0.0 <= dist <= 1.0:
             raise ValueError(
-                '`dist` must be between 0.0 and 1.0, not {0}'.format(dist)
+                u'`dist` must be between 0.0 and 1.0, not {0}'.format(dist)
             )
         self._penalties.setdefault(key, []).append(dist)
 
@@ -514,7 +513,7 @@ def album_for_mbid(release_id):
     try:
         album = mb.album_for_id(release_id)
         if album:
-            plugins.send('albuminfo_received', info=album)
+            plugins.send(u'albuminfo_received', info=album)
         return album
     except mb.MusicBrainzAPIError as exc:
         exc.log(log)
@@ -527,7 +526,7 @@ def track_for_mbid(recording_id):
     try:
         track = mb.track_for_id(recording_id)
         if track:
-            plugins.send('trackinfo_received', info=track)
+            plugins.send(u'trackinfo_received', info=track)
         return track
     except mb.MusicBrainzAPIError as exc:
         exc.log(log)
@@ -538,7 +537,7 @@ def albums_for_id(album_id):
     candidates = [album_for_mbid(album_id)]
     plugin_albums = plugins.album_for_id(album_id)
     for a in plugin_albums:
-        plugins.send('albuminfo_received', info=a)
+        plugins.send(u'albuminfo_received', info=a)
     candidates.extend(plugin_albums)
     return filter(None, candidates)
 
@@ -548,7 +547,7 @@ def tracks_for_id(track_id):
     candidates = [track_for_mbid(track_id)]
     plugin_tracks = plugins.track_for_id(track_id)
     for t in plugin_tracks:
-        plugins.send('trackinfo_received', info=t)
+        plugins.send(u'trackinfo_received', info=t)
     candidates.extend(plugin_tracks)
     return filter(None, candidates)
 
@@ -581,7 +580,7 @@ def album_candidates(items, artist, album, va_likely):
 
     # Notify subscribed plugins about fetched album info
     for a in out:
-        plugins.send('albuminfo_received', info=a)
+        plugins.send(u'albuminfo_received', info=a)
 
     return out
 
@@ -605,6 +604,6 @@ def item_candidates(item, artist, title):
 
     # Notify subscribed plugins about fetched track info
     for i in out:
-        plugins.send('trackinfo_received', info=i)
+        plugins.send(u'trackinfo_received', info=i)
 
     return out

beets/autotag/match.py

@@ -17,8 +17,7 @@
 releases and tracks.
 """
 
-from __future__ import (division, absolute_import, print_function,
-                        unicode_literals)
+from __future__ import division, absolute_import, print_function
 
 import datetime
 import re
@@ -337,7 +336,7 @@ def _add_candidate(items, results, info):
 
     # Discard albums with zero tracks.
     if not info.tracks:
-        log.debug('No tracks.')
+        log.debug(u'No tracks.')
         return
 
     # Don't duplicate.

beets/autotag/mb.py

@@ -15,8 +15,7 @@
 
 """Searches for albums in the MusicBrainz database.
 """
-from __future__ import (division, absolute_import, print_function,
-                        unicode_literals)
+from __future__ import division, absolute_import, print_function
 
 import musicbrainzngs
 import re
@@ -43,7 +42,7 @@ class MusicBrainzAPIError(util.HumanReadableException):
     def __init__(self, reason, verb, query, tb=None):
         self.query = query
         if isinstance(reason, musicbrainzngs.WebServiceError):
-            reason = 'MusicBrainz not reachable'
+            reason = u'MusicBrainz not reachable'
         super(MusicBrainzAPIError, self).__init__(reason, verb, tb)
 
     def get_message(self):
@@ -162,7 +161,7 @@ def track_info(recording, index=None, medium=None, medium_index=None,
         medium=medium,
         medium_index=medium_index,
         medium_total=medium_total,
-        data_source='MusicBrainz',
+        data_source=u'MusicBrainz',
         data_url=track_url(recording['id']),
     )
 
@@ -256,7 +255,7 @@ def album_info(release):
         mediums=len(release['medium-list']),
         artist_sort=artist_sort_name,
         artist_credit=artist_credit_name,
-        data_source='MusicBrainz',
+        data_source=u'MusicBrainz',
         data_url=album_url(release['id']),
     )
     info.va = info.artist_id == VARIOUS_ARTISTS_ID
@@ -377,7 +376,7 @@ def _parse_id(s):
     no ID can be found, return None.
     """
     # Find the first thing that looks like a UUID/MBID.
-    match = re.search('[a-f0-9]{8}(-[a-f0-9]{4}){3}-[a-f0-9]{12}', s)
+    match = re.search(ur'[a-f0-9]{8}(-[a-f0-9]{4}){3}-[a-f0-9]{12}', s)
     if match:
         return match.group()
 
@@ -398,7 +397,7 @@ def album_for_id(releaseid):
         log.debug(u'Album ID match failed.')
         return None
     except musicbrainzngs.MusicBrainzError as exc:
-        raise MusicBrainzAPIError(exc, 'get release by ID', albumid,
+        raise MusicBrainzAPIError(exc, u'get release by ID', albumid,
                                   traceback.format_exc())
     return album_info(res['release'])
 
@@ -417,6 +416,6 @@ def track_for_id(releaseid):
         log.debug(u'Track ID match failed.')
         return None
     except musicbrainzngs.MusicBrainzError as exc:
-        raise MusicBrainzAPIError(exc, 'get recording by ID', trackid,
+        raise MusicBrainzAPIError(exc, u'get recording by ID', trackid,
                                   traceback.format_exc())
     return track_info(res['recording'])

beets/dbcore/__init__.py

@@ -16,7 +16,7 @@
 """DBCore is an abstract database package that forms the basis for beets'
 Library.
 """
-from __future__ import absolute_import
+from __future__ import division, absolute_import, print_function
 
 from .db import Model, Database
 from .query import Query, FieldQuery, MatchQuery, AndQuery, OrQuery

beets/dbcore/db.py

@@ -15,8 +15,7 @@
 
 """The central Model and Database constructs for DBCore.
 """
-from __future__ import (division, absolute_import, print_function,
-                        unicode_literals)
+from __future__ import division, absolute_import, print_function
 
 import time
 import os
@@ -201,9 +200,11 @@ def _check_db(self, need_id=True):
         exception is raised otherwise.
         """
         if not self._db:
-            raise ValueError('{0} has no database'.format(type(self).__name__))
+            raise ValueError(
+                u'{0} has no database'.format(type(self).__name__)
+            )
         if need_id and not self.id:
-            raise ValueError('{0} has no id'.format(type(self).__name__))
+            raise ValueError(u'{0} has no id'.format(type(self).__name__))
 
     # Essential field accessors.
 
@@ -255,11 +256,11 @@ def __delitem__(self, key):
             del self._values_flex[key]
             self._dirty.add(key)  # Mark for dropping on store.
         elif key in self._getters():  # Computed.
-            raise KeyError('computed field {0} cannot be deleted'.format(key))
+            raise KeyError(u'computed field {0} cannot be deleted'.format(key))
         elif key in self._fields:  # Fixed.
-            raise KeyError('fixed field {0} cannot be deleted'.format(key))
+            raise KeyError(u'fixed field {0} cannot be deleted'.format(key))
         else:
-            raise KeyError('no such field {0}'.format(key))
+            raise KeyError(u'no such field {0}'.format(key))
 
     def keys(self, computed=False):
         """Get a list of available field names for this object. The
@@ -318,12 +319,12 @@ def __iter__(self):
 
     def __getattr__(self, key):
         if key.startswith('_'):
-            raise AttributeError('model has no attribute {0!r}'.format(key))
+            raise AttributeError(u'model has no attribute {0!r}'.format(key))
         else:
             try:
                 return self[key]
             except KeyError:
-                raise AttributeError('no such field {0!r}'.format(key))
+                raise AttributeError(u'no such field {0!r}'.format(key))
 
     def __setattr__(self, key, value):
         if key.startswith('_'):
@@ -390,7 +391,7 @@ def load(self):
         """
         self._check_db()
         stored_obj = self._db._get(type(self), self.id)
-        assert stored_obj is not None, "object {0} not in DB".format(self.id)
+        assert stored_obj is not None, u"object {0} not in DB".format(self.id)
         self._values_fixed = {}
         self._values_flex = {}
         self.update(dict(stored_obj))
@@ -463,7 +464,7 @@ def _parse(cls, key, string):
         """Parse a string as a value for the given key.
         """
         if not isinstance(string, basestring):
-            raise TypeError("_parse() argument must be a string")
+            raise TypeError(u"_parse() argument must be a string")
 
         return cls._type(key).parse(string)
 
@@ -611,7 +612,7 @@ def __getitem__(self, n):
                 it.next()
             return it.next()
         except StopIteration:
-            raise IndexError('result index {0} out of range'.format(n))
+            raise IndexError(u'result index {0} out of range'.format(n))
 
     def get(self):
         """Return the first matching object, or None if no objects