From 9f1c1134765d09df6c10e4e1f1147f2a6166f812 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Wed, 7 Oct 2015 15:36:31 -0700 Subject: [PATCH] For #1617: Use Confit's built-in path resolution Has the side effect of raising more reasonable errors when the type is wrong. --- beets/__init__.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/beets/__init__.py b/beets/__init__.py index e507ea2af..867ead368 100644 --- a/beets/__init__.py +++ b/beets/__init__.py @@ -33,14 +33,12 @@ class IncludeLazyConfig(confit.LazyConfig): super(IncludeLazyConfig, self).read(user, defaults) try: - included_filenames = self['include'].get(list) + for view in self['include'].all_contents(): + filename = view.as_filename() + if os.path.isfile(filename): + self.set_file(filename) except confit.NotFoundError: - included_filenames = [] - - for filename in included_filenames: - filename = os.path.join(self.config_dir(), filename) - if os.path.isfile(filename): - self.set_file(filename) + pass config = IncludeLazyConfig('beets', __name__)