Commit aff9ff9b authored by Chris Beaven's avatar Chris Beaven
Browse files

Fixes #14715 -- More informative ValueError for safe_join util. Thanks btubbs. 

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

django/utils/_os.py

+2 −2
Original line number Diff line number Diff line
@@ -41,6 +41,6 @@ def safe_join(base, *paths): 
    # equal to base_path).

    if not final_path.startswith(base_path) \

       or final_path[base_path_len:base_path_len+1] not in ('', sep):

        raise ValueError('the joined path is located outside of the base path'

                         ' component')

        raise ValueError('The joined path (%s) is located outside of the base '

                         'path component (%s)' % (final_path, base_path))

    return final_path