Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use forward slashes on Windows #942

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions storages/base.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import os
import posixpath

from django.core.exceptions import ImproperlyConfigured
from django.core.files.storage import Storage

Expand All @@ -22,3 +25,15 @@ def __init__(self, **settings):

def get_default_settings(self):
return {}

def generate_filename(self, filename):
"""
Validate the filename by calling get_valid_name() and return a filename
to be passed to the save() method.
"""
# `filename` may include a path as returned by FileField.upload_to.
dirname, filename = os.path.split(filename)

# Use posixpath so it will not use "\\" on Windows
return posixpath.normpath(posixpath.join(dirname, self.get_valid_name(filename)))