From f5df3d4cd25c8b9581ca8ef2e2bdd623fade2643 Mon Sep 17 00:00:00 2001
From: Slava <slava.deb@gmail.com>
Date: Thu, 6 Oct 2016 12:49:47 +0300
Subject: [PATCH] Mandatory django version >= 1.8

---
 .gitignore                                    |   3 +-
 README.md                                     |   3 +
 .../filebrowser/include/toolbar.html          |   2 +-
 filebrowser/urls.py                           |  28 +-
 filebrowser/views.py                          | 278 +++++++++++-------
 setup.py                                      |   4 +-
 6 files changed, 194 insertions(+), 124 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92931da..0762cf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@ builddocs.zip
 build/
 dist/
 django_media_manager.egg-info
-example/example/local_settings.py
\ No newline at end of file
+example/example/local_settings.py
+.DS_Store
diff --git a/README.md b/README.md
index fe56c69..103bd32 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,9 @@ At the moment i'm without time to maintain this great project. To all the people
 
 # Changelog
 
+### 06-10-2016 v3.4.1
+*   Mandatory django version >= 1.8
+
 ### 25-08-2014 v3.4.0
 *   Uses Pillow now.
 *   Python 3 only now.
diff --git a/filebrowser/templates/filebrowser/include/toolbar.html b/filebrowser/templates/filebrowser/include/toolbar.html
index 1fa4864..6c4d1d6 100755
--- a/filebrowser/templates/filebrowser/include/toolbar.html
+++ b/filebrowser/templates/filebrowser/include/toolbar.html
@@ -3,7 +3,7 @@
 <div id="toolbar">
   <form id="changelist-search" action="." method="get">
     <div><!-- DIV needed for valid HTML -->
-      <label for="searchbar"><img alt="Search" src="{{ STATIC_URL }}filebrowser/img/icon-searchbox.png"></label>
+      <label for="searchbar"><img alt="Search" src="{{ settings_var.URL_FILEBROWSER_MEDIA }}img/icon-searchbox.png"></label>
       <input type="text" name="q" value="{{ query.q }}" id="searchbar" />
       {% if query.filter_type %}<input type="hidden" name="filter_type" value="{{ query.filter_type }}" />{% endif %}
       {% if query.filter_date %}<input type="hidden" name="filter_date" value="{{ query.filter_date }}" />{% endif %}
diff --git a/filebrowser/urls.py b/filebrowser/urls.py
index 709410d..813dfa5 100755
--- a/filebrowser/urls.py
+++ b/filebrowser/urls.py
@@ -1,16 +1,16 @@
-from django.conf.urls import *
+from django.conf.urls import url
 
-urlpatterns = patterns('',
-    
+from filebrowser import views
+
+urlpatterns = [
     # filebrowser urls
-    url(r'^browse/$', 'filebrowser.views.browse', name="fb_browse"),
-    url(r'^mkdir/', 'filebrowser.views.mkdir', name="fb_mkdir"),
-    url(r'^upload/', 'filebrowser.views.upload', name="fb_upload"),
-    url(r'^rename/$', 'filebrowser.views.rename', name="fb_rename"),
-    url(r'^delete/$', 'filebrowser.views.delete', name="fb_delete"),
-    url(r'^versions/$', 'filebrowser.views.versions', name="fb_versions"),
-    
-    url(r'^check_file/$', 'filebrowser.views._check_file', name="fb_check"),
-    url(r'^upload_file/$', 'filebrowser.views._upload_file', name="fb_do_upload"),
-    
-)
+    url(r'^browse/$', views.browse, name="fb_browse"),
+    url(r'^mkdir/', views.mkdir, name="fb_mkdir"),
+    url(r'^upload/', views.upload, name="fb_upload"),
+    url(r'^rename/$', views.rename, name="fb_rename"),
+    url(r'^delete/$', views.delete, name="fb_delete"),
+    url(r'^versions/$', views.versions, name="fb_versions"),
+
+    url(r'^check_file/$', views._check_file, name="fb_check"),
+    url(r'^upload_file/$', views._upload_file, name="fb_do_upload"),
+]
diff --git a/filebrowser/views.py b/filebrowser/views.py
index 9355691..5192c6c 100755
--- a/filebrowser/views.py
+++ b/filebrowser/views.py
@@ -5,7 +5,7 @@
 from time import gmtime, strftime
 
 # django imports
-from django.shortcuts import render_to_response, HttpResponse
+from django.shortcuts import render, HttpResponse
 from django.template import RequestContext as Context
 from django.http import HttpResponseRedirect, Http404
 from django.contrib.admin.views.decorators import staff_member_required
@@ -18,20 +18,16 @@
 from django.dispatch import Signal
 from django.core.paginator import Paginator, InvalidPage, EmptyPage
 from django.utils.encoding import smart_str
-
-try:
-    # django SVN
-    from django.views.decorators.csrf import csrf_exempt
-except:
-    # django 1.1
-    from django.contrib.csrf.middleware import csrf_exempt
+from django.views.decorators.csrf import csrf_exempt
 
 from django.contrib import messages
 
 # filebrowser imports
 from filebrowser.settings import *
 from filebrowser.conf import fb_settings
-from filebrowser.functions import path_to_url, sort_by_attr, get_path, get_file, get_version_path, get_breadcrumbs, get_filterdate, get_settings_var, handle_file_upload, convert_filename
+from filebrowser.functions import path_to_url, sort_by_attr, get_path, \
+    get_file, get_version_path, get_breadcrumbs, get_filterdate, \
+    get_settings_var, handle_file_upload, convert_filename
 from filebrowser.templatetags.fb_tags import query_helper
 from filebrowser.base import FileObject
 from filebrowser.decorators import flash_login_required
@@ -39,11 +35,12 @@
 # Precompile regular expressions
 filter_re = []
 for exp in EXCLUDE:
-   filter_re.append(re.compile(exp))
-for k,v in VERSIONS.items():
+    filter_re.append(re.compile(exp))
+for k, v in VERSIONS.items():
     exp = (r'_{0}.({1})').format(k, '|'.join(EXTENSION_LIST))
     filter_re.append(re.compile(exp))
 
+
 def _check_access(request, *path):
     """
     Return absolute file path if access allow or raise exception.
@@ -56,6 +53,7 @@ def _check_access(request, *path):
         raise Http404
     return abs_path
 
+
 def _template():
     if fb_settings.SUIT_TEMPLATE:
         path = 'suit/'
@@ -64,6 +62,7 @@ def _template():
 
     return path
 
+
 def browse(request):
     """
     Browse Files/Directories.
@@ -83,23 +82,25 @@ def browse(request):
 
     if path is None:
         msg = _('The requested Folder does not exist.')
-        messages.warning(request,message=msg)
+        messages.warning(request, message=msg)
         if directory is None:
             # The DIRECTORY does not exist, raise an error to prevent eternal redirecting.
-            raise ImproperlyConfigured(_("Error finding Upload-Folder. Maybe it does not exist?"))
+            raise ImproperlyConfigured(
+                _("Error finding Upload-Folder. Maybe it does not exist?"))
         redirect_url = reverse("fb_browse") + query_helper(query, "", "dir")
         return HttpResponseRedirect(redirect_url)
-    
+
     # INITIAL VARIABLES
-    results_var = {'results_total': 0, 'results_current': 0, 'delete_total': 0, 'images_total': 0, 'select_total': 0 }
+    results_var = {'results_total': 0, 'results_current': 0, 'delete_total': 0,
+                   'images_total': 0, 'select_total': 0}
     counter = {}
-    for k,v in EXTENSIONS.items():
+    for k, v in EXTENSIONS.items():
         counter[k] = 0
-    
+
     dir_list = os.listdir(abs_path)
     files = []
     for file in dir_list:
-        
+
         # EXCLUDE FILES MATCHING VERSIONS_PREFIX OR ANY OF THE EXCLUDE PATTERNS
         filtered = file.startswith('.')
         for re_prefix in filter_re:
@@ -108,17 +109,21 @@ def browse(request):
         if filtered:
             continue
         results_var['results_total'] += 1
-        
+
         # CREATE FILEOBJECT
-        fileobject = FileObject(os.path.join(fb_settings.DIRECTORY, path, file))
-        
+        fileobject = FileObject(
+            os.path.join(fb_settings.DIRECTORY, path, file))
+
         # FILTER / SEARCH
         append = False
-        if fileobject.filetype == request.GET.get('filter_type', fileobject.filetype) and get_filterdate(request.GET.get('filter_date', ''), fileobject.date):
+        if fileobject.filetype == request.GET.get('filter_type',
+                                                  fileobject.filetype) and get_filterdate(
+                request.GET.get('filter_date', ''), fileobject.date):
             append = True
-        if request.GET.get('q') and not re.compile(request.GET.get('q').lower(), re.M).search(file.lower()):
+        if request.GET.get('q') and not re.compile(
+                request.GET.get('q').lower(), re.M).search(file.lower()):
             append = False
-        
+
         # APPEND FILE_LIST
         if append:
             _type = query.get('type')
@@ -130,7 +135,8 @@ def browse(request):
                     results_var['delete_total'] += 1
                 elif fileobject.filetype == 'Folder' and fileobject.is_empty:
                     results_var['delete_total'] += 1
-                if _type and _type in SELECT_FORMATS and fileobject.filetype in SELECT_FORMATS[_type]:
+                if _type and _type in SELECT_FORMATS and fileobject.filetype in \
+                        SELECT_FORMATS[_type]:
                     results_var['select_total'] += 1
                 elif not _type:
                     results_var['select_total'] += 1
@@ -140,18 +146,20 @@ def browse(request):
             else:
                 files.append(fileobject)
                 results_var['results_current'] += 1
-        
+
         # COUNTER/RESULTS
         if fileobject.filetype:
             counter[fileobject.filetype] += 1
-    
+
     # SORTING
     query['o'] = request.GET.get('o', DEFAULT_SORTING_BY)
     query['ot'] = request.GET.get('ot', DEFAULT_SORTING_ORDER)
     files = sort_by_attr(files, request.GET.get('o', DEFAULT_SORTING_BY))
-    if not request.GET.get('ot') and DEFAULT_SORTING_ORDER == "desc" or request.GET.get('ot') == "desc":
+    if not request.GET.get(
+            'ot') and DEFAULT_SORTING_ORDER == "desc" or request.GET.get(
+            'ot') == "desc":
         files.reverse()
-    
+
     p = Paginator(files, LIST_PER_PAGE)
     try:
         page_nr = request.GET.get('p', '1')
@@ -161,8 +169,8 @@ def browse(request):
         page = p.page(page_nr)
     except (EmptyPage, InvalidPage):
         page = p.page(p.num_pages)
-    
-    return render_to_response(_template() + 'index.html', {
+
+    return render(request, _template() + 'index.html', {
         'dir': path,
         'p': p,
         'page': page,
@@ -174,21 +182,23 @@ def browse(request):
         'breadcrumbs': get_breadcrumbs(query, path),
         'breadcrumbs_title': "",
         'is_popup': is_popup
-    }, context_instance=Context(request))
-browse = staff_member_required(never_cache(browse))
+    })
 
 
+browse = staff_member_required(never_cache(browse))
+
 # mkdir signals
 filebrowser_pre_createdir = Signal(providing_args=["path", "dirname"])
 filebrowser_post_createdir = Signal(providing_args=["path", "dirname"])
 
+
 def mkdir(request):
     """
     Make Directory.
     """
-    
+
     from filebrowser.forms import MakeDirForm
-    
+
     # QUERY / PATH CHECK
     query = request.GET
     path = get_path(query.get('dir', ''))
@@ -200,10 +210,10 @@ def mkdir(request):
 
     if path is None:
         msg = _('The requested Folder does not exist.')
-        messages.warning(request,message=msg)
+        messages.warning(request, message=msg)
         return HttpResponseRedirect(reverse("fb_browse"))
     abs_path = _check_access(request, path)
-    
+
     if request.method == 'POST':
         form = MakeDirForm(abs_path, request.POST)
         if form.is_valid():
@@ -211,30 +221,37 @@ def mkdir(request):
             server_path = _check_access(request, path, _new_dir_name)
             try:
                 # PRE CREATE SIGNAL
-                filebrowser_pre_createdir.send(sender=request, path=path, dirname=_new_dir_name)
+                filebrowser_pre_createdir.send(sender=request, path=path,
+                                               dirname=_new_dir_name)
                 # CREATE FOLDER
                 print(server_path)
                 os.mkdir(server_path)
                 os.chmod(server_path, 0o775)
                 # POST CREATE SIGNAL
-                filebrowser_post_createdir.send(sender=request, path=path, dirname=_new_dir_name)
+                filebrowser_post_createdir.send(sender=request, path=path,
+                                                dirname=_new_dir_name)
                 # MESSAGE & REDIRECT
-                msg = _('The Folder {0} was successfully created.').format(_new_dir_name)
-                messages.success(request,message=msg)
+                msg = _('The Folder {0} was successfully created.').format(
+                    _new_dir_name)
+                messages.success(request, message=msg)
                 # on redirect, sort by date desc to see the new directory on top of the list
                 # remove filter in order to actually _see_ the new folder
                 # remove pagination
-                redirect_url = reverse("fb_browse") + query_helper(query, "ot=desc,o=date", "ot,o,filter_type,filter_date,q,p")
+                redirect_url = reverse("fb_browse") + query_helper(query,
+                                                                   "ot=desc,o=date",
+                                                                   "ot,o,filter_type,filter_date,q,p")
                 return HttpResponseRedirect(redirect_url)
             except OSError as e:
                 if e.errno == 13:
-                    form.errors['dir_name'] = forms.util.ErrorList([_('Permission denied.')])
+                    form.errors['dir_name'] = forms.util.ErrorList(
+                        [_('Permission denied.')])
                 else:
-                    form.errors['dir_name'] = forms.util.ErrorList([_('Error creating folder.')])
+                    form.errors['dir_name'] = forms.util.ErrorList(
+                        [_('Error creating folder.')])
     else:
         form = MakeDirForm(abs_path)
-    
-    return render_to_response(_template() + 'makedir.html', {
+
+    return render(request, _template() + 'makedir.html', {
         'form': form,
         'query': query,
         'title': _(u'New Folder'),
@@ -242,7 +259,9 @@ def mkdir(request):
         'breadcrumbs': get_breadcrumbs(query, path),
         'breadcrumbs_title': _(u'New Folder'),
         'is_popup': is_popup
-    }, context_instance=Context(request))
+    })
+
+
 mkdir = staff_member_required(never_cache(mkdir))
 
 
@@ -250,9 +269,9 @@ def upload(request):
     """
     Multipe File Upload.
     """
-    
+
     from django.http import parse_cookie
-    
+
     # QUERY / PATH CHECK
     query = request.GET
     path = get_path(query.get('dir', ''))
@@ -264,14 +283,14 @@ def upload(request):
 
     if path is None:
         msg = _('The requested Folder does not exist.')
-        messages.warning(request,message=msg)
+        messages.warning(request, message=msg)
         return HttpResponseRedirect(reverse("fb_browse"))
     abs_path = _check_access(request, path)
-    
+
     # SESSION (used for flash-uploading)
     session_key = request.COOKIES.get(settings.SESSION_COOKIE_NAME, None)
-    
-    return render_to_response(_template() + 'upload.html', {
+
+    return render(request, _template() + 'upload.html', {
         'query': query,
         'title': _(u'Select files to upload'),
         'settings_var': get_settings_var(),
@@ -279,7 +298,9 @@ def upload(request):
         'breadcrumbs': get_breadcrumbs(query, path),
         'breadcrumbs_title': _(u'Upload'),
         'is_popup': is_popup
-    }, context_instance=Context(request))
+    })
+
+
 upload = staff_member_required(never_cache(upload))
 
 
@@ -294,15 +315,16 @@ def _check_file(request):
     folder = request.POST.get('folder')
     fb_uploadurl_re = re.compile(r'^.*({0})'.format(reverse("fb_upload")))
     folder = fb_uploadurl_re.sub('', folder)
-    
+
     fileArray = {}
     if request.method == 'POST':
-        for k,v in request.POST.items():
+        for k, v in request.POST.items():
             if k != "folder":
                 v = convert_filename(v)
-                if os.path.isfile(smart_str(_check_access(request, folder, v))):
+                if os.path.isfile(
+                        smart_str(_check_access(request, folder, v))):
                     fileArray[k] = v
-    
+
     return HttpResponse(json.dumps(fileArray))
 
 
@@ -310,6 +332,7 @@ def _check_file(request):
 filebrowser_pre_upload = Signal(providing_args=["path", "file"])
 filebrowser_post_upload = Signal(providing_args=["path", "file"])
 
+
 @csrf_exempt
 @flash_login_required
 @staff_member_required
@@ -317,9 +340,9 @@ def _upload_file(request):
     """
     Upload file to the server.
     """
-    
+
     from django.core.files.move import file_move_safe
-    
+
     if request.method == 'POST':
         folder = request.POST.get('folder')
         fb_uploadurl_re = re.compile(r'^.*({0})'.format(reverse("fb_upload")))
@@ -330,17 +353,26 @@ def _upload_file(request):
             filedata.name = convert_filename(filedata.name)
             _check_access(request, abs_path, filedata.name)
             # PRE UPLOAD SIGNAL
-            filebrowser_pre_upload.send(sender=request, path=request.POST.get('folder'), file=filedata)
+            filebrowser_pre_upload.send(sender=request,
+                                        path=request.POST.get('folder'),
+                                        file=filedata)
             # HANDLE UPLOAD
             uploadedfile = handle_file_upload(abs_path, filedata)
             # MOVE UPLOADED FILE
             # if file already exists
-            if os.path.isfile(smart_str(os.path.join(fb_settings.MEDIA_ROOT, fb_settings.DIRECTORY, folder, filedata.name))):
+            if os.path.isfile(smart_str(
+                    os.path.join(fb_settings.MEDIA_ROOT, fb_settings.DIRECTORY,
+                                 folder, filedata.name))):
                 old_file = smart_str(os.path.join(abs_path, filedata.name))
                 new_file = smart_str(os.path.join(abs_path, uploadedfile))
                 file_move_safe(new_file, old_file)
             # POST UPLOAD SIGNAL
-            filebrowser_post_upload.send(sender=request, path=request.POST.get('folder'), file=FileObject(smart_str(os.path.join(fb_settings.DIRECTORY, folder, filedata.name))))
+            filebrowser_post_upload.send(sender=request,
+                                         path=request.POST.get('folder'),
+                                         file=FileObject(smart_str(
+                                             os.path.join(
+                                                 fb_settings.DIRECTORY, folder,
+                                                 filedata.name))))
     return HttpResponse('True')
 
 
@@ -348,13 +380,14 @@ def _upload_file(request):
 filebrowser_pre_delete = Signal(providing_args=["path", "filename"])
 filebrowser_post_delete = Signal(providing_args=["path", "filename"])
 
+
 def delete(request):
     """
     Delete existing File/Directory.
-    
+
     When trying to delete a Directory, the Directory has to be empty.
     """
-    
+
     # QUERY / PATH CHECK
     query = request.GET
     path = get_path(query.get('dir', ''))
@@ -364,33 +397,41 @@ def delete(request):
             msg = _('The requested Folder does not exist.')
         else:
             msg = _('The requested File does not exist.')
-        messages.warning(request,message=msg)
+        messages.warning(request, message=msg)
         return HttpResponseRedirect(reverse("fb_browse"))
     abs_path = _check_access(request, path)
-    
+
     msg = ""
     if request.GET:
         if request.GET.get('filetype') != "Folder":
-            relative_server_path = os.path.join(fb_settings.DIRECTORY, path, filename)
+            relative_server_path = os.path.join(fb_settings.DIRECTORY, path,
+                                                filename)
             try:
                 # PRE DELETE SIGNAL
-                filebrowser_pre_delete.send(sender=request, path=path, filename=filename)
+                filebrowser_pre_delete.send(sender=request, path=path,
+                                            filename=filename)
 
                 # DELETE FILE
                 os.unlink(smart_str(_check_access(request, path, filename)))
                 # DELETE IMAGE VERSIONS/THUMBNAILS
                 for version in VERSIONS:
                     try:
-                        os.unlink(os.path.join(fb_settings.MEDIA_ROOT, get_version_path(relative_server_path, version)))
+                        os.unlink(os.path.join(fb_settings.MEDIA_ROOT,
+                                               get_version_path(
+                                                   relative_server_path,
+                                                   version)))
                     except:
                         pass
 
                 # POST DELETE SIGNAL
-                filebrowser_post_delete.send(sender=request, path=path, filename=filename)
+                filebrowser_post_delete.send(sender=request, path=path,
+                                             filename=filename)
                 # MESSAGE & REDIRECT
-                msg = _('The file {0} was successfully deleted.').format(filename.lower())
-                messages.success(request,message=msg)
-                redirect_url = reverse("fb_browse") + query_helper(query, "", "filename,filetype")
+                msg = _('The file {0} was successfully deleted.').format(
+                    filename.lower())
+                messages.success(request, message=msg)
+                redirect_url = reverse("fb_browse") + query_helper(query, "",
+                                                                   "filename,filetype")
                 return HttpResponseRedirect(redirect_url)
             except OSError as e:
                 # todo: define error message
@@ -398,15 +439,19 @@ def delete(request):
         else:
             try:
                 # PRE DELETE SIGNAL
-                filebrowser_pre_delete.send(sender=request, path=path, filename=filename)
+                filebrowser_pre_delete.send(sender=request, path=path,
+                                            filename=filename)
                 # DELETE FOLDER
                 os.rmdir(_check_access(request, path, filename))
                 # POST DELETE SIGNAL
-                filebrowser_post_delete.send(sender=request, path=path, filename=filename)
+                filebrowser_post_delete.send(sender=request, path=path,
+                                             filename=filename)
                 # MESSAGE & REDIRECT
-                msg = _('The folder {0} was successfully deleted.').format(filename.lower())
-                messages.success(request,message=msg)
-                redirect_url = reverse("fb_browse") + query_helper(query, "", "filename,filetype")
+                msg = _('The folder {0} was successfully deleted.').format(
+                    filename.lower())
+                messages.success(request, message=msg)
+                redirect_url = reverse("fb_browse") + query_helper(query, "",
+                                                                   "filename,filetype")
                 return HttpResponseRedirect(redirect_url)
             except OSError as e:
                 # todo: define error message
@@ -415,24 +460,29 @@ def delete(request):
     if msg:
         messages.error(request, e)
 
-    redirect_url = reverse("fb_browse") + query_helper(query, "", "filename,filetype")
+    redirect_url = reverse("fb_browse") + query_helper(query, "",
+                                                       "filename,filetype")
     return HttpResponseRedirect(redirect_url)
-delete = staff_member_required(never_cache(delete))
 
 
+delete = staff_member_required(never_cache(delete))
+
 # rename signals
-filebrowser_pre_rename = Signal(providing_args=["path", "filename", "new_filename"])
-filebrowser_post_rename = Signal(providing_args=["path", "filename", "new_filename"])
+filebrowser_pre_rename = Signal(
+    providing_args=["path", "filename", "new_filename"])
+filebrowser_post_rename = Signal(
+    providing_args=["path", "filename", "new_filename"])
+
 
 def rename(request):
     """
     Rename existing File/Directory.
-    
+
     Includes renaming existing Image Versions/Thumbnails.
     """
-    
+
     from filebrowser.forms import RenameForm
-    
+
     # QUERY / PATH CHECK
     query = request.GET
     path = get_path(query.get('dir', ''))
@@ -448,42 +498,55 @@ def rename(request):
             msg = _('The requested Folder does not exist.')
         else:
             msg = _('The requested File does not exist.')
-        messages.warning(request,message=msg)
+        messages.warning(request, message=msg)
         return HttpResponseRedirect(reverse("fb_browse"))
     abs_path = _check_access(request, path)
     file_extension = os.path.splitext(filename)[1].lower()
-    
+
     if request.method == 'POST':
         form = RenameForm(abs_path, file_extension, request.POST)
         if form.is_valid():
-            relative_server_path = os.path.join(fb_settings.DIRECTORY, path, filename)
+            relative_server_path = os.path.join(fb_settings.DIRECTORY, path,
+                                                filename)
             new_filename = form.cleaned_data['name'] + file_extension
-            new_relative_server_path = os.path.join(fb_settings.DIRECTORY, path, new_filename)
+            new_relative_server_path = os.path.join(fb_settings.DIRECTORY,
+                                                    path, new_filename)
             try:
                 # PRE RENAME SIGNAL
-                filebrowser_pre_rename.send(sender=request, path=path, filename=filename, new_filename=new_filename)
+                filebrowser_pre_rename.send(sender=request, path=path,
+                                            filename=filename,
+                                            new_filename=new_filename)
                 # DELETE IMAGE VERSIONS/THUMBNAILS
                 # regenerating versions/thumbs will be done automatically
                 for version in VERSIONS:
                     try:
-                        os.unlink(os.path.join(fb_settings.MEDIA_ROOT, get_version_path(relative_server_path, version)))
+                        os.unlink(os.path.join(fb_settings.MEDIA_ROOT,
+                                               get_version_path(
+                                                   relative_server_path,
+                                                   version)))
                     except:
                         pass
                 # RENAME ORIGINAL
-                os.rename(os.path.join(fb_settings.MEDIA_ROOT, relative_server_path), os.path.join(fb_settings.MEDIA_ROOT, new_relative_server_path))
+                os.rename(
+                    os.path.join(fb_settings.MEDIA_ROOT, relative_server_path),
+                    os.path.join(fb_settings.MEDIA_ROOT,
+                                 new_relative_server_path))
                 # POST RENAME SIGNAL
-                filebrowser_post_rename.send(sender=request, path=path, filename=filename, new_filename=new_filename)
+                filebrowser_post_rename.send(sender=request, path=path,
+                                             filename=filename,
+                                             new_filename=new_filename)
                 # MESSAGE & REDIRECT
                 msg = _('Renaming was successful.')
-                messages.success(request,message=msg)
-                redirect_url = reverse("fb_browse") + query_helper(query, "", "filename")
+                messages.success(request, message=msg)
+                redirect_url = reverse("fb_browse") + query_helper(query, "",
+                                                                   "filename")
                 return HttpResponseRedirect(redirect_url)
             except OSError as e:
                 form.errors['name'] = forms.util.ErrorList([_('Error.')])
     else:
         form = RenameForm(abs_path, file_extension)
-    
-    return render_to_response(_template() + 'rename.html', {
+
+    return render(request, _template() + 'rename.html', {
         'form': form,
         'query': query,
         'file_extension': file_extension,
@@ -492,7 +555,9 @@ def rename(request):
         'breadcrumbs': get_breadcrumbs(query, path),
         'breadcrumbs_title': _(u'Rename'),
         'is_popup': is_popup
-    }, context_instance=Context(request))
+    })
+
+
 rename = staff_member_required(never_cache(rename))
 
 
@@ -500,7 +565,7 @@ def versions(request):
     """
     Show all Versions for an Image according to ADMIN_VERSIONS.
     """
-    
+
     # QUERY / PATH CHECK
     query = request.GET
     path = get_path(query.get('dir', ''))
@@ -516,19 +581,20 @@ def versions(request):
             msg = _('The requested Folder does not exist.')
         else:
             msg = _('The requested File does not exist.')
-        messages.warning(request,message=msg)
+        messages.warning(request, message=msg)
         return HttpResponseRedirect(reverse("fb_browse"))
     abs_path = _check_access(request, path)
-    
-    return render_to_response(_template() + 'versions.html', {
-        'original': path_to_url(os.path.join(fb_settings.DIRECTORY, path, filename)),
+
+    return render(request, _template() + 'versions.html', {
+        'original': path_to_url(
+            os.path.join(fb_settings.DIRECTORY, path, filename)),
         'query': query,
         'title': _(u'Versions for "{0}"').format(filename),
         'settings_var': get_settings_var(),
         'breadcrumbs': get_breadcrumbs(query, path),
         'breadcrumbs_title': _(u'Versions for "{0}"').format(filename),
         'is_popup': is_popup
-    }, context_instance=Context(request))
-versions = staff_member_required(never_cache(versions))
+    })
 
 
+versions = staff_member_required(never_cache(versions))
diff --git a/setup.py b/setup.py
index 812cd74..d47b550 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='django-media-manager',
-    version='3.4.0',
+    version='3.4.1',
     description='Media-Management with the Django Admin-Interface.',
     author=['Patrick Kranzlmueller','Six Foot'],
     author_email='dev@6ft.com',
@@ -20,7 +20,7 @@
         'Framework :: Django',
     ],
     install_requires = [
-        "Django>=1.5",
+        "Django>=1.8",
         "pillow",
     ],
 )