From 13c0a17154679815c906ad4983d74a4a6793a487 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Fri, 23 Jan 2015 17:15:08 -0200 Subject: [PATCH] Fixed flake8 validation for accounts --- colab/accounts/search_indexes.py | 26 +++++++++++++------------- colab/accounts/utils/validators.py | 4 +++- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/colab/accounts/search_indexes.py b/colab/accounts/search_indexes.py index 0aeac49..63b64c2 100644 --- a/colab/accounts/search_indexes.py +++ b/colab/accounts/search_indexes.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from haystack import indexes -from django.db.models import Count +# from django.db.models import Count from colab.badger.utils import get_users_counters from .models import User @@ -26,9 +26,9 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): stored=False) webpage = indexes.CharField(model_attr='webpage', null=True, stored=False) message_count = indexes.IntegerField(stored=False) - #changeset_count = indexes.IntegerField(stored=False) - #ticket_count = indexes.IntegerField(stored=False) - #wiki_count = indexes.IntegerField(stored=False) + # changeset_count = indexes.IntegerField(stored=False) + # ticket_count = indexes.IntegerField(stored=False) + # wiki_count = indexes.IntegerField(stored=False) contribution_count = indexes.IntegerField(stored=False) def get_model(self): @@ -45,9 +45,9 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): prepared_data['contribution_count'] = sum(( self.prepared_data['message_count'], - # self.prepared_data['changeset_count'], - # self.prepared_data['ticket_count'], - # self.prepared_data['wiki_count'] + # self.prepared_data['changeset_count'], + # self.prepared_data['ticket_count'], + # self.prepared_data['wiki_count'] )) return prepared_data @@ -66,14 +66,14 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable): def prepare_message_count(self, obj): return self.badge_counters[obj.username]['messages'] - #def prepare_changeset_count(self, obj): - # return self.badge_counters[obj.username]['revisions'] + # def prepare_changeset_count(self, obj): + # return self.badge_counters[obj.username]['revisions'] - #def prepare_ticket_count(self, obj): - # return self.badge_counters[obj.username]['tickets'] + # def prepare_ticket_count(self, obj): + # return self.badge_counters[obj.username]['tickets'] - #def prepare_wiki_count(self, obj): - # return self.badge_counters[obj.username]['wikis'] + # def prepare_wiki_count(self, obj): + # return self.badge_counters[obj.username]['wikis'] def index_queryset(self, using=None): return self.get_model().objects.filter(is_active=True) diff --git a/colab/accounts/utils/validators.py b/colab/accounts/utils/validators.py index 68f4128..7d45d2f 100644 --- a/colab/accounts/utils/validators.py +++ b/colab/accounts/utils/validators.py @@ -11,8 +11,10 @@ def validate_social_account(account, url): >>> validate_social_account('seocam', 'http://twitter.com') True - >>> validate_social_account('seocam-fake-should-fail', 'http://twitter.com') + >>> validate_social_account('seocam-fake-should-fail', + 'http://twitter.com') False + """ request = urllib2.Request(urlparse.urljoin(url, account)) -- libgit2 0.21.2