Use render instead of render_to_response

[htsworkflow.git] / inventory / views.py

diff --git a/inventory/views.py b/inventory/views.py
index 23b720017cf4b73b5cb60ccbc004f2ca3e784312..0dae606257638e4ae5a57242e6b0ba3f69c415c3 100644 (file)
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -4,7 +4,7 @@ from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import render_to_response
+from django.shortcuts import render
 from django.template import RequestContext, Template
 from django.template.loader import get_template
 
@@ -19,10 +19,7 @@ from bcmagic.utils import print_zpl_socket
 
 register_search_plugin('Inventory Item', item_search)
 
-try:
-    import json
-except ImportError as e:
-    import simplejson as json
+import json
 
 INVENTORY_CONTEXT_DEFAULTS = {
     'app_name': 'Inventory Tracker',
@@ -90,7 +87,7 @@ def getPrinterTemplateByType(item_type):
             printer_template = PrinterTemplate.objects.get(default=True)
         except ObjectDoesNotExist:
             msg = "No template for item type (%s) and no default template found" % (item_type.name)
-            raise ValueError, msg
+            raise ValueError(msg)
 
         return printer_template
 
@@ -154,9 +151,9 @@ def all_index(request):
     }
     context_dict.update(INVENTORY_CONTEXT_DEFAULTS)
 
-    return render_to_response('inventory/inventory_all_index.html',
-                              context_dict,
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'inventory/inventory_all_index.html',
+                  context_dict)
 
 @login_required
 def index(request):
@@ -176,9 +173,9 @@ def index(request):
         'page_name': 'Inventory Index'
     }
     context_dict.update(INVENTORY_CONTEXT_DEFAULTS)
-    return render_to_response('inventory/inventory_index.html',
-                              context_dict,
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'inventory/inventory_index.html',
+                  context_dict)
 
 @login_required
 def itemtype_index(request, name):
@@ -204,9 +201,9 @@ def itemtype_index(request, name):
     }
     context_dict.update(INVENTORY_CONTEXT_DEFAULTS)
 
-    return render_to_response('inventory/inventory_itemtype_index.html',
-                              context_dict,
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'inventory/inventory_itemtype_index.html',
+                  context_dict)
 
 
 @login_required
@@ -242,13 +239,9 @@ def item_summary_by_uuid(request, uuid, msg='', item=None):
     }
     context_dict.update(INVENTORY_CONTEXT_DEFAULTS)
 
-    return render_to_response('inventory/inventory_summary.html',
-                              context_dict,
-                              context_instance=RequestContext(request))
-
-
-
-
+    return render(request,
+                  'inventory/inventory_summary.html',
+                  context_dict)
 
 
 def __expand_context(context, item):
@@ -334,7 +327,7 @@ def link_flowcell_and_device(request, flowcell, serial):
     lts = None
     if count > 1:
         msg = "There really should only be one longtermstorage object per flowcell"
-        raise ValueError, msg
+        raise ValueError(msg)
     elif count == 1:
         # lts already attached to flowcell
         lts = fc.longtermstorage_set.all()[0]