Ticket #13550: non_ascii_chars_fix.diff

django/core/files/storage.py

@@ -134 +134 @@
         self.base_url = base_url
 
     def _open(self, name, mode='rb'):
-        return File(open(self.path(name), mode))
+        return File(open(self.path_str(name), mode))
 
     def _save(self, name, content):
-        full_path = self.path(name)
+        full_path = self.path_str(name)
 
         directory = os.path.dirname(full_path)
         if not os.path.exists(directory):
@@ -174 +174 @@
                 if e.errno == errno.EEXIST:
                     # Ooops, the file exists. We need a new file name.
                     name = self.get_available_name(name)
-                    full_path = self.path(name)
+                    full_path = self.path_str(name)
                 else:
                     raise
             else:
@@ -187 +187 @@
         return name
 
     def delete(self, name):
-        name = self.path(name)
+        name = self.path_str(name)
         # If the file exists, delete it from the filesystem.
         if os.path.exists(name):
             os.remove(name)
 
     def exists(self, name):
-        return os.path.exists(self.path(name))
+        return os.path.exists(self.path_str(name))
 
     def listdir(self, path):
         path = self.path(path)
@@ -211 +211 @@
         except ValueError:
             raise SuspiciousOperation("Attempted access to '%s' denied." % name)
         return os.path.normpath(path)
+    
+    def path_str(self, name):
+        return self.path(name).encode('utf-8')
 
     def size(self, name):
-        return os.path.getsize(self.path(name))
+        return os.path.getsize(self.path_str(name))
 
     def url(self, name):
         if self.base_url is None: