From 96a08e7914151bff0a1c758669efa6d00452fde8 Mon Sep 17 00:00:00 2001 From: Cezar Sa Espinola Date: Fri, 25 May 2012 15:26:50 -0300 Subject: [PATCH] Preventing VowsSettings inception leading to a possible infinite recursion --- django_pyvows/settings_manager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/django_pyvows/settings_manager.py b/django_pyvows/settings_manager.py index fbdebc2..e9122bb 100644 --- a/django_pyvows/settings_manager.py +++ b/django_pyvows/settings_manager.py @@ -22,9 +22,11 @@ class SettingsTracker(object): result = apply(self.real_import, (name, globals, locals, fromlist, level)) fromlist = (fromlist or []) if name == 'django.conf' and 'settings' in fromlist: - result.settings = VowsSettings(result.settings) + if type(result.settings) != VowsSettings: + result.settings = VowsSettings(result.settings) elif name == 'django' and 'conf' in fromlist: - result.conf.settings = VowsSettings(result.conf.settings) + if type(result.conf.settings) != VowsSettings: + result.conf.settings = VowsSettings(result.conf.settings) return result class VowsSettings(object):