  from django.conf import settings
  from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
  from django.core.files import locks, File
  from django.core.files.move import file_move_safe
  from django.utils.encoding import force_unicode
  from django.utils.functional import LazyObject
  from django.utils.importlib import import_module
  from django.utils.text import get_valid_filename
  from django.utils._os import safe_join
  
 
</s> remove         return urlparse.urljoin(self.base_url, name).replace('\\', '/')
 </s> add         return urlparse.urljoin(self.base_url, filepath_to_uri(name))
from django.utils.encoding import force_unicode, filepath_to_uri
  from django.conf import settings
  from django.core.exceptions import ImproperlyConfigured, SuspiciousOperation
  from django.core.files import locks, File
  from django.core.files.move import file_move_safe
from django.utils.encoding import force_unicode, filepath_to_uri
  from django.utils.functional import LazyObject
  from django.utils.importlib import import_module
  from django.utils.text import get_valid_filename
  from django.utils._os import safe_join
  
keep keep keep keep replace keep keep keep keep keep
 Fixed #15181 -- Ensure that special characters are escaped when querying for the URL of an uploaded file. Thanks to e.generalov for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15409 bcc190cf-cafb-0310-a4f2-bffc1f526a37 
django/core/files/storage.py