diff options
| author | Aymeric Augustin | 2013-11-24 12:27:37 +0100 |
|---|---|---|
| committer | Aymeric Augustin | 2013-11-24 12:27:37 +0100 |
| commit | 6b0d32f7066cac5b6cb92e383eb486a3aa666d03 (patch) | |
| tree | dd95144a9e6272e798a7c03ef79f970b6fac7a6d /debug_toolbar/settings.py | |
| parent | 1c1b4428642254f4e6b05e93bd135b894f708eeb (diff) | |
| download | django-debug-toolbar-6b0d32f7066cac5b6cb92e383eb486a3aa666d03.tar.bz2 | |
Fix cyclic import issues in db2de5b.
Diffstat (limited to 'debug_toolbar/settings.py')
| -rw-r--r-- | debug_toolbar/settings.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py index 8534c2a..022fb8a 100644 --- a/debug_toolbar/settings.py +++ b/debug_toolbar/settings.py @@ -62,12 +62,7 @@ if 'TAG' in USER_CONFIG: CONFIG = CONFIG_DEFAULTS.copy() CONFIG.update(USER_CONFIG) -if isinstance(CONFIG['SHOW_TOOLBAR_CALLBACK'], six.string_types): - # Replace this with import_by_path in Django >= 1.6. - mod_path, func_name = CONFIG['SHOW_TOOLBAR_CALLBACK'].rsplit('.', 1) - mod = import_module(mod_path) - CONFIG['SHOW_TOOLBAR_CALLBACK'] = getattr(mod, func_name) -else: +if not isinstance(CONFIG['SHOW_TOOLBAR_CALLBACK'], six.string_types): warnings.warn( "SHOW_TOOLBAR_CALLBACK is now a dotted path. Update your " "DEBUG_TOOLBAR_CONFIG setting.", DeprecationWarning) |