Fix SettingsWrapper, support None as default value

python-thumbnails · Apr 3, 2015 · 7f67355 · 7f67355
1 parent 5c485f0
commit 7f67355
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/thumbnails/conf/wrapper.py b/thumbnails/conf/wrapper.py
@@ -33,18 +33,18 @@ def __init__(self):
             makedirs(self.THUMBNAIL_PATH, exist_ok=True)
 
     def __getattr__(self, key):
-        value = self.defaults.get(key, None)
+        value = self.defaults.get(key, 'unknown setting')
 
         for settings_module in self.settings_modules:
-            if getattr(settings_module, key, None):
-                value = getattr(settings_module, key, None)
+            if hasattr(settings_module, key):
+                value = getattr(settings_module, key)
 
         if 'overridden_settings' in os.environ:
             settings = json.loads(os.environ['overridden_settings'])
             if key in settings:
                 value = settings[key]
 
-        if value is None:
+        if value == 'unknown setting':
             raise AttributeError('No setting for "{}".'.format(key))
 
         return value