Make PluginConfig getattr compatible with Python 3

__getattr__ is expected to raise AttributeError, not KeyError.

The removal of the call to hasattr() also speeds up fetch_setting().

1 files changed, 10 insertions, 7 deletions

diff --git a/wee_slack.py b/wee_slack.py
index 66f1c22..33aa919 100644
--- a/wee_slack.py
+++ b/wee_slack.py
@@ -4391,17 +4391,20 @@ class PluginConfig(object):
         return w.WEECHAT_RC_OK
 
     def fetch_setting(self, key):
-        if hasattr(self, 'get_' + key):
-            try:
-                return getattr(self, 'get_' + key)(key)
-            except:
-                return self.settings[key]
-        else:
+        try:
+            return getattr(self, 'get_' + key)(key)
+        except AttributeError:
             # Most settings are on/off, so make get_boolean the default
             return self.get_boolean(key)
+        except:
+            # There was setting-specific getter, but it failed.
+            return self.settings[key]
 
     def __getattr__(self, key):
-        return self.settings[key]
+        try:
+            return self.settings[key]
+        except KeyError:
+            raise AttributeError(key)
 
     def get_boolean(self, key):
         return w.config_string_to_boolean(w.config_get_plugin(key))