@@ -30,8 +30,8 @@ def tonight(request, everyone=True): attendance__user=request.user) events = events.exclude(creator=request.user).exclude( attendance__user=request.user) - following = [i['to_user'] for i in - request.user.following_set.all().values('to_user')] + following = request.user.following_set.all().values_list('to_user', + flat=True) else: my_events = Event.objects.none() following = None @@ -64,8 +64,8 @@ def archive(request, everyone=True): events = Event.objects.filter(latest=True) | Event.objects.filter( attendance__user__isnull=False) if request.user.is_authenticated(): - following = [i['to_user'] for i in - request.user.following_set.all().values('to_user')] + following = request.user.following_set.all().values_list('to_user', + flat=True) else: following = None if not everyone: events/views.py @@ -5,23 +5,25 @@ def get_people_user_follows(user): """ Returns a ``QuerySet`` representing the users that the given user follows. """ - ul = UserLink.objects.filter(from_user=user).values('to_user') - return User.objects.filter(id__in=[i['to_user'] for i in ul]) + ul = UserLink.objects.filter(from_user=user).values_list('to_user', + flat=True) + return User.objects.filter(id__in=ul) def get_people_following_user(user): """ Returns a ``QuerySet`` representing the users that follow the given user. """ - ul = UserLink.objects.filter(to_user=user).values('from_user') - return User.objects.filter(id__in=[i['from_user'] for i in ul]) + ul = UserLink.objects.filter(to_user=user).values_list('from_user', + flat=True) + return User.objects.filter(id__in=ul) def get_mutual_followers(user): """ Returns a ``QuerySet`` representing the users that the given user follows, who also follow the given user back. """ - follows = UserLink.objects.filter(from_user=user).values('to_user') - following = UserLink.objects.filter(to_user=user).values('from_user') - follows_set = set([i['to_user'] for i in follows]) - following_set = set([i['from_user'] for i in following]) - return User.objects.filter(id__in=follows_set.intersection(following_set)) \ No newline at end of file + follows = UserLink.objects.filter(from_user=user).values_list('to_user', + flat=True) + following = UserLink.objects.filter(to_user=user).values_list('from_user', + flat=True) + return User.objects.filter(id__in=set(follows).intersection(set(following))) \ No newline at end of file socialgraph/util.py d55e17603ee2126348a7b18f1b43c4dfa6ee06b3 Eric Florenzano floguy@gmail.com http://github.com/ericflo/startthedark/commit/ce8b1d7a4954d9f5f7137d9b2c5a16c2474691f2 ce8b1d7a4954d9f5f7137d9b2c5a16c2474691f2 2008-10-04T11:40:21-07:00 2008-10-04T11:40:21-07:00 Make use of values_list with flat kwarg instead of using list comprehensions. 1ca24b3a5671521fd35609f1db8ddb66cbeae320 Eric Florenzano floguy@gmail.com