Commit 1f305a00 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #12744 -- Improved the settings cleansing process the work with... 

Fixed #12744 -- Improved the settings cleansing process the work with dictionary settings that are keyed by non-strings. Thanks to minmax for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent ee313207

django/views/debug.py

+10 −6
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ def cleanse_setting(key, value): 
    If the value is a dictionary, recursively cleanse the keys in

    that dictionary.

    """

    try:

        if HIDDEN_SETTINGS.search(key):

            cleansed = '********************'

        else:
@@ -33,6 +34,9 @@ def cleanse_setting(key, value): 
                cleansed = dict((k, cleanse_setting(k, v)) for k,v in value.items())

            else:

                cleansed = value

    except TypeError:

        # If the key isn't regex-able, just return as-is.

        cleansed = value

    return cleansed



def get_safe_settings():