From 05a55fea7d3b21e5e875aad8b90213f0af0e21ec Mon Sep 17 00:00:00 2001 From: Corey Oordt Date: Thu, 12 May 2011 06:46:21 -0400 Subject: [PATCH] Added a Deprecation warning for CATEGORIES_RELATION_MODELS --- categories/settings.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/categories/settings.py b/categories/settings.py index e9c07b0..052ce53 100644 --- a/categories/settings.py +++ b/categories/settings.py @@ -29,7 +29,11 @@ if hasattr(settings, 'CATEGORIES_THUMBNAIL_UPLOAD_PATH'): warnings.warn(ERR_MSG % "CATEGORIES_THUMBNAIL_UPLOAD_PATH", DeprecationWarning) DEFAULT_SETTINGS["THUMBNAIL_UPLOAD_PATH"] = getattr(settings, 'CATEGORIES_THUMBNAIL_UPLOAD_PATH') -RELATION_MODELS = getattr(settings, 'CATEGORIES_RELATION_MODELS', []) -RELATIONS = [Q(app_label=al, model=m) for al, m in [x.split('.') for x in RELATION_MODELS]] +if hasattr(settings, 'CATEGORIES_RELATION_MODELS'): + warnings.warn(ERR_MSG % "CATEGORIES_RELATION_MODELS", DeprecationWarning) + DEFAULT_SETTINGS["RELATION_MODELS"] = getattr(settings, 'CATEGORIES_RELATION_MODELS') -globals().update(DEFAULT_SETTINGS) \ No newline at end of file +# Add all the keys/values to the module's namespace +globals().update(DEFAULT_SETTINGS) + +RELATIONS = [Q(app_label=al, model=m) for al, m in [x.split('.') for x in RELATION_MODELS]]