From 8e349be5474d00f8c71e00f9f0f9627277d5a477 Mon Sep 17 00:00:00 2001 From: Mike Herring Date: Tue, 29 Mar 2022 09:09:00 -0400 Subject: [PATCH] Remove references to obsolete _encode_name This function was removed when django-storages removed support for Python 2 https://github.com/jschneier/django-storages/commit/2dac7b83a191acff42a595e249dface3cf9f3959 --- filebrowser_safe/storage.py | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/filebrowser_safe/storage.py b/filebrowser_safe/storage.py index 5687611..fa3f47e 100644 --- a/filebrowser_safe/storage.py +++ b/filebrowser_safe/storage.py @@ -80,7 +80,7 @@ def isdir(self, name): return False name = self._normalize_name(self._clean_name(name)) - dirlist = self.listdir(self._encode_name(name)) + dirlist = self.listdir(name) # Check whether the iterator is empty for item in dirlist: @@ -94,12 +94,8 @@ def move(self, old_file_name, new_file_name, allow_overwrite=False): else: raise FILE_EXISTS_MSG.format(new_file_name) - old_key_name = self._encode_name( - self._normalize_name(self._clean_name(old_file_name)) - ) - new_key_name = self._encode_name( - self._normalize_name(self._clean_name(new_file_name)) - ) + old_key_name = self._normalize_name(self._clean_name(old_file_name)) + new_key_name = self._normalize_name(self._clean_name(new_file_name)) k = self.bucket.copy_key( new_key_name, self.bucket.name, old_key_name, preserve_acl=True @@ -115,7 +111,7 @@ def makedirs(self, name): def rmtree(self, name): name = self._normalize_name(self._clean_name(name)) - directories, files = self.listdir(self._encode_name(name)) + directories, files = self.listdir(name) for key in files: self.delete("/".join([name, key])) @@ -139,7 +135,7 @@ def isdir(self, name): return False name = self._normalize_name(self._clean_name(name)) - dirlist = self.listdir(self._encode_name(name)) + dirlist = self.listdir(name) # Check whether the iterator is empty for item in dirlist: @@ -154,12 +150,8 @@ def move(self, old_file_name, new_file_name, allow_overwrite=False): else: raise FILE_EXISTS_MSG.format(new_file_name) - old_key_name = self._encode_name( - self._normalize_name(self._clean_name(old_file_name)) - ) - new_key_name = self._encode_name( - self._normalize_name(self._clean_name(new_file_name)) - ) + old_key_name = self._normalize_name(self._clean_name(old_file_name)) + new_key_name = self._normalize_name(self._clean_name(new_file_name)) k = self.bucket.copy_key(new_key_name, self.bucket.name, old_key_name) @@ -173,7 +165,7 @@ def makedirs(self, name): def rmtree(self, name): name = self._normalize_name(self._clean_name(name)) - dirlist = self.listdir(self._encode_name(name)) + dirlist = self.listdir(name) for item in dirlist: item.delete()