From 46809d02b2f94a4e0dafac36b621edc54d733cc2 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 6 Sep 2013 23:39:53 +0200 Subject: [PATCH] Worked around an issue with Django 1.6's six. --- configurations/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configurations/base.py b/configurations/base.py index 1390bd9..8601c73 100644 --- a/configurations/base.py +++ b/configurations/base.py @@ -21,7 +21,7 @@ class ConfigurationBase(type): def __new__(cls, name, bases, attrs): # also check for "Configuration" here to handle the Settings class # below remove it when we deprecate the Settings class - if (bases != (object,) and + if (bases not in ((object,), ()) and bases[0].__name__ not in ('NewBase', 'Configuration')): # if this is actually a subclass in a settings module # we better check if the importer was correctly installed