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

[Adnane Belmadiaf]

Pep8 fixes for the events app

=== modified file 'loco_directory/events/admin.py'
--- loco_directory/events/admin.py	2009-12-21 20:45:43 +0000
+++ loco_directory/events/admin.py	2012-12-04 22:33:21 +0000
@@ -1,5 +1,6 @@
+# -*- coding: utf-8 -*-
 from django.contrib import admin
-from events.models import *
+from .models import *
 
 admin.site.register(Venue)
 admin.site.register(GlobalEvent)

=== modified file 'loco_directory/events/feeds.py'
--- loco_directory/events/feeds.py	2012-11-26 23:07:59 +0000
+++ loco_directory/events/feeds.py	2012-12-04 22:33:21 +0000
@@ -1,12 +1,14 @@
-from django.core.exceptions import ObjectDoesNotExist
+# -*- coding: utf-8 -*-
 from django.core.urlresolvers import reverse
 from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
 from django.utils.translation import ugettext as _
-from events.models import TeamEvent, GlobalEvent
+
 from teams.models import Team
+from .models import TeamEvent, GlobalEvent
 
 import datetime
 
+
 class TeamEventFeed(Feed):
     def get_object(self, bits):
         if len(bits) >= 1:
@@ -16,15 +18,15 @@
                 try:
                     return Team.objects.get(lp_name=bits[0])
                 except:
-                    raise ObjectDoesNotExist
+                    raise FeedDoesNotExist
         return None
-    
+
     def items(self, obj):
         if isinstance(obj, Team):
             return TeamEvent.objects.filter(teams=obj, date_end__gt=datetime.datetime.now()).order_by('-date_begin')[:15]
         else:
             return TeamEvent.objects.filter(date_end__gt=datetime.datetime.now()).order_by('-date_begin')[:15]
-        
+
     def title(self, obj):
         if isinstance(obj, Team):
             return _('Upcoming Events for %(teamname)s' % {'teamname': obj.name})
@@ -44,7 +46,7 @@
             return GlobalEvent.objects.filter(teamevent__teams=obj, date_end__gt=datetime.datetime.now()).order_by('-date_begin')[:15]
         else:
             return GlobalEvent.objects.filter(date_end__gt=datetime.datetime.now()).order_by('-date_begin')[:15]
-        
+
     def title(self, obj):
         if isinstance(obj, Team):
             return _('Upcoming Global Events where %(teamname)s is participating' % {'teamname': obj.name})

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2012-07-14 20:07:11 +0000
+++ loco_directory/events/forms.py	2012-12-04 22:33:21 +0000
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
-
 from django import forms
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 
-from models import BaseEvent, GlobalEvent, TeamEvent, Attendee, TeamEventComment
+from .models import BaseEvent, GlobalEvent, TeamEvent, Attendee, TeamEventComment
 from venues.models import Venue
 from common.forms import RenderableMixin
 from userprofiles.models import UserProfile
 
 import itertools
 
+
 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]):

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2012-12-03 22:19:34 +0000
+++ loco_directory/events/models.py	2012-12-04 22:33:21 +0000
@@ -9,7 +9,7 @@
 from common.shortcuts import queryset_sum, queryset_count
 from common.mixins import LocalTimeMixin
 
-from managers import GlobalEventManager, TeamEventManager
+from .managers import GlobalEventManager, TeamEventManager
 
 ATTENDEE_PROMISE_CHOICES = (
     ('sure', _('attending')),

=== modified file 'loco_directory/events/tests.py'
--- loco_directory/events/tests.py	2012-06-30 23:44:14 +0000
+++ loco_directory/events/tests.py	2012-12-04 22:33:21 +0000
@@ -1,16 +1,18 @@
+# -*- coding: utf-8 -*-
 """
 This file demonstrates two different styles of tests (one doctest and one
 unittest). These will both pass when you run "manage.py test".
 
 Replace these with more appropriate tests for your application.
 """
-import datetime
-
 from django.test import TestCase
 from django.contrib.auth.models import User, Group
+
 from teams.models import Country, Team
 from venues.models import Venue
-from events.models import TeamEvent
+from .models import TeamEvent
+
+import datetime
 
 
 class FormTests(TestCase):

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2012-11-28 00:46:29 +0000
+++ loco_directory/events/urls.py	2012-12-04 22:33:21 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from django.conf.urls.defaults import *
 
 urlpatterns = patterns('',

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2012-11-28 00:46:29 +0000
+++ loco_directory/events/views.py	2012-12-04 22:33:21 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from django.template import RequestContext
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, redirect, get_object_or_404
@@ -6,15 +7,11 @@
 from django.utils.translation import ugettext as _
 from django.db.models import Count
 
-from events.models import TeamEvent
-from events.models import GlobalEvent
+from .models import (TeamEvent, GlobalEvent, Attendee, TeamEventComment)
 from teams.models import Team, Country, Continent
-from events.models import Attendee, TeamEventComment
 
-from forms import TeamEventForm
-from forms import TeamEventCommentForm
-from forms import GlobalEventForm
-from forms import AttendeeRegistrationForm
+from .forms import (TeamEventForm, TeamEventCommentForm,
+                    GlobalEventForm, AttendeeRegistrationForm)
 
 from common.utils import simple_iterator
 from common.forms import FilterHistoryList
@@ -548,24 +545,18 @@
 
 
 def global_jam(request):
-    try:
-        global_event_object = GlobalEvent.objects.filter(name='Ubuntu Global Jam').order_by('-date_begin')[0]
-    except IndexError:
-        raise Http404
+    global_event_object = get_list_or_404(GlobalEvent.objects.order_by('-date_begin'), name='Ubuntu Global Jam')[0]
     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]
-    except IndexError:
-        raise Http404
-
+    global_event_object = get_list_or_404(GlobalEvent.objects.order_by('-date_begin'), name='Ubuntu Global Jam')[0]
     context = {
         'global_event_object': global_event_object,
     }
     return render_to_response('events/global_jam_dashboard.html', context, RequestContext(request))
 
+
 @login_required
 def team_event_comment_edit(request):
     """
@@ -583,15 +574,16 @@
                     comment_obj.save()
                     response_dict.update({'success': True, 'response': comment_obj.comment})
                 else:
-                    response_dict.update({'success': False, 'response': _('Your are not authorized to edit this comment.') })
+                    response_dict.update({'success': False, 'response': _('Your are not authorized to edit this comment.')})
             except TeamEventComment.DoesNotExist:
-                response_dict.update({'success': False, 'response': _('This comment does not exist.') })
+                response_dict.update({'success': False, 'response': _('This comment does not exist.')})
         else:
-            response_dict.update({'success': False, 'response': _('Missing arguments.') })
+            response_dict.update({'success': False, 'response': _('Missing arguments.')})
     else:
-        response_dict.update({'success': False, 'response': _('You can\'t edit this comment using this method.') })
+        response_dict.update({'success': False, 'response': _('You can\'t edit this comment using this method.')})
     return HttpResponse(simplejson.dumps(response_dict), mimetype='application/json')
 
+
 @login_required
 def team_event_comment_delete(request, pk):
     """
@@ -602,8 +594,10 @@
     if comment.commenter_profile.user == request.user:
         comment.delete()
         request.user.message_set.create(message=_('Your comment has been removed.'))
-        if next: redirect_to = next
-        else: redirect_to = '/'
+        if next:
+            redirect_to = next
+        else:
+            redirect_to = '/'
         return redirect(redirect_to)
     else:
         raise Http404