diff --git a/beetsplug/badfiles.py b/beetsplug/badfiles.py index fdfbf204a..36b45de3a 100644 --- a/beetsplug/badfiles.py +++ b/beetsplug/badfiles.py @@ -25,9 +25,10 @@ import os import errno import sys import six +import confuse from beets.plugins import BeetsPlugin from beets.ui import Subcommand -from beets.util import displayable_path, confit, par_map +from beets.util import displayable_path, par_map from beets import ui @@ -90,7 +91,7 @@ class BadFiles(BeetsPlugin): ext = ext.lower() try: command = self.config['commands'].get(dict).get(ext) - except confit.NotFoundError: + except confuse.NotFoundError: command = None if command: return self.check_custom(command) diff --git a/beetsplug/beatport.py b/beetsplug/beatport.py index 0c25912b2..da59bef87 100644 --- a/beetsplug/beatport.py +++ b/beetsplug/beatport.py @@ -30,7 +30,7 @@ import beets import beets.ui from beets.autotag.hooks import AlbumInfo, TrackInfo, Distance from beets.plugins import BeetsPlugin -from beets.util import confit +import confuse AUTH_ERRORS = (TokenRequestDenied, TokenMissing, VerifierMissing) @@ -318,7 +318,7 @@ class BeatportPlugin(BeetsPlugin): def _tokenfile(self): """Get the path to the JSON file for storing the OAuth token. """ - return self.config['tokenfile'].get(confit.Filename(in_app_dir=True)) + return self.config['tokenfile'].get(confuse.Filename(in_app_dir=True)) def album_distance(self, items, album_info, mapping): """Returns the beatport source weight and the maximum source weight diff --git a/beetsplug/chroma.py b/beetsplug/chroma.py index 42abe09b5..c4230b069 100644 --- a/beetsplug/chroma.py +++ b/beetsplug/chroma.py @@ -22,8 +22,8 @@ from beets import plugins from beets import ui from beets import util from beets import config -from beets.util import confit from beets.autotag import hooks +import confuse import acoustid from collections import defaultdict from functools import partial @@ -221,7 +221,7 @@ class AcoustidPlugin(plugins.BeetsPlugin): def submit_cmd_func(lib, opts, args): try: apikey = config['acoustid']['apikey'].as_str() - except confit.NotFoundError: + except confuse.NotFoundError: raise ui.UserError(u'no Acoustid user API key provided') submit_items(self._log, apikey, lib.items(ui.decargs(args))) submit_cmd.func = submit_cmd_func diff --git a/beetsplug/convert.py b/beetsplug/convert.py index 303563a7a..6ed139da0 100644 --- a/beetsplug/convert.py +++ b/beetsplug/convert.py @@ -28,7 +28,7 @@ import platform from beets import ui, util, plugins, config from beets.plugins import BeetsPlugin -from beets.util.confit import ConfigTypeError +from confuse import ConfigTypeError from beets import art from beets.util.artresizer import ArtResizer from beets.library import parse_query_string diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py index 5a2bf57e0..68b4b5a95 100644 --- a/beetsplug/discogs.py +++ b/beetsplug/discogs.py @@ -22,7 +22,7 @@ import beets.ui from beets import config from beets.autotag.hooks import AlbumInfo, TrackInfo, Distance from beets.plugins import BeetsPlugin -from beets.util import confit +import confuse from discogs_client import Release, Master, Client from discogs_client.exceptions import DiscogsAPIError from requests.exceptions import ConnectionError @@ -122,7 +122,7 @@ class DiscogsPlugin(BeetsPlugin): def _tokenfile(self): """Get the path to the JSON file for storing the OAuth token. """ - return self.config['tokenfile'].get(confit.Filename(in_app_dir=True)) + return self.config['tokenfile'].get(confuse.Filename(in_app_dir=True)) def authenticate(self, c_key, c_secret): # Get the link for the OAuth page. diff --git a/beetsplug/fetchart.py b/beetsplug/fetchart.py index 2583e4c16..af1aaa567 100644 --- a/beetsplug/fetchart.py +++ b/beetsplug/fetchart.py @@ -31,8 +31,9 @@ from beets import util from beets import config from mediafile import image_mime_type from beets.util.artresizer import ArtResizer -from beets.util import confit, sorted_walk +from beets.util import sorted_walk from beets.util import syspath, bytestring_path, py3_path +import confuse import six CONTENT_TYPES = { @@ -776,9 +777,9 @@ class FetchArtPlugin(plugins.BeetsPlugin, RequestMixin): # allow both pixel and percentage-based margin specifications self.enforce_ratio = self.config['enforce_ratio'].get( - confit.OneOf([bool, - confit.String(pattern=self.PAT_PX), - confit.String(pattern=self.PAT_PERCENT)])) + confuse.OneOf([bool, + confuse.String(pattern=self.PAT_PX), + confuse.String(pattern=self.PAT_PERCENT)])) self.margin_px = None self.margin_percent = None if type(self.enforce_ratio) is six.text_type: @@ -788,7 +789,7 @@ class FetchArtPlugin(plugins.BeetsPlugin, RequestMixin): self.margin_px = int(self.enforce_ratio[:-2]) else: # shouldn't happen - raise confit.ConfigValueError() + raise confuse.ConfigValueError() self.enforce_ratio = True cover_names = self.config['cover_names'].as_str_seq() diff --git a/beetsplug/metasync/__init__.py b/beetsplug/metasync/__init__.py index 02f0b0f9b..943dbac1f 100644 --- a/beetsplug/metasync/__init__.py +++ b/beetsplug/metasync/__init__.py @@ -21,7 +21,7 @@ from __future__ import division, absolute_import, print_function from abc import abstractmethod, ABCMeta from importlib import import_module -from beets.util.confit import ConfigValueError +from confuse import ConfigValueError from beets import ui from beets.plugins import BeetsPlugin import six diff --git a/beetsplug/metasync/itunes.py b/beetsplug/metasync/itunes.py index d594fa591..067ca8d91 100644 --- a/beetsplug/metasync/itunes.py +++ b/beetsplug/metasync/itunes.py @@ -31,7 +31,7 @@ from time import mktime from beets import util from beets.dbcore import types from beets.library import DateType -from beets.util.confit import ConfigValueError +from confuse import ConfigValueError from beetsplug.metasync import MetaSource diff --git a/beetsplug/spotify.py b/beetsplug/spotify.py index 75f2c8523..f6df91bb3 100644 --- a/beetsplug/spotify.py +++ b/beetsplug/spotify.py @@ -14,7 +14,7 @@ import requests from beets import ui from beets.plugins import BeetsPlugin -from beets.util import confit +import confuse from beets.autotag.hooks import AlbumInfo, TrackInfo, Distance @@ -49,7 +49,7 @@ class SpotifyPlugin(BeetsPlugin): self.config['client_secret'].redact = True self.tokenfile = self.config['tokenfile'].get( - confit.Filename(in_app_dir=True) + confuse.Filename(in_app_dir=True) ) # Path to the JSON file for storing the OAuth access token. self.setup() diff --git a/beetsplug/types.py b/beetsplug/types.py index 0c078881c..4a39f05b1 100644 --- a/beetsplug/types.py +++ b/beetsplug/types.py @@ -17,7 +17,7 @@ from __future__ import division, absolute_import, print_function from beets.plugins import BeetsPlugin from beets.dbcore import types -from beets.util.confit import ConfigValueError +from confuse import ConfigValueError from beets import library diff --git a/beetsplug/zero.py b/beetsplug/zero.py index ebe1b486e..0cca199c5 100644 --- a/beetsplug/zero.py +++ b/beetsplug/zero.py @@ -24,7 +24,7 @@ from beets.plugins import BeetsPlugin from mediafile import MediaFile from beets.importer import action from beets.ui import Subcommand, decargs, input_yn -from beets.util import confit +import confuse __author__ = 'baobab@heresiarch.info' @@ -98,7 +98,7 @@ class ZeroPlugin(BeetsPlugin): for pattern in self.config[field].as_str_seq(): prog = re.compile(pattern, re.IGNORECASE) self.fields_to_progs.setdefault(field, []).append(prog) - except confit.NotFoundError: + except confuse.NotFoundError: # Matches everything self.fields_to_progs[field] = []