summaryrefslogtreecommitdiff
path: root/django/utils
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-03-22 17:55:12 +0100
committerClaude Paroz <claude@2xlibre.net>2013-03-22 17:58:36 +0100
commitdeec020bf5927abbdd667912f80794c32c03e609 (patch)
tree384ebba3b5ddbf35c9fdf4983be4176ec8702137 /django/utils
parentdd897e4eeb20cab9ac708c46f34c5f09758205c8 (diff)
[1.5.x] Fixed #20108 -- Fixed filepath_to_uri decoding error
This was a regression due to unicode_literals usage. Thanks Ivan Virabyan for the report and the initial patch. Backport of 164528acc8 from master.
Diffstat (limited to 'django/utils')
-rw-r--r--django/utils/encoding.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 15215849b2..f08d417e93 100644
--- a/django/utils/encoding.py
+++ b/django/utils/encoding.py
@@ -232,7 +232,7 @@ def filepath_to_uri(path):
return path
# I know about `os.sep` and `os.altsep` but I want to leave
# some flexibility for hardcoding separators.
- return quote(force_bytes(path.replace("\\", "/")), safe=b"/~!*()'")
+ return quote(force_bytes(path).replace(b"\\", b"/"), safe=b"/~!*()'")
# The encoding of the default system locale but falls back to the
# given fallback encoding if the encoding is unsupported by python or could