diff --git a/beetsplug/fuzzy.py b/beetsplug/fuzzy.py index 4e167217f..f2c9095b2 100644 --- a/beetsplug/fuzzy.py +++ b/beetsplug/fuzzy.py @@ -16,8 +16,7 @@ """Provides a fuzzy matching query. """ -from __future__ import (division, absolute_import, print_function, - unicode_literals) +from __future__ import (division, absolute_import, print_function) from beets.plugins import BeetsPlugin from beets.dbcore.query import StringFieldQuery diff --git a/beetsplug/ihate.py b/beetsplug/ihate.py index 7285c8482..c6e62fe29 100644 --- a/beetsplug/ihate.py +++ b/beetsplug/ihate.py @@ -13,8 +13,7 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -from __future__ import (division, absolute_import, print_function, - unicode_literals) +from __future__ import (division, absolute_import, print_function) """Warns you about things you hate (or even blocks import).""" diff --git a/beetsplug/importadded.py b/beetsplug/importadded.py index 70be1089e..833f2f21c 100644 --- a/beetsplug/importadded.py +++ b/beetsplug/importadded.py @@ -5,8 +5,7 @@ modification time (mtime) of the item's source file before import. Reimported albums and items are skipped. """ -from __future__ import (unicode_literals, absolute_import, print_function, - division) +from __future__ import (absolute_import, print_function, division) import os diff --git a/beetsplug/importfeeds.py b/beetsplug/importfeeds.py index c3d677572..8bdabc632 100644 --- a/beetsplug/importfeeds.py +++ b/beetsplug/importfeeds.py @@ -13,8 +13,7 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -from __future__ import (division, absolute_import, print_function, - unicode_literals) +from __future__ import (division, absolute_import, print_function) """Write paths of imported files in various formats to ease later import in a music player. Also allow printing the new file locations to stdout in case @@ -135,9 +134,9 @@ class ImportFeedsPlugin(BeetsPlugin): os.symlink(syspath(path), syspath(dest)) if 'echo' in formats: - self._log.info("Location of imported music:") + self._log.info(u"Location of imported music:") for path in paths: - self._log.info(" {0}", path) + self._log.info(u" {0}", path) def library_opened(self, lib): if self.config['dir'].get() is None: diff --git a/beetsplug/info.py b/beetsplug/info.py index a29a6ccfc..05fd3fe58 100644 --- a/beetsplug/info.py +++ b/beetsplug/info.py @@ -16,8 +16,7 @@ """Shows file metadata. """ -from __future__ import (division, absolute_import, print_function, - unicode_literals) +from __future__ import (division, absolute_import, print_function) import os import re @@ -141,17 +140,21 @@ def print_data_keys(data, item=None): class InfoPlugin(BeetsPlugin): def commands(self): - cmd = ui.Subcommand('info', help='show file metadata') + cmd = ui.Subcommand('info', help=u'show file metadata') cmd.func = self.run - cmd.parser.add_option('-l', '--library', action='store_true', - help='show library fields instead of tags') - cmd.parser.add_option('-s', '--summarize', action='store_true', - help='summarize the tags of all files') - cmd.parser.add_option('-i', '--include-keys', default=[], - action='append', dest='included_keys', - help='comma separated list of keys to show') - cmd.parser.add_option('-k', '--keys-only', action='store_true', - help='show only the keys') + cmd.parser.add_option( + u'-l', u'--library', action='store_true', + help=u'show library fields instead of tags') + cmd.parser.add_option( + u'-s', u'--summarize', action='store_true', + help=u'summarize the tags of all files') + cmd.parser.add_option( + u'-i', u'--include-keys', default=[], + action='append', dest='included_keys', + help=u'comma separated list of keys to show') + cmd.parser.add_option( + u'-k', u'--keys-only', action='store_true', + help=u'show only the keys') cmd.parser.add_format_option(target='item') return [cmd] diff --git a/beetsplug/inline.py b/beetsplug/inline.py index 5c0c81b80..8e22ad9c8 100644 --- a/beetsplug/inline.py +++ b/beetsplug/inline.py @@ -15,8 +15,7 @@ """Allows inline path template customization code in the config file. """ -from __future__ import (division, absolute_import, print_function, - unicode_literals) +from __future__ import (division, absolute_import, print_function) import traceback import itertools