From 1e9edf7ed5d2826c9776302b127163d99335015b Mon Sep 17 00:00:00 2001 From: Brandon Kurtz Date: Sun, 22 Oct 2017 17:24:14 -0400 Subject: [PATCH 1/3] fixing one instance of + string appending as per https://github.com/IMGIITRoorkee/django-filemanager/issues/35 --- filemanager/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filemanager/__init__.py b/filemanager/__init__.py index f772cdd..1bbca7a 100644 --- a/filemanager/__init__.py +++ b/filemanager/__init__.py @@ -76,7 +76,7 @@ def rename_if_exists(self, folder, file): full_path = folder + name + '.' + str(i) + extension if not os.path.exists(full_path): break - return name + '.' + str(i) + extension + return "{0}.{1}{2}".format(name, str(i), extension) else: return file From 3f43cb68fb2f19eead56ccab6afd0a1be9e56ca8 Mon Sep 17 00:00:00 2001 From: Brandon Kurtz Date: Sun, 22 Oct 2017 17:31:02 -0400 Subject: [PATCH 2/3] fixing instance of + appending --- filemanager/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filemanager/__init__.py b/filemanager/__init__.py index 1bbca7a..bf46f79 100644 --- a/filemanager/__init__.py +++ b/filemanager/__init__.py @@ -106,7 +106,7 @@ def handle_form(self, form, files): and not re.match(r'[\w\d_ -]+', name).group(0) == name ) if invalid_folder_name: - messages.append("Invalid folder name : " + name) + messages.append('{0}{1}'.format("Invalid folder name : ", name) return messages invalid_file_name = ( From e161dd12afceb836a5f0571ace82c5d17bc08c37 Mon Sep 17 00:00:00 2001 From: Brandon Kurtz Date: Sun, 22 Oct 2017 17:38:17 -0400 Subject: [PATCH 3/3] missing parenthesis --- filemanager/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filemanager/__init__.py b/filemanager/__init__.py index bf46f79..46825c8 100644 --- a/filemanager/__init__.py +++ b/filemanager/__init__.py @@ -106,7 +106,7 @@ def handle_form(self, form, files): and not re.match(r'[\w\d_ -]+', name).group(0) == name ) if invalid_folder_name: - messages.append('{0}{1}'.format("Invalid folder name : ", name) + messages.append('{0}{1}'.format("Invalid folder name : ", name)) return messages invalid_file_name = (