Replace deprecated direct_to_template() with render() shortcut

Now that Django actually provides a concise way to use a RequestContext
object without instantiating it, we can use that rather than the old
function-based generic view that worked well to do the same.
Additionally, these function-based generic views will be gone in Django
1.5, so might as well make the move now.

Signed-off-by: Dan McGee <dan@archlinux.org>

4 files changed, 17 insertions, 24 deletions

diff --git a/packages/views/__init__.py b/packages/views/__init__.py
index fa67daa..19ea910 100644
--- a/packages/views/__init__.py
+++ b/packages/views/__init__.py
@@ -6,10 +6,9 @@ from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.http import HttpResponse
-from django.shortcuts import redirect
+from django.shortcuts import redirect, render
 from django.views.decorators.cache import cache_control
 from django.views.decorators.http import require_GET, require_POST
-from django.views.generic.simple import direct_to_template
 
 from main.models import Package, Arch
 from ..models import PackageRelation
@@ -32,9 +31,9 @@ def opensearch(request):
     else:
         domain = "http://%s" % request.META['HTTP_HOST']
 
-    return direct_to_template(request, 'packages/opensearch.xml',
+    return render(request, 'packages/opensearch.xml',
             {'domain': domain},
-            mimetype='application/opensearchdescription+xml')
+            content_type='application/opensearchdescription+xml')
 
 
 @require_GET
@@ -115,7 +114,7 @@ def arch_differences(request):
             'differences': differences,
             'multilib_differences': multilib_diffs
     }
-    return direct_to_template(request, 'packages/differences.html', context)
+    return render(request, 'packages/differences.html', context)
 
 @permission_required('main.change_package')
 def stale_relations(request):
@@ -132,7 +131,7 @@ def stale_relations(request):
             'missing_pkgbase': missing_pkgbase,
             'wrong_permissions': wrong_permissions,
     }
-    return direct_to_template(request, 'packages/stale_relations.html', context)
+    return render(request, 'packages/stale_relations.html', context)
 
 @permission_required('packages.delete_packagerelation')
 @require_POST
diff --git a/packages/views/display.py b/packages/views/display.py
index 31f18c7..585e0e4 100644
--- a/packages/views/display.py
+++ b/packages/views/display.py
@@ -6,7 +6,6 @@ from urllib import urlencode
 from django.http import HttpResponse, Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils.timezone import now
-from django.views.generic.simple import direct_to_template
 
 from main.models import Package, PackageFile, Arch, Repo
 from mirrors.utils import get_mirror_url_for_download
@@ -33,8 +32,7 @@ def split_package_details(request, name, repo, arch):
         'arch': arch,
         'packages': pkgs,
     }
-    return direct_to_template(request, 'packages/packages_list.html',
-            context)
+    return render(request, 'packages/packages_list.html', context)
 
 
 CUTOFF = datetime.timedelta(days=60)
@@ -67,8 +65,7 @@ def details(request, name='', repo='', arch=''):
             pkg = Package.objects.select_related(
                     'arch', 'repo', 'packager').get(pkgname=name,
                     repo__name__iexact=repo, arch__name=arch)
-            return direct_to_template(request, 'packages/details.html',
-                    {'pkg': pkg, })
+            return render(request, 'packages/details.html', {'pkg': pkg})
         except Package.DoesNotExist:
             arch_obj = get_object_or_404(Arch, name=arch)
             # for arch='any' packages, we can issue a redirect to them if we
@@ -111,7 +108,7 @@ def groups(request, arch=None):
         'groups': grps,
         'arch': arch,
     }
-    return direct_to_template(request, 'packages/groups.html', context)
+    return render(request, 'packages/groups.html', context)
 
 
 def group_details(request, arch, name):
@@ -128,7 +125,7 @@ def group_details(request, arch, name):
         'arch': arch,
         'packages': pkgs,
     }
-    return direct_to_template(request, 'packages/packages_list.html', context)
+    return render(request, 'packages/packages_list.html', context)
 
 
 def files(request, name, repo, arch):
@@ -153,7 +150,7 @@ def files(request, name, repo, arch):
         'dir_count': dir_count,
     }
     template = 'packages/files.html'
-    return direct_to_template(request, template, context)
+    return render(request, template, context)
 
 
 def details_json(request, name, repo, arch):
diff --git a/packages/views/flag.py b/packages/views/flag.py
index f3db93b..b9542a6 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -3,10 +3,9 @@ from django.conf import settings
 from django.contrib.auth.decorators import permission_required
 from django.core.mail import send_mail
 from django.db import transaction
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import get_object_or_404, redirect, render
 from django.template import loader, Context
 from django.utils.timezone import now
-from django.views.generic.simple import direct_to_template
 from django.views.decorators.cache import cache_page, never_cache
 
 from ..models import FlagRequest
@@ -34,7 +33,7 @@ class FlagForm(forms.Form):
 
 @cache_page(3600)
 def flaghelp(request):
-    return direct_to_template(request, 'packages/flaghelp.html')
+    return render(request, 'packages/flaghelp.html')
 
 
 @never_cache
@@ -43,8 +42,7 @@ def flag(request, name, repo, arch):
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     if pkg.flag_date is not None:
         # already flagged. do nothing.
-        return direct_to_template(request, 'packages/flagged.html',
-                {'pkg': pkg})
+        return render(request, 'packages/flagged.html', {'pkg': pkg})
     # find all packages from (hopefully) the same PKGBUILD
     pkgs = Package.objects.normal().filter(
             pkgbase=pkg.pkgbase, flag_date__isnull=True,
@@ -129,7 +127,7 @@ def flag(request, name, repo, arch):
         'packages': pkgs,
         'form': form
     }
-    return direct_to_template(request, 'packages/flag.html', context)
+    return render(request, 'packages/flag.html', context)
 
 def flag_confirmed(request, name, repo, arch):
     pkg = get_object_or_404(Package,
@@ -142,7 +140,7 @@ def flag_confirmed(request, name, repo, arch):
 
     context = {'package': pkg, 'packages': pkgs}
 
-    return direct_to_template(request, 'packages/flag_confirmed.html', context)
+    return render(request, 'packages/flag_confirmed.html', context)
 
 @permission_required('main.change_package')
 def unflag(request, name, repo, arch):
diff --git a/packages/views/signoff.py b/packages/views/signoff.py
index 7aa3910..56eb060 100644
--- a/packages/views/signoff.py
+++ b/packages/views/signoff.py
@@ -10,7 +10,6 @@ from django.http import HttpResponse, Http404
 from django.shortcuts import get_list_or_404, redirect, render
 from django.utils.timezone import now
 from django.views.decorators.cache import never_cache
-from django.views.generic.simple import direct_to_template
 
 from main.models import Package, Arch, Repo
 from ..models import SignoffSpecification, Signoff
@@ -28,7 +27,7 @@ def signoffs(request):
         'arches': Arch.objects.all(),
         'repo_names': sorted(set(g.target_repo for g in signoff_groups)),
     }
-    return direct_to_template(request, 'packages/signoffs.html', context)
+    return render(request, 'packages/signoffs.html', context)
 
 @permission_required('main.change_package')
 @never_cache
@@ -144,7 +143,7 @@ def signoff_options(request, name, repo, arch):
         'package': package,
         'form': form,
     }
-    return direct_to_template(request, 'packages/signoff_options.html', context)
+    return render(request, 'packages/signoff_options.html', context)
 
 class SignoffJSONEncoder(DjangoJSONEncoder):
     '''Base JSONEncoder extended to handle all serialization of all classes