From 80aea7c27a7411ce7715b40850f13638d859dcce Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Mon, 13 May 2013 22:16:39 +0200
Subject: [PATCH] fix variable error

---
 pyweb/mumble/views.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pyweb/mumble/views.py b/pyweb/mumble/views.py
index 6bef07a..2c90a06 100644
--- a/pyweb/mumble/views.py
+++ b/pyweb/mumble/views.py
@@ -554,13 +554,11 @@ def cvp_json( request, server ):
         See <http://mumble.sourceforge.net/Channel_Viewer_Protocol>
     """
     srv = get_object_or_404( Mumble, id=int(server) )
-    json = json.dumps( srv.asDict( cvp_checkauth( request, srv ) ) )
+    ret = json.dumps( srv.asDict( cvp_checkauth( request, srv ) ) )
 
     if "callback" in request.GET:
         validate_jsonp_callback(request.GET["callback"])
-        ret = "%s(%s)" % ( request.GET["callback"], json )
-    else:
-        ret = json
+        ret = "%s(%s)" % ( request.GET["callback"], ret )
 
     return HttpResponse( ret, mimetype='application/json' )