Merge lp:~daker/loco-team-portal/pep8-fixes into lp:loco-team-portal

[Adnane Belmadiaf]

PEP8 fixes

=== modified file 'loco_directory/articles/admin.py'
--- loco_directory/articles/admin.py	2012-06-01 22:28:09 +0000
+++ loco_directory/articles/admin.py	2012-12-25 22:04:21 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from articles.models import Feed, Article
 from django.contrib import admin
 

=== modified file 'loco_directory/articles/management/commands/refresh.py'
--- loco_directory/articles/management/commands/refresh.py	2012-12-12 22:46:30 +0000
+++ loco_directory/articles/management/commands/refresh.py	2012-12-25 22:04:21 +0000
@@ -1,14 +1,13 @@
+# -*- coding: utf-8 -*-
 '''
 Updates all Feeds
 '''
+from django.core.management.base import NoArgsCommand
 
+from articles.models import Feed
 import os
 import datetime
 
-from django.core.management.base import NoArgsCommand
-
-from articles.models import Feed
-
 REFRESH_LOCK = '/var/lock/loco-directory/refresh'
 
 

=== modified file 'loco_directory/articles/models.py'
--- loco_directory/articles/models.py	2012-12-13 22:48:12 +0000
+++ loco_directory/articles/models.py	2012-12-25 22:04:21 +0000
@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
+from django.db import models
+from django.conf import settings
+from django.template.defaultfilters import slugify
+
 import feedparser
 import time
 import datetime
 import socket
 import urllib2
 
-from django.db import models
-from django.conf import settings
-from django.template.defaultfilters import slugify
-
-
 from teams.models import Team
 from userprofiles.models import UserProfile
 

=== modified file 'loco_directory/articles/tests.py'
--- loco_directory/articles/tests.py	2012-12-11 00:00:46 +0000
+++ loco_directory/articles/tests.py	2012-12-25 22:04:21 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from django.test import TestCase
 
 from articles.models import Feed, Article

=== modified file 'loco_directory/articles/views.py'
--- loco_directory/articles/views.py	2012-12-13 22:48:12 +0000
+++ loco_directory/articles/views.py	2012-12-25 22:04:21 +0000
@@ -14,4 +14,4 @@
         'article': article,
     }
     return render_to_response('articles/article_detail.html',
-                                         context, RequestContext(request))
+                                context, RequestContext(request))

=== modified file 'loco_directory/events/admin.py'
--- loco_directory/events/admin.py	2012-12-22 23:22:32 +0000
+++ loco_directory/events/admin.py	2012-12-25 22:04:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.contrib import admin
-from .models import *
+from .models import (Venue, GlobalEvent, TeamEvent, Attendee)
 
 
 class TeamEventAdmin(admin.ModelAdmin):

=== modified file 'loco_directory/meetings/admin.py'
--- loco_directory/meetings/admin.py	2012-12-04 21:25:51 +0000
+++ loco_directory/meetings/admin.py	2012-12-25 22:04:21 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.contrib import admin
-from meetings.models import *
+from meetings.models import (TeamMeeting, AgendaItem)
 
 admin.site.register(TeamMeeting)
 admin.site.register(AgendaItem)

=== modified file 'loco_directory/teams/admin.py'
--- loco_directory/teams/admin.py	2010-08-24 13:47:33 +0000
+++ loco_directory/teams/admin.py	2012-12-25 22:04:21 +0000
@@ -3,21 +3,25 @@
 from django.contrib import admin
 from teams.models import Team, Continent, Country, Language
 
+
 class TeamAdmin(admin.ModelAdmin):
     search_fields = ('name',)
-    
+
     def formfield_for_dbfield(self, db_field, **kwargs):
         field = super(TeamAdmin, self).formfield_for_dbfield(db_field, **kwargs)
         if db_field.name == 'description':
             field.widget.attrs['rows'] = '4'
         return field
-    
+
+
 class ContinentAdmin(admin.ModelAdmin):
     search_fields = ('name',)
 
+
 class CountryAdmin(admin.ModelAdmin):
     search_fields = ('name',)
 
+
 class LanguageAdmin(admin.ModelAdmin):
     search_fields = ('name',)
 

=== modified file 'loco_directory/teams/feeds.py'
--- loco_directory/teams/feeds.py	2012-11-26 23:07:59 +0000
+++ loco_directory/teams/feeds.py	2012-12-25 22:04:21 +0000
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.feeds import Feed
 from django.utils.translation import ugettext as _
 from meetings.models import TeamMeeting
 from events.models import TeamEvent
@@ -52,5 +51,3 @@
             return obj.get_absolute_url()
         else:
             return '/'
-
-

=== modified file 'loco_directory/teams/forms.py'
--- loco_directory/teams/forms.py	2012-03-04 20:55:07 +0000
+++ loco_directory/teams/forms.py	2012-12-25 22:04:21 +0000
@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
-
 from django import forms
-from django.utils.translation import ugettext_lazy as _
 
 from models import Team
-from userprofiles.models import UserProfile
 from common.forms import RenderableMixin
 
+
 class UpdateTeamForm(forms.ModelForm, RenderableMixin):
     class Meta:
         model = Team
@@ -14,12 +12,13 @@
 
     class Media:
         css = {'all': (
-                       '/media/css/colortip-1.0-jquery.css', 
-                       )}
+                '/media/css/colortip-1.0-jquery.css',
+              )}
         js = (
               '/media/js/colortip-1.0-jquery.js',
               )
 
+
 class LoCoCouncilForm(UpdateTeamForm, RenderableMixin):
     class Meta(UpdateTeamForm.Meta):
         model = Team

=== modified file 'loco_directory/teams/models.py'
--- loco_directory/teams/models.py	2012-11-18 22:02:56 +0000
+++ loco_directory/teams/models.py	2012-12-25 22:04:21 +0000
@@ -3,10 +3,10 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from common.utils import flat_list
 from common.mixins import LocalTimeMixin
 from userprofiles.models import UserProfile
 
+
 class Language(models.Model):
     class Meta:
         ordering = ('name',)
@@ -16,9 +16,11 @@
     def __unicode__(self):
         return u'%s' % (self.name)
 
+
 class TeamManager(models.Manager):
     pass
 
+
 class Continent(models.Model):
     name = models.TextField(_("Name"), max_length=50)
 
@@ -41,6 +43,7 @@
     def related_teams(self):
         return Team.objects.filter(countries__continents=self).distinct()
 
+
 class Country(models.Model):
     name = models.TextField(_("Name"), max_length=100)
     continents = models.ManyToManyField(Continent)
@@ -66,21 +69,25 @@
         else:
             return 'no_country'
 
+
 def countries_without_continent():
     return Country.objects.filter(continents__isnull=True)
 
+
 def countries_without_continent_have_venues():
     for country in countries_without_continent():
         if country.venue_set.count() > 0:
             return True
     return False
 
+
 def countries_without_continent_have_teams():
     for country in countries_without_continent():
         if country.team_set.count() > 0:
             return True
     return False
 
+
 class Team(models.Model, LocalTimeMixin):
     lp_name = models.CharField(_("Launchpad Team ID"), max_length=40, null=True)
     name = models.CharField(_("Team Name"), max_length=80, null=False, default='')
@@ -150,5 +157,6 @@
             events_and_meetings = events_and_meetings[:5]
         return events_and_meetings
 
+
 def teams_without_country():
     return Team.objects.filter(countries__isnull=True)

=== modified file 'loco_directory/teams/tests.py'
--- loco_directory/teams/tests.py	2012-11-28 00:46:29 +0000
+++ loco_directory/teams/tests.py	2012-12-25 22:04:21 +0000
@@ -1,16 +1,12 @@
 from django.test import TestCase
+from django.contrib.auth.models import User, Group
 from django.core.urlresolvers import reverse
 from urllib import urlencode
-
-from django.contrib.auth.models import User, Group
-
 from django_openid_auth.models import UserOpenID
-from userprofiles.models import UserProfile
 from teams.models import *
 from common import launchpad
 
 
-
 class TestBase(TestCase):
 
     def setUp(self):
@@ -60,6 +56,7 @@
         self.user_foo.groups.add(self.team_group)
         self.user_foo.save()
 
+
 class ACLChecksTestCase(TestBase):
 
     def testAdminIsATeamChecks(self):
@@ -69,6 +66,7 @@
         self.assertEquals(launchpad.is_admin_or_owner(self.user_foo.username, team), True)
         self.assertEquals(launchpad.is_admin_or_owner(self.user_bar.username, team), False)
 
+
 class EditTeamTestCase(TestBase):
     """
     test if team update works correct
@@ -79,12 +77,12 @@
         """
         #try to access team-update page as not logged in user
 
-        data = { 'next' : '/teams/test-team/edit' }
-        response = self.client.get(reverse( 'team-edit', args=['test-team'] ), follow=True)
+        data = {'next': '/teams/test-team/edit'}
+        response = self.client.get(reverse('team-edit', args=['test-team']), follow=True)
         self.assertRedirects(response, '/openid/login/?%s' % urlencode(data), status_code=302, target_status_code=200)
 
         #try to update team as not logged in user
-        response = self.client.post(reverse('team-edit', args=['test-team']), {'Country':'Germany', 'forum_url':'http://ubuntuusers.de'}, follow=True)
+        response = self.client.post(reverse('team-edit', args=['test-team']), {'Country': 'Germany', 'forum_url': 'http://ubuntuusers.de'}, follow=True)
         self.assertRedirects(response, '/openid/login/?%s' % urlencode(data), status_code=302, target_status_code=200)
 
     def test_user_with_no_rights(self):
@@ -108,6 +106,7 @@
         pass
         #FIXME How to use a user with this rights with openid?
 
+
 class DisplayNameTestCase(TestBase):
 
     def test_override_name(self):
@@ -135,5 +134,5 @@
         response = self.client.get('/teams/test-team/')
         self.assertEquals(response.status_code, 200)
 
-        self.assertContains(response, 'Override Name', 0) # No instances of override_name
-        self.assertContains(response, 'Test Team', 4) # One instance of the team name
+        self.assertContains(response, 'Override Name', 0)  # No instances of override_name
+        self.assertContains(response, 'Test Team', 4)  # One instance of the team name

=== modified file 'loco_directory/teams/utils.py'
--- loco_directory/teams/utils.py	2011-02-17 13:04:25 +0000
+++ loco_directory/teams/utils.py	2012-12-25 22:04:21 +0000
@@ -2,6 +2,7 @@
 
 from events.models import TeamEvent
 
+
 def merge_teams(old_team, new_team):
     msgs = []
     related_events = TeamEvent.objects.filter(teams__id=old_team.id)
@@ -60,4 +61,3 @@
     old_team.delete()
     msgs += [ugettext('Team "%(old_team)s" merged with "%(new_team)s".' % {'old_team':old_team.name, 'new_team':new_team.name})]
     return msgs
-

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2012-12-18 22:35:47 +0000
+++ loco_directory/teams/views.py	2012-12-25 22:04:21 +0000
@@ -19,10 +19,10 @@
 from articles.models import Article
 
 import forms
-
 import datetime
 import vobject
 
+
 def reapprovals(request):
     teams = filter(lambda a: a.approved and a.expires_date != None,
                    Team.objects.all().order_by('expires_date', 'name'))
@@ -31,11 +31,11 @@
 # XXX: we have no idea why, but on loco.ubuntu.com we are dealing with
 # datetime.datetime instead of datetime.date - bug 581641
     if type(teams[0].expires_date) == datetime.datetime:
-        next_teams = filter(lambda a: a.expires_date.date() <= today+half_a_year, teams)
-        later_teams = filter(lambda a: a.expires_date.date() > today+half_a_year, teams)
+        next_teams = filter(lambda a: a.expires_date.date() <= today + half_a_year, teams)
+        later_teams = filter(lambda a: a.expires_date.date() > today + half_a_year, teams)
     else:
-        next_teams = filter(lambda a: a.expires_date <= today+half_a_year, teams)
-        later_teams = filter(lambda a: a.expires_date > today+half_a_year, teams)
+        next_teams = filter(lambda a: a.expires_date <= today + half_a_year, teams)
+        later_teams = filter(lambda a: a.expires_date > today + half_a_year, teams)
     context = {
         'next_teams': next_teams,
         'later_teams': later_teams,
@@ -43,6 +43,7 @@
     return render_to_response('teams/team_reapprovals.html',
                 context, RequestContext(request))
 
+
 def as_ical(objects, name):
     """Return any list events as an ical"""
     filename = "%s.ics" % name.replace(' ', '-').lower()
@@ -61,6 +62,7 @@
 
     return response
 
+
 def team_list(request):
     continents = Continent.objects.all().order_by('name')
     for continent in continents:
@@ -75,17 +77,19 @@
         'countries_without_continent': all_countries_without_continent,
         'countries_without_continent_have_teams': countries_without_continent_have_teams(),
         'teams_without_country': teams_without_country().order_by('name'),
-        'colcycle' : simple_iterator('col_left', 'col_right'),
+        'colcycle': simple_iterator('col_left', 'col_right'),
     }
     return render_to_response('teams/team_list.html', context,
                   RequestContext(request))
 
+
 def get_events_and_meetings(team_object):
     team_events = list(TeamEvent.objects.filter(teams=team_object))
     team_meetings = list(TeamMeeting.objects.filter(teams=team_object))
     team_events.extend(team_meetings)
     return team_events
 
+
 def team_ical(request, team_slug):
     """
     Return a ical list with the events and meetings in ical format.
@@ -93,6 +97,7 @@
     team_object = get_object_or_404(Team, lp_name=team_slug)
     return as_ical(get_events_and_meetings(team_object), team_object.name)
 
+
 def team_event_list(request, team_slug):
     """
     list with all team events in present and future for the given team
@@ -105,11 +110,12 @@
     context = {
         'team_object': team_object,
         'team_event_list': team_event_list,
-        'is_member' : is_member,
+        'is_member': is_member,
     }
     return render_to_response('teams/team_event_list.html', context,
                   RequestContext(request))
 
+
 def team_event_history(request, team_slug):
     """
     list with all team events in past for the given team
@@ -123,6 +129,7 @@
     return render_to_response('teams/team_event_history.html', context,
                   RequestContext(request))
 
+
 def team_meeting_list(request, team_slug):
     """
     list with all team meetings in present and future for the given team
@@ -136,6 +143,7 @@
     return render_to_response('teams/team_meeting_list.html', context,
                   RequestContext(request))
 
+
 def team_meeting_history(request, team_slug):
     """
     list with all team meetings in past for the given team
@@ -180,11 +188,12 @@
     team_list = Team.objects.all().order_by('name')
     other_teams = team_list.exclude(id=team_object.id)
     return render_to_response('teams/select_other_team.html',
-                              {'team_object':team_object,
-                               'other_teams':other_teams,
-                               'user':request.user,
+                              {'team_object': team_object,
+                               'other_teams': other_teams,
+                               'user': request.user,
                               }, RequestContext(request))
 
+
 @login_required
 def team_merge(request, team_slug, other_team_slug):
     old_team = get_object_or_404(Team, lp_name=team_slug)
@@ -202,9 +211,9 @@
         request.user.message_set.create(message=msg)
 
     return render_to_response('teams/merge_teams.html',
-                              {'team_object':old_team,
-                               'other_team_object':new_team,
-                               'user':request.user,
+                              {'team_object': old_team,
+                               'other_team_object': new_team,
+                               'user': request.user,
                               }, RequestContext(request))
 
 
@@ -218,7 +227,7 @@
     is_contact = launchpad.is_admin_or_owner(request.user.username, team_object)
     if not is_on_lc and not is_contact:
         request.user.message_set.create(message=ugettext('You are not allowed to make changes to the team details.'))
-        return redirect( team_object )
+        return redirect(team_object)
 
     if request.method == "POST":
         if is_on_lc:
@@ -228,7 +237,7 @@
         if form.is_valid():
             form.save()
             request.user.message_set.create(message=ugettext('Thanks, your team\'s details have been saved.'))
-            return redirect( team_object )
+            return redirect(team_object)
         else:
             request.user.message_set.create(message=ugettext('Recent changes to your team\'s details could not be saved.'))
     else:
@@ -239,10 +248,11 @@
 
     return render_to_response('teams/team_update.html',
                     {'form': form,
-                     'team':team_object,
-                     'user':request.user,
+                     'team': team_object,
+                     'user': request.user,
                     }, RequestContext(request))
 
+
 def xml_team_data(request):
     XMLSerializer = serializers.get_serializer("xml")
     xml_serializer = XMLSerializer()

=== modified file 'loco_directory/userprofiles/admin.py'
--- loco_directory/userprofiles/admin.py	2010-08-24 13:47:33 +0000
+++ loco_directory/userprofiles/admin.py	2012-12-25 22:04:21 +0000
@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 from django.contrib import admin
 from userprofiles.models import UserProfile
 
+
 class UserProfileAdmin(admin.ModelAdmin):
     search_fields = ('realname',)
 

=== modified file 'loco_directory/userprofiles/management/commands/update-profiles.py'
--- loco_directory/userprofiles/management/commands/update-profiles.py	2012-11-19 22:53:54 +0000
+++ loco_directory/userprofiles/management/commands/update-profiles.py	2012-12-25 22:04:21 +0000
@@ -3,13 +3,12 @@
 
 from django.core.management.base import BaseCommand
 from django.contrib.auth.models import User
+from optparse import make_option
 
 from userprofiles.models import create_userprofile
-
-from optparse import make_option
-from datetime import datetime
 import sys
 
+
 class Command(BaseCommand):
     help = "Updates user profiles with information from Launchpad."
     option_list = BaseCommand.option_list + (

=== modified file 'loco_directory/userprofiles/tests.py'
--- loco_directory/userprofiles/tests.py	2012-11-18 22:02:56 +0000
+++ loco_directory/userprofiles/tests.py	2012-12-25 22:04:21 +0000
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 from django.test import TestCase
-from django.contrib.auth.models import  User
+from django.contrib.auth.models import User
 from django.db.models import signals
 
 from userprofiles.models import UserProfile
 
+
 class SignalTest(TestCase):
     '''
     Tests that signals fire properly
@@ -27,4 +28,4 @@
     def test_profile_creation(self):
         self.user = User.objects.create(username='bob', password='bob')
         self.user.save()
-        self.assertEqual(UserProfile.objects.all().count(), 1)
\ No newline at end of file
+        self.assertEqual(UserProfile.objects.all().count(), 1)