Merge branch 'master' of git://github.com/django-debug-toolbar/django-debug-toolbar into jquery_no_conflict_issue

1 files changed, 2 insertions, 4 deletions

diff --git a/debug_toolbar/utils/sqlparse/formatter.py b/debug_toolbar/utils/sqlparse/formatter.py
index 34e9fe0..3acece9 100644
--- a/debug_toolbar/utils/sqlparse/formatter.py
+++ b/debug_toolbar/utils/sqlparse/formatter.py
@@ -76,11 +76,11 @@ def build_filter_stack(stack, options):
       options: Dictionary with options validated by validate_options.
     """
     # Token filter
-    if 'keyword_case' in options:
+    if options.get('keyword_case', None):
         stack.preprocess.append(
             filters.KeywordCaseFilter(options['keyword_case']))
 
-    if 'identifier_case' in options:
+    if options.get('identifier_case', None):
         stack.preprocess.append(
             filters.IdentifierCaseFilter(options['identifier_case']))
 
@@ -118,5 +118,3 @@ def build_filter_stack(stack, options):
             stack.postprocess.append(fltr)
 
     return stack
-
-