diff --git a/src/colab-spb-plugin/src/colab_spb/urls.py b/src/colab-spb-plugin/src/colab_spb/urls.py index 429a05d..43c72a5 100644 --- a/src/colab-spb-plugin/src/colab_spb/urls.py +++ b/src/colab-spb-plugin/src/colab_spb/urls.py @@ -3,4 +3,5 @@ from . import views urlpatterns = patterns('', url(r'^mail_list/$', views.mail_list, name='mail_list'), - url(r'^gitlab_activity/$', views.gitlab_activity, name='gitlab_activity'),) + url(r'^gitlab_activity/$', views.gitlab_activity, + name='gitlab_activity'),) diff --git a/src/colab-spb-plugin/src/colab_spb/views.py b/src/colab-spb-plugin/src/colab_spb/views.py index 595346c..3623f72 100644 --- a/src/colab-spb-plugin/src/colab_spb/views.py +++ b/src/colab-spb-plugin/src/colab_spb/views.py @@ -9,7 +9,7 @@ from colab_spb.models import CommunityAssociations def mail_list(request): community = request.GET.get('community', "") - list_name = get_community_association(community).get("mailman_list","") + list_name = get_community_association(community).get("mailman_list", "") MAX = request.GET.get('MAX', 7) if not MAX or MAX < 0: @@ -53,8 +53,8 @@ def mail_list(request): def gitlab_activity(request): community = request.GET.get('community', "") - limit = request.GET.get('limit',7) - offset = request.GET.get('offset',0) + limit = request.GET.get('limit', 7) + offset = request.GET.get('offset', 0) context = {} context['message'] = ("Esta comunidade não está associada a" @@ -62,22 +62,21 @@ def gitlab_activity(request): " detalhes contate o administrador.") association = get_community_association(community, limit, offset) - context['community_association'] = association + context['community_association'] = association return render(request, 'gitlab_activity.html', context) -def get_community_association(community,limit=7,offset=0): + +def get_community_association(community, limit=7, offset=0): if not community: return {} associations = CommunityAssociations.objects.all() for community_association in associations: if community_association.community.name in community: - return { 'community': community_association.community.name, - 'repository': community_association.group.url, - 'mailman_list': community_association.mail_list.name, - 'limit': limit, - 'offset': offset, - } - + return {'community': community_association.community.name, + 'repository': community_association.group.url, + 'mailman_list': community_association.mail_list.name, + 'limit': limit, + 'offset': offset} return {} diff --git a/src/colab-spb-plugin/tests/plugins.d/gitlab.py b/src/colab-spb-plugin/tests/plugins.d/gitlab.py index 0b379e7..4c22641 100644 --- a/src/colab-spb-plugin/tests/plugins.d/gitlab.py +++ b/src/colab-spb-plugin/tests/plugins.d/gitlab.py @@ -10,7 +10,7 @@ name = 'colab_gitlab' verbose_name = 'Gitlab Plugin' upstream = 'localhost' -#middlewares = [] +# middlewares = [] urls = { 'include': 'colab_gitlab.urls', diff --git a/src/colab-spb-plugin/tests/plugins.d/noosfero.py b/src/colab-spb-plugin/tests/plugins.d/noosfero.py index 20ddaaa..97025b1 100644 --- a/src/colab-spb-plugin/tests/plugins.d/noosfero.py +++ b/src/colab-spb-plugin/tests/plugins.d/noosfero.py @@ -10,7 +10,7 @@ name = 'colab_noosfero' verbose_name = 'Noosfero Plugin' upstream = 'localhost' -#middlewares = [] +# middlewares = [] urls = { 'include': 'colab_noosfero.urls', diff --git a/src/colab-spb-plugin/tests/plugins.d/spb.py b/src/colab-spb-plugin/tests/plugins.d/spb.py index 085d651..29cf3bd 100644 --- a/src/colab-spb-plugin/tests/plugins.d/spb.py +++ b/src/colab-spb-plugin/tests/plugins.d/spb.py @@ -1,15 +1,12 @@ -from django.utils.translation import ugettext_lazy as _ -from colab.plugins.utils.menu import colab_url_factory - +from colab.plugins.utils.menu import colab_url_factory + name = "colab_spb" verbose_name = "SPB Plugin" middlewares = ['colab_spb.middleware.ForceLangMiddleware'] -urls = { - "include":"colab_spb.urls", - "prefix": '^spb/', - "namespace":"colab_spb" - } +urls = {"include": "colab_spb.urls", + "prefix": '^spb/', + "namespace": "colab_spb"} url = colab_url_factory('colab_spb') diff --git a/src/colab-spb-plugin/tests/test_colab_integration.py b/src/colab-spb-plugin/tests/test_colab_integration.py index aa1f405..b86774f 100644 --- a/src/colab-spb-plugin/tests/test_colab_integration.py +++ b/src/colab-spb-plugin/tests/test_colab_integration.py @@ -43,7 +43,7 @@ class SPBTest(TestCase): " nenhum repositório no momento, para mais" " detalhes contate o administrador.") self.assertIn(message, response.content) - self.assertEqual(dict() ,response.context['community_association']) + self.assertEqual(dict(), response.context['community_association']) self.assertEqual(200, response.status_code) def test_gitlab_community_association_with_valid_community(self): @@ -70,7 +70,6 @@ class SPBTest(TestCase): self.assertEqual(type(result), dict) self.assertEqual(result['limit'], "5") - def test_gitlab_community_association_with_no_default_offset(self): response = self.client.get("/spb/gitlab_activity/" "?community=example_community" @@ -78,4 +77,4 @@ class SPBTest(TestCase): result = response.context['community_association'] - self.assertEqual(result['offset'],"5") + self.assertEqual(result['offset'], "5") -- libgit2 0.21.2