Merge lp:~daker/loco-team-portal/fix.960695.events-app2 into lp:loco-team-portal

[Adnane Belmadiaf]

Fixed the events app to passe pylint checkers

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2012-06-10 19:08:39 +0000
+++ loco_directory/events/forms.py	2012-06-30 22:47:18 +0000
@@ -9,10 +9,10 @@
 from common.forms import RenderableMixin
 from userprofiles.models import UserProfile
 
-import pytz
 import itertools
 import datetime
 
+
 def grouped_user_list(teams):
     other_members, team_members = [], []
     for profile in UserProfile.objects.filter(user__groups__name__in=[t.lp_name for t in teams]):
@@ -24,16 +24,18 @@
             (_('Team members'), team_members),
             (_('Other users'), other_members)]
 
+
 def validate_tag(tag):
     if tag.startswith('#'):
         tag = tag[1:]
-    for delim in [ " ", ",", "#" ]:
+    for delim in [" ", ",", "#"]:
         if delim in tag:
             raise forms.ValidationError(_(u'Please just set one tag.'))
     return tag
 
+
 class BaseEventForm(forms.ModelForm, RenderableMixin):
-    """ 
+    """
     a form to create/update a BaseEvent
     """
     class Meta:
@@ -44,7 +46,7 @@
         css = {'all': (
                        '/media/jquery-ui/css/css/smoothness/jquery-ui.css',
                        '/media/jquery-ui-timepicker/css/ui-lightness/ui.timepickr.css',
-                       '/media/css/colortip-1.0-jquery.css', 
+                       '/media/css/colortip-1.0-jquery.css',
                        )}
         js = (
               '/media/jquery/jquery.js',
@@ -54,12 +56,12 @@
               '/media/js/colortip-1.0-jquery.js',
               '/media/js/events-ui.js',
               )
-        
+
     def __init__(self, *args, **kargs):
         super(BaseEventForm, self).__init__(*args, **kargs)
         self.fields['date_begin'].widget = forms.SplitDateTimeWidget()
         self.fields['date_end'].widget = forms.SplitDateTimeWidget()
-        
+
     def clean(self):
         begin = self.cleaned_data.get('date_begin')
         end = self.cleaned_data.get('date_end')
@@ -67,14 +69,15 @@
             raise forms.ValidationError("Events can not end before they start.")
         return self.cleaned_data
 
+
 class TeamEventForm(BaseEventForm):
-    """ 
+    """
     a form to create/update a TeamEvent
     """
     class Meta(BaseEventForm.Meta):
         model = TeamEvent
         exclude = ('teams', 'date_created')
-        
+
     def __init__(self, teams=[], *args, **kargs):
         super(TeamEventForm, self).__init__(*args, **kargs)
         self.teams = teams
@@ -86,7 +89,7 @@
         self.fields['global_event'].choices.insert(0, ('', '---------'))
         self.initial['date_begin'] = self.instance.local_date_begin
         self.initial['date_end'] = self.instance.local_date_end
-            
+
     def clean(self):
         venue = self.cleaned_data.get('venue')
         if venue is not None:
@@ -102,7 +105,7 @@
                 self.cleaned_data['date_begin'] = self.teams[0].fromlocaltime(begin)
                 self.cleaned_data['date_end'] = self.teams[0].fromlocaltime(end)
         return self.cleaned_data
-        
+
     def grouped_venue_list(self):
         """
         Returns a list of venues grouped by country
@@ -129,7 +132,7 @@
         venues_team = Venue.objects.filter(country__team__in=self.teams).order_by('country', 'spr', 'city')
         venues_other = Venue.objects.all().exclude(country__team__in=self.teams).order_by('country', 'spr', 'city')
         venues = itertools.chain(venues_team, venues_other)
-        
+
         # Ordered by country so we can tell when we're done with one
         # and starting another
         for venue in venues:
@@ -146,26 +149,26 @@
             # Add venue to the current country group
             country_choices.append((venue.id, str(venue)))
 
-        
         # Add the last country group to the list if it's non-empty
         if len(country_choices) > 0:
             venue_choices.append((current_country, country_choices))
-                
+
         return venue_choices
-        
-        
+
+
 class GlobalEventForm(BaseEventForm):
-    """ 
+    """
     a form to create/update a GlobalEvent
     """
     class Meta(BaseEventForm.Meta):
         model = GlobalEvent
 
-    def clean(self):        
+    def clean(self):
         self.cleaned_data['microbloghashtag'] = validate_tag(self.cleaned_data['microbloghashtag'])
         self.cleaned_data['pictag'] = validate_tag(self.cleaned_data['pictag'])
         return self.cleaned_data
 
+
 class AttendeeRegistrationForm(forms.ModelForm, RenderableMixin):
     """
     a form to create/update an Attendee object
@@ -179,6 +182,7 @@
         model = Attendee
         exclude = ('attendee_profile', 'team_event')
 
+
 class TeamEventCommentForm(forms.ModelForm, RenderableMixin):
     """
     a form to comment a team event
@@ -189,13 +193,14 @@
 
     class Media:
         css = {'all': (
-                       '/media/css/colortip-1.0-jquery.css', 
+                       '/media/css/colortip-1.0-jquery.css',
                        )}
         js = (
               '/media/jquery/jquery.js',
               '/media/js/colortip-1.0-jquery.js',
               )
 
+
 class FilterHistoryList(forms.Form):
     """
     a form to filter event history list
@@ -206,14 +211,14 @@
     scope = forms.ChoiceField(choices)
 
     now = datetime.datetime.now().strftime("%Y-%m")
-    filtering = forms.CharField(required=False, initial=now) 
+    filtering = forms.CharField(required=False, initial=now)
 
     class Media:
         css = {'all': (
                        '/media/jquery-ui/css/css/smoothness/jquery-ui.css',
                        '/media/jquery-ui-timepicker/css/ui-lightness/ui.timepickr.css',
-                       '/media/css/colortip-1.0-jquery.css', 
-                       '/media/css/newstyle.css', 
+                       '/media/css/colortip-1.0-jquery.css',
+                       '/media/css/newstyle.css',
                        )}
         js = (
               '/media/jquery/jquery.js',
@@ -223,4 +228,3 @@
               '/media/js/colortip-1.0-jquery.js',
               '/media/js/events-ui.js',
               )
-

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2012-06-20 10:32:02 +0000
+++ loco_directory/events/models.py	2012-06-30 22:47:18 +0000
@@ -15,6 +15,7 @@
 import pytz
 import datetime
 
+
 class BaseEvent(models.Model):
     """
     a simple basic event
@@ -28,7 +29,7 @@
 
     def __unicode__(self):
         return self.name
-    
+
     def as_ical(self, cal):
         """
         return a event as ical
@@ -44,12 +45,13 @@
     def is_past(self):
         return self.date_end > datetime.datetime.today()
 
+
 class GlobalEventManager(models.Manager):
     """ manager for a global event """
     def next_events(self):
         """ a list with all upcoming global events """
         return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')
-    
+
     def history_events(self):
         """ all  global events in history """
         return self.filter(date_end__lt=datetime.datetime.now()).order_by('date_end')
@@ -62,6 +64,7 @@
         """ return the last 5 active Team events for this global event"""
         return TeamEvent.objects.filter(global_event__id__exact=self.id).order_by('?')[5:]
 
+
 class GlobalEvent(BaseEvent):
     """
     a global event. other events can attend to a global event
@@ -70,7 +73,7 @@
     pictag = models.CharField(max_length=50, help_text=_('tag used in web albums like; picasa, flickr, and more'), verbose_name=_('Picture Tag'), null=True, blank=True)
     channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-locoteams'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True)
     activities = models.TextField(help_text=_('Activities to do during the Event'), blank=True, null=True)
-    
+
     objects = GlobalEventManager()
 
     def __unicode__(self):
@@ -79,23 +82,24 @@
     @models.permalink
     def get_absolute_url(self):
         return ('global-event-detail', [str(self.id)])
-        
+
     def get_participating(self):
         attendees = 0
         for attendee in Attendee.objects.filter(team_event__global_event=self, promise='sure'):
             attendees += attendee.guests + 1
         locos = len(Team.objects.filter(teamevent__global_event=self).distinct())
         countries = len(Country.objects.filter(team__teamevent__global_event=self).distinct())
-        return _('%(attendees)d people from %(locos)d LoCos and %(countries)d countries are participating in this event!' % {'attendees': attendees, 
-                                                                                                                             'locos': locos, 
+        return _('%(attendees)d people from %(locos)d LoCos and %(countries)d countries are participating in this event!' % {'attendees': attendees,
+                                                                                                                             'locos': locos,
                                                                                                                              'countries': countries})
 
+
 class TeamEventManager(models.Manager):
     """ manager for a team event """
     def next_3_events(self):
         """ a list with the next 3 events """
         return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')[:3]
-        
+
     def next_5_events(self):
         """ a list with the next 5 events """
         return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')[:5]
@@ -113,10 +117,11 @@
 
     def random_5_attendees(self):
         return Attendee.objects.filter(event__id__exact=self.id).order_by('?')[5:]
-        
+
     def has_location(self):
         return self.filter(venue__longitude__isnull=False, venue__latitude__isnull=False)
 
+
 class TeamEvent(BaseEvent, LocalTimeMixin):
     """
     a event of one or more teams
@@ -125,7 +130,7 @@
     contact = models.ForeignKey(UserProfile, verbose_name=_('Event Contact'), null=True, help_text=_('Contact person for this event.'))
     global_event = models.ForeignKey(GlobalEvent, help_text=_('this team event is part of the selected global event'), verbose_name=_('Related Global Event'), blank=True, null=True)
     venue = models.ForeignKey(Venue, help_text=_('Venue for the Event'), verbose_name=_('Event Venue'), blank=True, null=True)
-    channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True)  
+    channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True)
     registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, verify_exists=False, blank=True, null=True)
     template = 'events/team_event_li.inc.html'
 
@@ -151,19 +156,20 @@
         return timezone
     tz = property(get_tz)
 
-            
     def get_local_begin(self):
         return self.tolocaltime(self.date_begin)
+
     def set_local_begin(self, local_begin):
         self.date_begin = self.fromlocaltime(local_begin)
     local_date_begin = property(get_local_begin)
 
     def get_local_end(self):
         return self.tolocaltime(self.date_end)
+
     def set_local_end(self, local_end):
         self.date_end = self.fromlocaltime(local_end)
     local_date_end = property(get_local_end, set_local_end)
-    
+
     def attending(self):
         return self.attendee_set.filter(promise__exact='sure')
 
@@ -178,7 +184,7 @@
             return self.teams.all()[0]
         except:
             print 'Event %s has no team' % self.id
-            return {'lp_name':'no-team'}
+            return {'lp_name': 'no-team'}
 
     def is_attending(self, user):
         if user.is_authenticated():
@@ -206,7 +212,7 @@
     date_created = models.DateTimeField(help_text=_('Comment date and time'), default=datetime.datetime.now(), db_index=True)
     commenter_profile = models.ForeignKey(UserProfile, null=True)
     comment = models.TextField(help_text=_('Enter your comment for this event.'), db_index=True)
-    
+
     def __unicode__(self):
         return "Team Event: %s . Comment: %s" % (self.team_event.name, self.comment)
 
@@ -215,6 +221,7 @@
             return self.team_event.venue.tolocaltime(self.date_created)
         else:
             return self.date_created
+
     def set_local_created(self, local_created):
         if self.team_event.venue:
             self.date_created = self.team_event.venue.fromlocaltime(local_created)
@@ -222,11 +229,12 @@
             self.date_created = local_created
     local_date_created = property(get_local_created, set_local_created)
 
+
 class Attendee(models.Model):
     """
     a event attendee
     """
-        
+
     team_event = models.ForeignKey(TeamEvent, help_text=_('the Team Event'))
     attendee_profile = models.ForeignKey(UserProfile, help_text=_('the name of the attendee'), null=True)
     promise = models.CharField(verbose_name=_('Attending Status'), max_length=50, choices=ATTENDEE_PROMISE_CHOICES)
@@ -234,7 +242,6 @@
 
     class Meta:
         unique_together = ('team_event', 'attendee_profile')
-    
+
     def __unicode__(self):
         return self.attendee_profile.user.username
-

=== modified file 'loco_directory/events/tests.py'
--- loco_directory/events/tests.py	2011-07-17 18:11:38 +0000
+++ loco_directory/events/tests.py	2012-06-30 22:47:18 +0000
@@ -18,20 +18,17 @@
     def setUp(self):
         # setup country record for testing
         self.country = Country.objects.create(name='Test Country')
-        
         # setup team record for testing
         self.team = Team.objects.create(
             lp_name='test-team',
             name='Test Team',
         )
         self.team.countries.add(self.country)
-        
         # setup venue record for testing
         self.venue = Venue.objects.create(
             name='Test Venue',
             country=self.country,
         )
-        
         # setup event record for testing
         self.event = TeamEvent.objects.create(
             name='Test Event',
@@ -40,7 +37,6 @@
             venue=self.venue,
         )
         self.event.teams.add(self.team)
-        
         # setup user record for testing
         self.team_group = Group.objects.create(
             name=self.team.lp_name,
@@ -51,11 +47,10 @@
         self.user.set_password('test')
         self.user.groups.add(self.team_group)
         self.user.save()
-        
 
     def test_large_guest_validation(self):
         'Validate the guests size and show friendly error message when too big'
-        
+
         # register attendence form data
         path = '/events/%s/%s/register/' % (self.team.lp_name, self.event.id)
         data = {
@@ -64,12 +59,11 @@
         }
         # login so we're not redirected when posting the form data
         self.client.login(username='testuser', password='test')
-        
         # post the form data
         response = self.client.post(path, data)
 
         # should get a 200 if the integer size is caught by form validation
         self.assertEquals(response.status_code, 200)
-        
+
         # check that the user friendly error message exists in the response
         self.assertContains(response, 'Ensure this value is less than or equal to 100.')

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2012-04-14 22:10:09 +0000
+++ loco_directory/events/urls.py	2012-06-30 22:47:18 +0000
@@ -1,14 +1,14 @@
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('',
-    #all events                   
+    #all events
     url(r'^$', 'events.views.event_list', name='event-list'),
     url(r'^history/$', 'events.views.event_history_list', name='event-history-list'),
 
     #special events
     url(r'^globaljam/$', 'events.views.global_jam', name='global-jam-dashboard'),
     url(r'^globaljam/dashboard/$', 'events.views.global_jam_dashboard', name='global-jam'),
-    
+
     #global events
     url(r'^global/ical/$', 'events.views.global_event_list_ical', name='global-event-list-ical'),
     url(r'^global/(?P<global_event_id>\d+)/detail/$', 'events.views.global_event_detail', name='global-event-detail'),
@@ -16,7 +16,7 @@
     url(r'^global/(?P<global_event_id>\d+)/update/$', 'events.views.global_event_update', name='global-event-update'),
     url(r'^global/(?P<global_event_id>\d+)/locations/$', 'events.views.global_event_locations', name='global-event-locations'),
     url(r'^global/add/$', 'events.views.global_event_new', name='global-event-new'),
-    
+
     #team events
     url(r'^locations/$', 'events.views.team_event_locations', name='team-event-locations'),
     url(r'^ical/$', 'events.views.teams_event_list_ical', name='teams-event-list-ical'),
@@ -30,7 +30,7 @@
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'events.views.team_events_rss', name='team-events-rss'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'events.views.team_event_list_ical', name='team-event-list-ical'),
     url(r'^add/$', 'events.views.team_event_select', name='team-event-select'),
-    
+
     # Old url notations
     url(r'^team/locations/$', 'events.views.team_event_locations'),
     url(r'^team/ical/$', 'events.views.teams_event_list_ical'),

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2012-06-30 19:19:08 +0000
+++ loco_directory/events/views.py	2012-06-30 22:47:18 +0000
@@ -5,7 +5,6 @@
 from django.contrib.auth.decorators import login_required
 from django.utils import simplejson
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
 from django.db.models import Count
 
 from events.models import TeamEvent
@@ -19,14 +18,13 @@
 from forms import AttendeeRegistrationForm
 from forms import FilterHistoryList
 
-from django.db.models import Q
-
 from common.utils import redirect, simple_iterator
 from common import launchpad
 
 import datetime
 import vobject
 
+
 def event_list(request):
     """
     a list with all events (teamevents and globalevents)
@@ -37,11 +35,12 @@
     context = {
         'team_event_list': team_event_list,
         'global_event_list': global_event_list,
-	'user_is_on_lc': is_on_lc,
+        'user_is_on_lc': is_on_lc,
     }
     return render_to_response('events/event_list.html', context,
                   RequestContext(request))
 
+
 def event_list_ical(events, name):
     """Return any list events as an ical"""
     filename = "%s.ics" % name.replace(' ', '-').lower()
@@ -57,9 +56,10 @@
     for event in events:
         event.as_ical(calendar)
     response.write(calendar.serialize())
-    
+
     return response
 
+
 def event_ical(request, team_slug, team_event_id):
     """
     Return a ical list with a single events in ical format.
@@ -67,6 +67,7 @@
     team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
     return event_list_ical([team_event_object], team_event_object.name)
 
+
 def team_event_list_ical(request, team_slug):
     """
     Return a ical list with a single team events in ical format.
@@ -75,18 +76,21 @@
     team_events = TeamEvent.objects.filter(teams__lp_name=team_slug)
     return event_list_ical(team_events, team.name)
 
+
 def teams_event_list_ical(request):
     """
     Return a ical list with team events in ical format.
     """
     return event_list_ical(TeamEvent.objects.all(), 'All Ubuntu LoCo Team Events')
 
+
 def global_event_list_ical(request):
     """
     Return a ical list with global events in ical format.
     """
     return event_list_ical(GlobalEvent.objects.all(), 'Ubuntu Global Events')
 
+
 def event_history_list(request):
     """
     a list with all historical events (teamevents and globalevents)
@@ -102,14 +106,13 @@
             scope = form.cleaned_data['scope']
 
             if u'my' in scope:
-                filtering_date = datetime.datetime.strptime(filtering,"%Y-%m")
+                filtering_date = datetime.datetime.strptime(filtering, "%Y-%m")
 
                 team_event_list = TeamEvent.objects.history_events().filter(date_begin__year=filtering_date.year, date_begin__month=filtering_date.month)
             elif u'y' in scope:
-                filtering_date = datetime.datetime.strptime(filtering,"%Y-%m")
+                filtering_date = datetime.datetime.strptime(filtering, "%Y-%m")
 
                 team_event_list = TeamEvent.objects.history_events().filter(date_begin__year=filtering_date.year)
-            
         else:
             team_event_list = TeamEvent.objects.history_events().select_related('global_event', 'venue')
 
@@ -127,10 +130,10 @@
     return render_to_response('events/event_history_list.html', context,
                   RequestContext(request))
 
+
 #################################################################
 # Team Events
 #################################################################
-
 def team_event_detail(request, team_slug, team_event_id):
     """
     detailed view for a team event
@@ -141,7 +144,7 @@
         is_member = is_member or launchpad.is_team_member(request.user, team_object)
 
     if request.user.is_authenticated():
-        if request.method == 'POST':                
+        if request.method == 'POST':
             form = TeamEventCommentForm(data=request.POST)
             if form.is_valid():
                 team_event_comment = form.save(commit=False)
@@ -151,7 +154,7 @@
                 team_event_comment.commenter_profile = profile
                 team_event_comment.save()
                 request.user.message_set.create(message=_('Comment saved.'))
-                return redirect( team_event_object )
+                return redirect(team_event_object)
         else:
             form = TeamEventCommentForm()
     else:
@@ -163,16 +166,17 @@
         'user_is_team_member': is_member,
         'form': form,
     }
-    return render_to_response('events/team_event_detail.html', 
+    return render_to_response('events/team_event_detail.html',
                                          context, RequestContext(request))
 
+
 @login_required
 def team_event_delete(request, team_slug, team_event_id):
     """
     delete a event
     """
     team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
-    
+
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     #check if user is admin or owner of a team
     is_contact = False
@@ -182,24 +186,25 @@
             break
 
     if is_on_lc or is_contact:
-        if request.method == 'POST':		
+        if request.method == 'POST':
             team_event_object.delete()
             request.user.message_set.create(message=_('Team Event removed.'))
-            return redirect( 'event-list' )
+            return redirect('event-list')
         else:
             context = {'team_event_object': team_event_object}
             return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))
 
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not remove this team event.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
-        return redirect( team_event_object )
+        return redirect(team_event_object)
+
 
 @login_required
 def team_event_select(request):
     teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()])
     if len(teams) == 0:
         request.user.message_set.create(message='%s %s' % (_('You can not add a new team event.'), _('You are not a member of any LoCo Teams.')))
-        return redirect( 'event-list' )
+        return redirect('event-list')
     elif len(teams) == 1:
         from django.core import urlresolvers
         url = urlresolvers.reverse('team-event-new', args=[teams[0].lp_name])
@@ -211,38 +216,40 @@
         context = {'teams': teams, 'global_event_id': request.GET.get('global_event_id', None)}
         return render_to_response('events/team_event_new_select.html', context, RequestContext(request))
 
+
 def team_events_rss(request, team_slug):
     team_object = get_object_or_404(Team, lp_name=team_slug)
     events = TeamEvent.objects.filter(teams__lp_name=team_slug, date_end__gt=datetime.datetime.now()).order_by('date_begin')[:15]
-    
+
     if request.META.has_key('wsgi.url_scheme'):
         scheme = request.META.get('wsgi.url_scheme')
     else:
         scheme = 'http'
-        
+
     if request.META.has_key('HTTP_HOST'):
         host = request.META.get('HTTP_HOST')
     else:
         host = request.META.get('SERVER_NAME')
-        
+
     if request.META.get('SERVER_PORT', 80) == 80 or request.META.get('SERVER_PORT', 80) == 0:
         base = '%s://%s' % (scheme, host)
     else:
         base = '%s://%s:%s' % (scheme, host, request.META.get('SERVER_PORT', 80))
-    
-    context = {'team_object': team_object, 'events': events, 'base':base}
+
+    context = {'team_object': team_object, 'events': events, 'base': base}
     return render_to_response('events/team_events_rss.xml', context, RequestContext(request), mimetype='application/xhtml+xml')
 
+
 @login_required
 def team_event_new(request, team_slug):
     """
     new team event
     """
     team_object = get_object_or_404(Team, lp_name=team_slug)
-    
+
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     is_member = launchpad.is_team_member(request.user, team_object)
-    
+
     if is_on_lc or is_member:
         global_event = None
         if request.method == 'POST':
@@ -250,37 +257,36 @@
             if form.is_valid():
                 team_event = form.save()
                 team_event.teams.add(team_object)
-                team_event_id = team_event.id 
                 return HttpResponseRedirect(team_event.get_absolute_url())
         else:
-            form = TeamEventForm(initial={'global_event':request.GET.get('global_event_id', None)}, teams=[team_object])
+            form = TeamEventForm(initial={'global_event': request.GET.get('global_event_id', None)}, teams=[team_object])
             if request.GET.has_key('global_event_id'):
                 global_event = get_object_or_404(GlobalEvent, pk=request.GET.get('global_event_id'))
-                
         context = {
             'team_object': team_object,
             'form': form,
             'global_event': global_event,
         }
-        return render_to_response('events/team_event_new.html', 
+        return render_to_response('events/team_event_new.html',
                                          context, RequestContext(request))
     else:
         # XXX: Once we move to a new ACL system, this needs fixing.
         request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.')))
-        return redirect( team_object )
+        return redirect(team_object)
+
 
 @login_required
 def team_event_copy(request, team_slug, team_event_id):
     """
     new team event
     """
-    
+
     team_event = get_object_or_404(TeamEvent, pk=team_event_id)
     team_object = team_event.teams.all()[0]
 
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     is_member = launchpad.is_team_member(request.user, team_object)
-    
+
     if is_on_lc or is_member:
         if request.method == 'POST':
             form = TeamEventForm(instance=team_event, data=request.POST, teams=team_event.teams.all())
@@ -288,21 +294,20 @@
             if form.is_valid():
                 team_event = form.save()
                 team_event.teams.add(team_object)
-                team_event_id = team_event.id 
                 return HttpResponseRedirect(team_event.get_absolute_url())
         else:
             form = TeamEventForm(instance=team_event, teams=team_event.teams.all())
-        
         context = {
             'team_object': team_object,
             'form': form,
         }
-        return render_to_response('events/team_event_new.html', 
+        return render_to_response('events/team_event_new.html',
                                          context, RequestContext(request))
     else:
         # XXX: Once we move to a new ACL system, this needs fixing.
         request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.')))
-        return redirect( team_object )
+        return redirect(team_object)
+
 
 @login_required
 def team_event_update(request, team_slug, team_event_id):
@@ -316,27 +321,28 @@
         if launchpad.is_team_member(request.user, team):
             is_member = True
             break
-    
+
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
-    
+
     if is_on_lc or is_member:
-        if request.method == 'POST':		
+        if request.method == 'POST':
             form = TeamEventForm(data=request.POST, instance=team_event_object, teams=team_event_object.teams.all())
             if form.is_valid():
                 form.save()
                 request.user.message_set.create(message=_('Team Event updated.'))
-                return redirect( team_event_object )
+                return redirect(team_event_object)
         else:
             form = TeamEventForm(instance=team_event_object, teams=team_event_object.teams.all())
-            
+
         context = {
             'form': form,
         }
-        return render_to_response('events/team_event_update.html', 
+        return render_to_response('events/team_event_update.html',
                                          context, RequestContext(request))
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not update this team event.'), _('You are not a member of the team or on the LoCo Council.')))
-        return redirect( team_event_object )
+        return redirect(team_event_object)
+
 
 @login_required
 def team_event_register(request, team_slug, team_event_id):
@@ -350,33 +356,32 @@
         from userprofiles.models import create_profile
         profile = create_profile(request.user.username)
         attendee_object = Attendee(team_event=team_event_object, attendee_profile=profile)
-        
-    if request.method == 'POST':        
+
+    if request.method == 'POST':
         form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST)
         if form.is_valid():
             form.save()
             request.user.message_set.create(message=_('Your registration has been saved.'))
-            return redirect( team_event_object )
+            return redirect(team_event_object)
     else:
-        form = AttendeeRegistrationForm(instance=attendee_object, initial={'guests':0})
+        form = AttendeeRegistrationForm(instance=attendee_object, initial={'guests': 0})
 
     is_past_event = False
     if team_event_object.date_end < datetime.datetime.now():
-        is_past_event = True    
-    
+        is_past_event = True
+
     context = {
            'form': form,
            'is_past_event': is_past_event,
     }
 
-    return render_to_response('events/team_event_register.html', 
+    return render_to_response('events/team_event_register.html',
                                      context, RequestContext(request))
 
 
 #################################################################
 # Global Events
 #################################################################
-
 def global_event_detail(request, global_event_id):
     """
     detailed view for a global event
@@ -387,7 +392,6 @@
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
 
     events_without_venue = global_event_object.teamevent_set.filter(venue__isnull=True)
-    events_without_continent = global_event_object.teamevent_set.filter(venue__country__continents__isnull=True)
     country_ids = [a.venue.country.id for a in global_event_object.teamevent_set.filter(venue__isnull=False,
                                                                                 venue__country__continents__isnull=False)]
     country_without_continents_ids = [a.venue.country.id \
@@ -406,35 +410,37 @@
         'global_event_object': global_event_object,
         'add_team_event': add_team_event,
         'events_without_venue': events_without_venue,
-    	'user_is_on_lc': is_on_lc,
+        'user_is_on_lc': is_on_lc,
         'continents': continents,
         'countries': countries,
         'countries_without_continents': countries_without_continents,
-        'colcycle' : simple_iterator('col_left', 'col_right'),
+        'colcycle': simple_iterator('col_left', 'col_right'),
     }
-    return render_to_response('events/global_event_detail.html', 
+    return render_to_response('events/global_event_detail.html',
                                          context, RequestContext(request))
 
+
 @login_required
 def global_event_delete(request, global_event_id):
     """
     delete a event
     """
     global_event_object = get_object_or_404(GlobalEvent, pk=global_event_id)
-    
+
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
-    
+
     if is_on_lc:
-        if request.method == 'POST':		
+        if request.method == 'POST':
             global_event_object.delete()
             request.user.message_set.create(message=_('Global Event removed.'))
-            return redirect( 'event-list' )
+            return redirect('event-list')
         else:
             context = {'global_event_object': global_event_object}
             return render_to_response('events/global_event_delete_confirm.html', context, RequestContext(request))
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not remove this global event.'), _('You are not on the LoCo Council.')))
-        return redirect( global_event_object )
+        return redirect(global_event_object)
+
 
 @login_required
 def global_event_new(request,):
@@ -443,23 +449,24 @@
     """
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     if is_on_lc:
-        if request.method == 'POST':		
+        if request.method == 'POST':
             form = GlobalEventForm(data=request.POST)
             if form.is_valid():
                 form.save()
                 request.user.message_set.create(message=_('New Global Event created.'))
-                return redirect( 'event-list' )
+                return redirect('event-list')
         else:
             form = GlobalEventForm()
-        
+
         context = {
             'form': form,
         }
-        return render_to_response('events/global_event_new.html', 
+        return render_to_response('events/global_event_new.html',
                                          context, RequestContext(request))
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not add a new global event.'), _('You are not on the LoCo Council.')))
-        return redirect( 'event-list' )
+        return redirect('event-list')
+
 
 @login_required
 def global_event_update(request, global_event_id):
@@ -467,26 +474,27 @@
     update global event
     """
     global_event_object = get_object_or_404(GlobalEvent, pk=global_event_id)
-    
+
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     if is_on_lc:
-        if request.method == 'POST':		
+        if request.method == 'POST':
             form = GlobalEventForm(data=request.POST, instance=global_event_object)
             if form.is_valid():
                 form.save()
                 request.user.message_set.create(message=_('Global Event updated.'))
-                return redirect( global_event_object )
+                return redirect(global_event_object)
         else:
             form = GlobalEventForm(instance=global_event_object)
-        
+
         context = {
             'form': form,
         }
-        return render_to_response('events/global_event_update.html', 
+        return render_to_response('events/global_event_update.html',
                                          context, RequestContext(request))
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not update this global event.'), _('You are not on the LoCo Council.')))
-        return redirect( global_event_object )
+        return redirect(global_event_object)
+
 
 def team_event_locations(request):
     """
@@ -501,8 +509,8 @@
         if event.venue is None:
             continue
         location['content'] = '<p>Location: <a href="%s">%s</a></p><p>Start date: %s</p><p>End date: %s</p>' % (event.get_absolute_url(),
-                                                                                                                event.venue.name, 
-                                                                                                                str(event.date_begin), 
+                                                                                                                event.venue.name,
+                                                                                                                str(event.date_begin),
                                                                                                                 str(event.date_end))
         location['lng'] = event.venue.longitude
         location['lat'] = event.venue.latitude
@@ -511,7 +519,8 @@
     json = simplejson.dumps(locations)
 
     return HttpResponse(json)
-    
+
+
 def global_event_locations(request, global_event_id):
     """
     the longitude and latitude global event
@@ -524,8 +533,8 @@
         location['title'] = event.name
         # TODO: create an separate view with template for the content
         location['content'] = '<p>Location: <a href="%s">%s</a></p><p>Start date: %s</p><p>End date: %s</p>' % (event.get_absolute_url(),
-                                                                                                                event.venue.name, 
-                                                                                                                str(event.date_begin), 
+                                                                                                                event.venue.name,
+                                                                                                                str(event.date_begin),
                                                                                                                 str(event.date_end))
         location['lng'] = event.venue.longitude
         location['lat'] = event.venue.latitude
@@ -534,7 +543,8 @@
     json = simplejson.dumps(locations)
 
     return HttpResponse(json)
-    
+
+
 def global_jam(request):
     try:
         global_event_object = GlobalEvent.objects.filter(name='Ubuntu Global Jam').order_by('-date_begin')[0]
@@ -542,6 +552,7 @@
         raise Http404
     return global_event_detail(request, global_event_object.id)
 
+
 def global_jam_dashboard(request):
     try:
         global_event_object = GlobalEvent.objects.filter(name='Ubuntu Global Jam').order_by('-date_begin')[0]
@@ -552,4 +563,3 @@
         'global_event_object': global_event_object,
     }
     return render_to_response('events/global_jam_dashboard.html', context, RequestContext(request))
-