From 2d39700e4798b0d9a1dda1720030422f04f5a986 Mon Sep 17 00:00:00 2001
From: Stefan Koegl <stefan@skoegl.net>
Date: Sat, 18 Sep 2010 18:45:05 +0300
Subject: [PATCH] simplify creation of SecurityTokens

---
 mygpo/decorators.py        | 5 +----
 mygpo/web/views/episode.py | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/mygpo/decorators.py b/mygpo/decorators.py
index 3c9530e7..c5b8c0fa 100644
--- a/mygpo/decorators.py
+++ b/mygpo/decorators.py
@@ -22,8 +22,6 @@ from django.template import RequestContext
 from mygpo.web.models import SecurityToken
 from django.contrib.auth.models import User
 from django.http import HttpResponseForbidden, HttpResponseNotAllowed
-import random
-import string
 import gc
 
 def requires_token(object, action, denied_template=None):
@@ -45,8 +43,7 @@ def requires_token(object, action, denied_template=None):
         def tmp(request, username, *args, **kwargs):
 
             user = get_object_or_404(User, username=username)
-            token, c = SecurityToken.objects.get_or_create(user=user, object=object, action=action,
-                        defaults = {'token': "".join(random.sample(string.letters+string.digits, 32))})
+            token, c = SecurityToken.objects.get_or_create(user=user, object=object, action=action)
 
             u_token = request.GET.get('token', '')
 
diff --git a/mygpo/web/views/episode.py b/mygpo/web/views/episode.py
index b944849a..224a6046 100644
--- a/mygpo/web/views/episode.py
+++ b/mygpo/web/views/episode.py
@@ -28,8 +28,6 @@ from mygpo.utils import parse_time
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import get_object_or_404
 from django.contrib.sites.models import Site
-import random
-import string
 
 @manual_gc
 def episode(request, id):
@@ -114,8 +112,7 @@ def list_favorites(request):
     site = Site.objects.get_current()
     episodes = [x.episode for x in EpisodeFavorite.objects.filter(user=request.user).order_by('-created')]
 
-    token, c = SecurityToken.objects.get_or_create(user=request.user, object='fav-feed', action='r', \
-        defaults={'token': "".join(random.sample(string.letters+string.digits, 8))})
+    token, c = SecurityToken.objects.get_or_create(user=request.user, object='fav-feed', action='r')
 
     from django.core.urlresolvers import reverse
     feed_url = 'http://%s/%s' % (site.domain, reverse('favorites-feed', args=[request.user.username]))
-- 
2.11.4.GIT