Ticket #17516: #17516-memoized_safe_join.diff

django/utils/_os.py

@@ -2 +2 @@
 import stat
 from os.path import join, normcase, normpath, abspath, isabs, sep
 from django.utils.encoding import force_unicode
+from django.utils.functional import memoize
+
+_safe_join_cache = {} # Saves already safe-joined paths.
 
 # Define our own abspath function that can handle joining 
 # unicode paths to a current working directory that has non-ASCII
@@ -45 +48 @@
         raise ValueError('The joined path (%s) is located outside of the base '
                          'path component (%s)' % (final_path, base_path))
     return final_path
+safe_join = memoize(safe_join, _safe_join_cache, 10)
 
 def rmtree_errorhandler(func, path, exc_info):
     """