From 879c01ba006460849e222c17ce5a6b22f7f2fbb5 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Thu, 1 Dec 2016 08:15:22 -0500 Subject: [PATCH] Add separate list of excluded fields to AdjustableSettings Adds "environ" field. Also renames __excluded to _excluded so it can be overridden by child classes. --- lbrynet/conf.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lbrynet/conf.py b/lbrynet/conf.py index 1f840e1b4..180921b30 100644 --- a/lbrynet/conf.py +++ b/lbrynet/conf.py @@ -45,11 +45,11 @@ else: class Settings(object): """A collection of configuration settings""" __fixed = [] - __excluded = ['get_dict', 'update'] + _excluded = ['get_dict', 'update'] def __iter__(self): for k in self.__dict__.iterkeys(): - if k.startswith('_') or k in self.__excluded: + if k.startswith('_') or k in self._excluded: continue yield k @@ -180,6 +180,8 @@ ENVIRONMENT = Env( class AdjustableSettings(Settings): + _excluded = ['get_dict', 'update', 'environ'] + """Settings that are allowed to be overriden by the user""" def __init__(self, environ=None): self.environ = environ or ENVIRONMENT