From ab444eed50f34df33755f4e778825de8d1bf9668 Mon Sep 17 00:00:00 2001 From: Saeed Gharedaghi Date: Mon, 9 Jan 2017 00:57:45 +0330 Subject: [PATCH] change __dict__ to vars function Back gunicorn/argparse_compat.py gunicorn/six.py files changes Back run_gunicorn.py file changes --- gunicorn/app/base.py | 4 ++-- gunicorn/util.py | 2 +- tests/support.py | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gunicorn/app/base.py b/gunicorn/app/base.py index 4988838c..72db6457 100644 --- a/gunicorn/app/base.py +++ b/gunicorn/app/base.py @@ -100,7 +100,7 @@ class Application(BaseApplication): return cfg def get_config_from_module_name(self, module_name): - return util.import_module(module_name).__dict__ + return vars(util.import_module(module_name)) def load_config_from_module_name_or_filename(self, location): """ @@ -167,7 +167,7 @@ class Application(BaseApplication): # Lastly, update the configuration with any command line # settings. - for k, v in args.__dict__.items(): + for k, v in vars(args).items(): if v is None: continue if k == "args": diff --git a/gunicorn/util.py b/gunicorn/util.py index 7c9f7853..73974919 100644 --- a/gunicorn/util.py +++ b/gunicorn/util.py @@ -387,7 +387,7 @@ def import_app(module): is_debug = logging.root.level == logging.DEBUG try: - app = eval(obj, mod.__dict__) + app = eval(obj, vars(mod)) except NameError: if is_debug: traceback.print_exception(*sys.exc_info()) diff --git a/tests/support.py b/tests/support.py index 5c9000ff..04356d1d 100644 --- a/tests/support.py +++ b/tests/support.py @@ -38,12 +38,12 @@ try: except ImportError: class SimpleNamespace(object): def __init__(self, **kwargs): - self.__dict__.update(kwargs) + vars(self).update(kwargs) def __repr__(self): - keys = sorted(self.__dict__) - items = ("{}={!r}".format(k, self.__dict__[k]) for k in keys) + keys = sorted(vars(self)) + items = ("{}={!r}".format(k, vars(self)[k]) for k in keys) return "{}({})".format(type(self).__name__, ", ".join(items)) def __eq__(self, other): - return self.__dict__ == other.__dict__ + return vars(self) == vars(other)