From bc6f5869b4b1ec1b538c13e3b3db17d83f8aeacb Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Sun, 17 May 2015 15:03:26 +0200 Subject: [PATCH] patially revert #132dc4c: Removing overloaded __dir__ on LibModel. This was making me unconfortable, as I don't know that it will not break something else. --- beets/library.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/beets/library.py b/beets/library.py index 9d55c7f80..006630c08 100644 --- a/beets/library.py +++ b/beets/library.py @@ -312,10 +312,6 @@ class LibModel(dbcore.Model): def __unicode__(self): return format(self) - def __dir__(self): - return (self._fields.keys() + self._getters().keys() + - self._types.keys()) - class FormattedItemMapping(dbcore.db.FormattedMapping): """Add lookup for album-level fields. @@ -489,7 +485,8 @@ class Item(LibModel): plugin_fields = [] for plugin in plugins.find_plugins(): plugin_fields += plugin.template_fields.keys() - return super(Item, cls).__dir__(cls()), plugin_fields + return (cls._fields.keys() + cls._getters().keys() + + cls._types.keys()), plugin_fields def __setitem__(self, key, value): """Set the item's value for a standard field or a flexattr. @@ -924,7 +921,8 @@ class Album(LibModel): plugin_fields = [] for plugin in plugins.find_plugins(): plugin_fields += plugin.album_template_fields.keys() - return super(Album, cls).__dir__(cls()), plugin_fields + return (cls._fields.keys() + cls._getters().keys() + + cls._types.keys()), plugin_fields def items(self): """Returns an iterable over the items associated with this