From a5921f625cbba251c747251939b3eb4c98ddb16c Mon Sep 17 00:00:00 2001 From: Johnny Robeson Date: Mon, 30 May 2016 01:03:18 -0400 Subject: [PATCH] readd deprecated plugins search with name == b'name' This is to make sure we can still load plugins based off official plugins between the time of https://github.com/beetbox/beets/commit/9c41c399131f86149d64029cd5eec116087d55e4 and https://github.com/beetbox/beets/commit/71b9fd785c0468c61214363ad138f115375b10f5 --- beets/util/confit.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beets/util/confit.py b/beets/util/confit.py index aa49f6f12..c778f183a 100644 --- a/beets/util/confit.py +++ b/beets/util/confit.py @@ -538,7 +538,8 @@ def _package_path(name): ``name == "__main__"``). """ loader = pkgutil.get_loader(name) - if loader is None or name == '__main__': + # name == b'main' is deprecated + if loader is None or name == '__main__' or name == b'main': return None if hasattr(loader, 'get_filename'):