From 4032daadee9c55b0da36faf55b1a539fbf7b7575 Mon Sep 17 00:00:00 2001
From: Oscar Reyes <OscarEReyes@users.noreply.github.com>
Date: Sun, 22 Oct 2017 18:26:57 -0500
Subject: [PATCH 01/13] Changed '+' string concatenations to str format()

---
 filemanager/__init__.py | 110 +++++++++++-----------------------------
 1 file changed, 30 insertions(+), 80 deletions(-)

diff --git a/filemanager/__init__.py b/filemanager/__init__.py
index f772cdd..3019576 100644
--- a/filemanager/__init__.py
+++ b/filemanager/__init__.py
@@ -62,21 +62,21 @@ def __init__(
     def rename_if_exists(self, folder, file):
         if folder[-1] != os.sep:
             folder = folder + os.sep
-        if os.path.exists(folder + file):
+        if os.path.exists("{}{}".format(folder, file)):
             if file.find('.') == -1:
                 # no extension
                 for i in range(1000):
-                    if not os.path.exists(folder + file + '.' + str(i)):
+                    if not os.path.exists("{}{}.{}".format(folder, file, str(i)):
                         break
-                return file + '.' + str(i)
+                return "{}.{}".format(file, str(i)  
             else:
                 extension = file[file.rfind('.'):]
                 name = file[:file.rfind('.')]
                 for i in range(1000):
-                    full_path = folder + name + '.' + str(i) + extension
+                    full_path = "{}{}.{}{}".format(folder, name, str(i), extension)
                     if not os.path.exists(full_path):
                         break
-                return name + '.' + str(i) + extension
+                return "{}.{}{}".format(name, str(i), extension)
         else:
             return file
 
@@ -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("Invalid folder name : {}".format(name))
             return messages
 
         invalid_file_name = (
@@ -118,12 +118,12 @@ def handle_form(self, form, files):
             )
         )
         if invalid_file_name:
-            messages.append("Invalid file name : " + name)
+            messages.append("Invalid file name : {}".format(name))
             return messages
 
         invalid_path = not re.match(r'[\w\d_ -/]+', path).group(0) == path
         if invalid_path:
-            messages.append("Invalid path : " + path)
+            messages.append("Invalid path : {}".format(path))
             return messages
         if action == 'upload':
             for f in files.getlist('ufile'):
@@ -132,14 +132,9 @@ def handle_form(self, form, files):
                     or not re.match('[\w\d_ -/.]+', f.name).group(0) == f.name
                 )
                 if file_name_invalid:
-                    messages.append("File name is not valid : " + f.name)
+                    messages.append("File name is not valid : {}".format(f.name))
                 elif f.size > self.maxfilesize*1024:
-                    messages.append(
-                        "File size exceeded "
-                        + str(self.maxfilesize)
-                        + " KB : "
-                        + f.name
-                    )
+                    messages.append("File size exceeded {} KB : {}".format(str(self.maxfilesize), f.name))
                 elif (
                         settings.FILEMANAGER_CHECK_SPACE and
                         (
@@ -147,39 +142,22 @@ def handle_form(self, form, files):
                             > self.maxspace*1024
                         )
                 ):
-                    messages.append(
-                        "Total Space size exceeded "
-                        + str(self.maxspace)
-                        + " KB : "
-                        + f.name
-                    )
+                    messages.append("Total Space size exceeded {} KB: {}".format(str(self.maxspace), f.name))
                 elif (
                         self.extensions
                         and len(f.name.split('.')) > 1
                         and f.name.split('.')[-1] not in self.extensions
                 ):
-                        messages.append(
-                            "File extension not allowed (."
-                            + f.name.split('.')[-1]
-                            + ") : "
-                            + f.name
-                        )
+                        messages.append("File extension not allowed (.{}) : {}".format(f.name.split('.)[-1], f.name))
                 elif (
                         self.extensions
                         and len(f.name.split('.')) == 1
                         and f.name.split('.')[-1]
                         not in self.extensions
                 ):
-                        messages.append(
-                            "No file extension in uploaded file : "
-                            + f.name
-                        )
+                        messages.append("No file extension in uploaded file: {}".format(f.name))
                 else:
-                    filepath = (
-                        self.basepath
-                        + path
-                        + self.rename_if_exists(self.basepath + path, f.name)
-                    )
+                    filepath = "{}{}{}".format(self.basepath, path, f.name")
                     with open(filepath, 'w') as dest:
                         for chunk in f.chunks():
                             dest.write(chunk)
@@ -193,9 +171,9 @@ def handle_form(self, form, files):
                 try:
                     os.chdir(self.basepath + path)
                     os.mkdir(name)
-                    messages.append('Folder created successfully : ' + name)
+                    messages.append('Folder created successfully : {}'.format(name))
                 except:
-                    messages.append('Folder couldn\'t be created : ' + name)
+                    messages.append('Folder couldn\'t be created : '.format(name))
             else:
                 messages.append(
                     'Folder couldn\' be created because maximum number of '
@@ -208,14 +186,9 @@ def handle_form(self, form, files):
             try:
                 os.chdir(self.basepath + path)
                 os.rename(oldname, name)
-                messages.append(
-                    'Folder renamed successfully from '
-                    + oldname
-                    + ' to '
-                    + name
-                )
+                messages.append('Folder renamed successfully from {} to {}'.format(oldname, name))
             except:
-                messages.append('Folder couldn\'t renamed to ' + name)
+                messages.append('Folder couldn\'t renamed to {}'.format(name))
         elif action == 'delete' and file_or_dir == 'dir':
             if path == '/':
                 messages.append('root folder can\'t be deleted')
@@ -225,9 +198,9 @@ def handle_form(self, form, files):
                 try:
                     os.chdir(self.basepath + path)
                     shutil.rmtree(name)
-                    messages.append('Folder deleted successfully : ' + name)
+                    messages.append('Folder deleted successfully : {}'.format(name))
                 except:
-                    messages.append('Folder couldn\'t deleted : ' + name)
+                    messages.append('Folder couldn\'t deleted : {}'.format(name))
         elif action == 'rename' and file_or_dir == 'file':
             oldname = path.split('/')[-1]
             old_ext = (
@@ -241,25 +214,14 @@ def handle_form(self, form, files):
                 try:
                     os.chdir(self.basepath + path)
                     os.rename(oldname, name)
-                    messages.append(
-                        'File renamed successfully from '
-                        + oldname
-                        + ' to '
-                        + name
-                    )
+                    messages.append('File renamed successfully from {} to {}'.format(oldname, name))
                 except:
-                    messages.append('File couldn\'t be renamed to ' + name)
+                    messages.append('File couldn\'t be renamed to {}'.format(name))
             else:
                 if old_ext:
-                    messages.append(
-                        'File extension should be same : .'
-                        + old_ext
-                    )
+                    messages.append('File extension should be same : .{}'.format(old_ext))
                 else:
-                    messages.append(
-                        'New file extension didn\'t match with old file'
-                        + ' extension'
-                    )
+                    messages.append('New file extension didn\'t match with old file extension')
         elif action == 'delete' and file_or_dir == 'file':
             if path == '/':
                 messages.append('root folder can\'t be deleted')
@@ -269,25 +231,18 @@ def handle_form(self, form, files):
                 try:
                     os.chdir(self.basepath + path)
                     os.remove(name)
-                    messages.append('File deleted successfully : ' + name)
+                    messages.append('File deleted successfully : {}'.format(name))
                 except:
-                    messages.append('File couldn\'t deleted : ' + name)
+                    messages.append('File couldn\'t deleted : {}'.format(name))
         elif action == 'move' or action == 'copy':
             # from path to current_path
             if self.current_path.find(path) == 0:
                 messages.append('Cannot move/copy to a child folder')
             else:
                 path = os.path.normpath(path)  # strip trailing slash if any
-                filename = (
-                    self.basepath
-                    + self.current_path
-                    + os.path.basename(path)
-                )
+                filename = ('{}{}{}'.format(self.basepath, self.current_path, os.pathname(path))
                 if os.path.exists(filename):
-                    messages.append(
-                        'ERROR: A file/folder with this name already exists in'
-                        + ' the destination folder.'
-                    )
+                    messages.append('ERROR: A file/folder with this name already exists in the destination folder.')
                 else:
                     if action == 'move':
                         method = shutil.move
@@ -299,9 +254,7 @@ def handle_form(self, form, files):
                     try:
                         method(self.basepath + path, filename)
                     except:
-                        messages.append(
-                            'File/folder couldn\'t be moved/copied.'
-                        )
+                        messages.append('File/folder couldn\'t be moved/copied.')
         return messages
 
     def directory_structure(self):
@@ -371,10 +324,7 @@ def media(self, path):
                 + '.png'
             )
             if not os.path.exists(imagepath):
-                imagepath = (
-                    settings.FILEMANAGER_STATIC_ROOT
-                    + 'images/icons/default.png'
-                )
+                imagepath = ('{}images/icons/default.png'.format(settings.FILEMANAGER_STATIC_ROOT))
             img = Image.open(imagepath)
             width, height = img.size
             mx = max([width, height])

From 0b687e91624eca8c1794080c572613a93d7e47ef Mon Sep 17 00:00:00 2001
From: Oscar Reyes <OscarEReyes@users.noreply.github.com>
Date: Sun, 22 Oct 2017 18:33:50 -0500
Subject: [PATCH 02/13] Changed " to '

---
 filemanager/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/filemanager/__init__.py b/filemanager/__init__.py
index 3019576..149b322 100644
--- a/filemanager/__init__.py
+++ b/filemanager/__init__.py
@@ -309,7 +309,7 @@ def media(self, path):
                 w = width*60/mx
                 h = height*60/mx
             img = img.resize((w, h), Image.ANTIALIAS)
-            response = HttpResponse(content_type=mimetype or "image/" + ext)
+            response = HttpResponse(content_type=mimetype or 'image/' + ext)
             response['Cache-Control'] = 'max-age=3600'
             img.save(
                 response,
@@ -333,7 +333,7 @@ def media(self, path):
                 w = width*60/mx
                 h = height*60/mx
             img = img.resize((w, h), Image.ANTIALIAS)
-            response = HttpResponse(content_type="image/png")
+            response = HttpResponse(content_type='image/png')
             response['Cache-Control'] = 'max-age:3600'
             img.save(response, 'png')
             return response

From 25665c66a972c30af233037bb65ed85ac6684d36 Mon Sep 17 00:00:00 2001
From: Oscar Reyes <OscarEReyes@users.noreply.github.com>
Date: Sun, 22 Oct 2017 18:36:32 -0500
Subject: [PATCH 03/13] Changed " to '

Left " for docstrings
---
 filemanager/widgets.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/filemanager/widgets.py b/filemanager/widgets.py
index 9f08282..a25624a 100644
--- a/filemanager/widgets.py
+++ b/filemanager/widgets.py
@@ -37,12 +37,12 @@ class Media:
 
     def render(self, name, value, attrs=None):
         rendered = super(CKEditorWidget, self).render(name, value, attrs)
-        div = "<div style='height:20px'></div>"
+        div = '<div style='height:20px'></div>'
         return rendered + mark_safe(
             div
-            + u"""<script type="text/javascript">
+            + u'''<script type='text/javascript'>
                     document.addEventListener('DOMContentLoaded', function() {
                       CKEDITOR.replace('%s',%s);
                     }, false);
-                  </script>""" % (attrs['id'], self.config)
+                  </script>''' % (attrs['id'], self.config)
         )

From 4d05492689bd02337108862388fefed07134d826 Mon Sep 17 00:00:00 2001
From: Oscar Reyes <OscarEReyes@users.noreply.github.com>
Date: Sun, 22 Oct 2017 18:38:51 -0500
Subject: [PATCH 04/13] Changed str concatenation to format()

---
 filemanager/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filemanager/settings.py b/filemanager/settings.py
index 24c55af..091336e 100644
--- a/filemanager/settings.py
+++ b/filemanager/settings.py
@@ -5,7 +5,7 @@
 FILEMANAGER_STATIC_ROOT = getattr(
     settings,
     'FILEMANAGER_STATIC_ROOT',
-    os.path.dirname(os.path.abspath(__file__)) + '/static/filemanager/',
+    os.path.dirname('{}/static/filemanager/'.format(os.path.abspath(__file__))), 
 )
 FILEMANAGER_CKEDITOR_JS = getattr(
     settings,

From d0600af66253be517b2b48e6d609850f73f24f07 Mon Sep 17 00:00:00 2001
From: Oscar Reyes <OscarEReyes@users.noreply.github.com>
Date: Mon, 23 Oct 2017 05:11:03 -0500
Subject: [PATCH 05/13] Fixed single quotes inside single quotes.

---
 filemanager/widgets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filemanager/widgets.py b/filemanager/widgets.py
index a25624a..a89ebd6 100644
--- a/filemanager/widgets.py
+++ b/filemanager/widgets.py
@@ -37,7 +37,7 @@ class Media:
 
     def render(self, name, value, attrs=None):
         rendered = super(CKEditorWidget, self).render(name, value, attrs)
-        div = '<div style='height:20px'></div>'
+        div = "<div style='height:20px'></div>"
         return rendered + mark_safe(
             div
             + u'''<script type='text/javascript'>

From ae2ec48ee3dc9986da0e2368a8f850093f2e78a6 Mon Sep 17 00:00:00 2001
From: Oscar Reyes <OscarEReyes@users.noreply.github.com>
Date: Mon, 23 Oct 2017 05:20:24 -0500
Subject: [PATCH 06/13] Deleted extra quotation mark

---
 filemanager/__init__.py | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/filemanager/__init__.py b/filemanager/__init__.py
index 149b322..712de29 100644
--- a/filemanager/__init__.py
+++ b/filemanager/__init__.py
@@ -66,17 +66,17 @@ def rename_if_exists(self, folder, file):
             if file.find('.') == -1:
                 # no extension
                 for i in range(1000):
-                    if not os.path.exists("{}{}.{}".format(folder, file, str(i)):
+                    if not os.path.exists('{}{}.{}'.format(folder, file, str(i)):
                         break
                 return "{}.{}".format(file, str(i)  
             else:
                 extension = file[file.rfind('.'):]
                 name = file[:file.rfind('.')]
                 for i in range(1000):
-                    full_path = "{}{}.{}{}".format(folder, name, str(i), extension)
+                    full_path = '{}{}.{}{}'.format(folder, name, str(i), extension)
                     if not os.path.exists(full_path):
                         break
-                return "{}.{}{}".format(name, str(i), extension)
+                return '{}.{}{}'.format(name, str(i), extension)
         else:
             return file
 
@@ -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 : {}".format(name))
+            messages.append('Invalid folder name : {}'.format(name))
             return messages
 
         invalid_file_name = (
@@ -118,12 +118,12 @@ def handle_form(self, form, files):
             )
         )
         if invalid_file_name:
-            messages.append("Invalid file name : {}".format(name))
+            messages.append('Invalid file name : {}'.format(name))
             return messages
 
         invalid_path = not re.match(r'[\w\d_ -/]+', path).group(0) == path
         if invalid_path:
-            messages.append("Invalid path : {}".format(path))
+            messages.append('Invalid path : {}'.format(path))
             return messages
         if action == 'upload':
             for f in files.getlist('ufile'):
@@ -132,9 +132,9 @@ def handle_form(self, form, files):
                     or not re.match('[\w\d_ -/.]+', f.name).group(0) == f.name
                 )
                 if file_name_invalid:
-                    messages.append("File name is not valid : {}".format(f.name))
+                    messages.append('File name is not valid : {}'.format(f.name))
                 elif f.size > self.maxfilesize*1024:
-                    messages.append("File size exceeded {} KB : {}".format(str(self.maxfilesize), f.name))
+                    messages.append('File size exceeded {} KB : {}'.format(str(self.maxfilesize), f.name))
                 elif (
                         settings.FILEMANAGER_CHECK_SPACE and
                         (
@@ -142,22 +142,22 @@ def handle_form(self, form, files):
                             > self.maxspace*1024
                         )
                 ):
-                    messages.append("Total Space size exceeded {} KB: {}".format(str(self.maxspace), f.name))
+                    messages.append('Total Space size exceeded {} KB: {}'.format(str(self.maxspace), f.name))
                 elif (
                         self.extensions
                         and len(f.name.split('.')) > 1
                         and f.name.split('.')[-1] not in self.extensions
                 ):
-                        messages.append("File extension not allowed (.{}) : {}".format(f.name.split('.)[-1], f.name))
+                        messages.append('File extension not allowed (.{}) : {}'.format(f.name.split('.)[-1], f.name))
                 elif (
                         self.extensions
                         and len(f.name.split('.')) == 1
                         and f.name.split('.')[-1]
                         not in self.extensions
                 ):
-                        messages.append("No file extension in uploaded file: {}".format(f.name))
+                        messages.append('No file extension in uploaded file: {}'.format(f.name))
                 else:
-                    filepath = "{}{}{}".format(self.basepath, path, f.name")
+                    filepath = '{}{}{}'.format(self.basepath, path, f.name)
                     with open(filepath, 'w') as dest:
                         for chunk in f.chunks():
                             dest.write(chunk)
@@ -317,14 +317,10 @@ def media(self, path):
             )
             return response
         except Exception:
-            imagepath = (
-                settings.FILEMANAGER_STATIC_ROOT
-                + 'images/icons/'
-                + ext
-                + '.png'
-            )
+            imagepath = '{}images/icon/{}.png'.format(settings.FILEMANAGER_STATIC_ROOT, ext)
+
             if not os.path.exists(imagepath):
-                imagepath = ('{}images/icons/default.png'.format(settings.FILEMANAGER_STATIC_ROOT))
+                imagepath = '{}images/icons/default.png'.format(settings.FILEMANAGER_STATIC_ROOT)
             img = Image.open(imagepath)
             width, height = img.size
             mx = max([width, height])

From 0ef535d465689882410d7919a0dfd2a2545958cf Mon Sep 17 00:00:00 2001
From: Oscar Reyes <OscarEReyes@users.noreply.github.com>
Date: Mon, 23 Oct 2017 05:21:46 -0500
Subject: [PATCH 07/13] Changed one concatenation to format()

---
 filemanager/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filemanager/__init__.py b/filemanager/__init__.py
index 712de29..dab2e94 100644
--- a/filemanager/__init__.py
+++ b/filemanager/__init__.py
@@ -309,7 +309,7 @@ def media(self, path):
                 w = width*60/mx
                 h = height*60/mx
             img = img.resize((w, h), Image.ANTIALIAS)
-            response = HttpResponse(content_type=mimetype or 'image/' + ext)
+            response = HttpResponse(content_type=mimetype or 'image/{}'.format(ext))
             response['Cache-Control'] = 'max-age=3600'
             img.save(
                 response,

From 384a2d7f2df6b1ddcb6fe41ede1a9cc07e8aaef1 Mon Sep 17 00:00:00 2001
From: Oscar Reyes <o.scar_r@yahoo.com.mx>
Date: Mon, 23 Oct 2017 05:43:29 -0500
Subject: [PATCH 08/13] Fixed errors from missing parentheses

---
 .idea/django-filemanager.iml | 29 +++++++++++++++++++++++++++++
 .idea/modules.xml            |  8 ++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 .idea/django-filemanager.iml
 create mode 100644 .idea/modules.xml

diff --git a/.idea/django-filemanager.iml b/.idea/django-filemanager.iml
new file mode 100644
index 0000000..03e9b1c
--- /dev/null
+++ b/.idea/django-filemanager.iml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="django" name="Django">
+      <configuration>
+        <option name="rootFolder" value="$MODULE_DIR$/tests" />
+        <option name="settingsModule" value="settings.py" />
+        <option name="manageScript" value="manage.py" />
+        <option name="environment" value="&lt;map/&gt;" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/filemanager/templates" />
+      </list>
+    </option>
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..39a2847
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/django-filemanager.iml" filepath="$PROJECT_DIR$/.idea/django-filemanager.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

From 752a925bbdca3f156294deca0d62a4876673ef1e Mon Sep 17 00:00:00 2001
From: Oscar Reyes <o.scar_r@yahoo.com.mx>
Date: Mon, 23 Oct 2017 05:48:59 -0500
Subject: [PATCH 09/13] Fixed missing parentheses

---
 filemanager/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/filemanager/__init__.py b/filemanager/__init__.py
index dab2e94..b1c252b 100644
--- a/filemanager/__init__.py
+++ b/filemanager/__init__.py
@@ -66,9 +66,9 @@ def rename_if_exists(self, folder, file):
             if file.find('.') == -1:
                 # no extension
                 for i in range(1000):
-                    if not os.path.exists('{}{}.{}'.format(folder, file, str(i)):
+                    if not os.path.exists('{}{}.{}'.format(folder, file, str(i))):
                         break
-                return "{}.{}".format(file, str(i)  
+                return "{}.{}".format(file, str(i) )
             else:
                 extension = file[file.rfind('.'):]
                 name = file[:file.rfind('.')]
@@ -148,7 +148,7 @@ def handle_form(self, form, files):
                         and len(f.name.split('.')) > 1
                         and f.name.split('.')[-1] not in self.extensions
                 ):
-                        messages.append('File extension not allowed (.{}) : {}'.format(f.name.split('.)[-1], f.name))
+                        messages.append('File extension not allowed (.{}) : {}'.format(f.name.split('.')[-1], f.name))
                 elif (
                         self.extensions
                         and len(f.name.split('.')) == 1

From eace8c609716ddcff89255c591cda1d1dd675d4c Mon Sep 17 00:00:00 2001
From: Oscar Reyes <OscarEReyes@users.noreply.github.com>
Date: Mon, 23 Oct 2017 05:52:00 -0500
Subject: [PATCH 10/13] Delete django-filemanager.iml

---
 .idea/django-filemanager.iml | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 .idea/django-filemanager.iml

diff --git a/.idea/django-filemanager.iml b/.idea/django-filemanager.iml
deleted file mode 100644
index 03e9b1c..0000000
--- a/.idea/django-filemanager.iml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="django" name="Django">
-      <configuration>
-        <option name="rootFolder" value="$MODULE_DIR$/tests" />
-        <option name="settingsModule" value="settings.py" />
-        <option name="manageScript" value="manage.py" />
-        <option name="environment" value="&lt;map/&gt;" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="TemplatesService">
-    <option name="TEMPLATE_CONFIGURATION" value="Django" />
-    <option name="TEMPLATE_FOLDERS">
-      <list>
-        <option value="$MODULE_DIR$/filemanager/templates" />
-      </list>
-    </option>
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
-</module>
\ No newline at end of file

From 0ce17061f26f197915eb6d26ce1500dfc2185680 Mon Sep 17 00:00:00 2001
From: Oscar Reyes <OscarEReyes@users.noreply.github.com>
Date: Mon, 23 Oct 2017 05:52:08 -0500
Subject: [PATCH 11/13] Delete modules.xml

---
 .idea/modules.xml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 .idea/modules.xml

diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 39a2847..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/django-filemanager.iml" filepath="$PROJECT_DIR$/.idea/django-filemanager.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

From a3c43ff31d0ea7186eb9205cdcd381f12fd4322f Mon Sep 17 00:00:00 2001
From: Oscar Reyes <o.scar_r@yahoo.com.mx>
Date: Mon, 23 Oct 2017 06:03:09 -0500
Subject: [PATCH 12/13] Fixed lines over 110 characters and missing parentheses

---
 filemanager/__init__.py | 10 ++++++----
 filemanager/settings.py |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/filemanager/__init__.py b/filemanager/__init__.py
index b1c252b..ff6af29 100644
--- a/filemanager/__init__.py
+++ b/filemanager/__init__.py
@@ -68,7 +68,7 @@ def rename_if_exists(self, folder, file):
                 for i in range(1000):
                     if not os.path.exists('{}{}.{}'.format(folder, file, str(i))):
                         break
-                return "{}.{}".format(file, str(i) )
+                return "{}.{}".format(file, str(i))
             else:
                 extension = file[file.rfind('.'):]
                 name = file[:file.rfind('.')]
@@ -148,7 +148,8 @@ def handle_form(self, form, files):
                         and len(f.name.split('.')) > 1
                         and f.name.split('.')[-1] not in self.extensions
                 ):
-                        messages.append('File extension not allowed (.{}) : {}'.format(f.name.split('.')[-1], f.name))
+                        name_split = f.name.split('.')[-1]
+                        messages.append('File extension not allowed (.{}) : {}'.format(name_split, f.name))
                 elif (
                         self.extensions
                         and len(f.name.split('.')) == 1
@@ -240,9 +241,10 @@ def handle_form(self, form, files):
                 messages.append('Cannot move/copy to a child folder')
             else:
                 path = os.path.normpath(path)  # strip trailing slash if any
-                filename = ('{}{}{}'.format(self.basepath, self.current_path, os.pathname(path))
+                filename = ('{}{}{}'.format(self.basepath, self.current_path, os.pathname(path)))
                 if os.path.exists(filename):
-                    messages.append('ERROR: A file/folder with this name already exists in the destination folder.')
+                    file_exists_error = 'A file/folder with this name already exists in the destination folder.'
+                    messages.append('ERROR: {}'.format(file_exists_error))
                 else:
                     if action == 'move':
                         method = shutil.move
diff --git a/filemanager/settings.py b/filemanager/settings.py
index 091336e..0a446ad 100644
--- a/filemanager/settings.py
+++ b/filemanager/settings.py
@@ -5,7 +5,7 @@
 FILEMANAGER_STATIC_ROOT = getattr(
     settings,
     'FILEMANAGER_STATIC_ROOT',
-    os.path.dirname('{}/static/filemanager/'.format(os.path.abspath(__file__))), 
+    os.path.dirname('{}/static/filemanager/'.format(os.path.abspath(__file__))),
 )
 FILEMANAGER_CKEDITOR_JS = getattr(
     settings,

From 418c649630223f9698e208c28b617b7bd4223907 Mon Sep 17 00:00:00 2001
From: Oscar Reyes <o.scar_r@yahoo.com.mx>
Date: Mon, 23 Oct 2017 06:12:31 -0500
Subject: [PATCH 13/13] Fixed line too long

---
 filemanager/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/filemanager/__init__.py b/filemanager/__init__.py
index ff6af29..aa7257b 100644
--- a/filemanager/__init__.py
+++ b/filemanager/__init__.py
@@ -243,8 +243,8 @@ def handle_form(self, form, files):
                 path = os.path.normpath(path)  # strip trailing slash if any
                 filename = ('{}{}{}'.format(self.basepath, self.current_path, os.pathname(path)))
                 if os.path.exists(filename):
-                    file_exists_error = 'A file/folder with this name already exists in the destination folder.'
-                    messages.append('ERROR: {}'.format(file_exists_error))
+                    fe_error = 'A file/folder with this name already exists in the destination folder.'
+                    messages.append('ERROR: {}'.format(fe_error))
                 else:
                     if action == 'move':
                         method = shutil.move