Update tests and render()

Author: KasperBrandt

gcm/admin.py

@@ -1,6 +1,6 @@
 from functools import update_wrapper
 from django.contrib import admin
-from django.shortcuts import redirect, render_to_response
+from django.shortcuts import redirect, render
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
@@ -53,8 +53,7 @@ def send_message_view(self, request):
             return redirect(base_view)
 
         context = {'form': form, 'opts': self.model._meta, 'add': False}
-        return render_to_response('gcm/admin/send_message.html', context,
-                                  context_instance=RequestContext(request))
+        return render(request, 'gcm/admin/send_message.html', context)
 
     def send_message_action(self, request, queryset):
         ids = queryset.values_list('id', flat=True)

gcm/management/commands/gcm_messenger.py

@@ -29,19 +29,19 @@ def add_arguments(self, parser):
 
     def handle(self, *args, **options):
 
-        if options['devices']:
+        if options.get('devices', False):
             devices = Device.objects.filter(is_active=True)
 
             self.stdout.write("Devices list:\n")
             for device in devices:
                 self.stdout.write("(#%s) %s\n" % (device.id, device.name))
             self.stdout.write("\n")
         else:
-            collapse_key = options['collapse_key']
-            try:
-                id = options['device_id']
-                message = options['message']
-            except IndexError:
+            collapse_key = options.get('collapse_key', 'message')
+            id = options.get('device_id')
+            message = options.get('message')
+
+            if not (id and message):
                 raise CommandError(
                     "Invalid params. You have to put all params: "
                     "python manage.py gcm_messenger <device_id> <msg>")

gcm/tests.py

@@ -43,7 +43,7 @@ def test_send_message(self, mock_send):
              'multicast_id': 112233, 'results': [{'message_id': '0:123123'}]})
 
         out = StringIO()
-        management.call_command('gcm_messenger', device.id, 'test', stdout=out)
+        management.call_command('gcm_messenger', device_id=device.id, message='test', stdout=out)
         self.assertTrue(mock_send.called)
 
         management.call_command('gcm_messenger', devices=True, stdout=out)