Another Step in the Quest to clean up the code base.

src/mahjong_ranking/views.py

@@ -1,18 +1,19 @@
 # -*- encoding: utf-8 -*-
 from datetime import date
 
-from django.contrib import auth
-from django.core.urlresolvers import reverse
 import django.forms
 import django.http
+from django.contrib import auth
+from django.contrib.auth.mixins import LoginRequiredMixin, \
+    PermissionRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
+from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from django.views import generic
 
 from events.models import Event
-from events.views import EventDetailMixin
+from events.mixins import EventDetailMixin
 from . import forms, models
-from utils.mixins import LoginRequiredMixin, PermissionRequiredMixin
 
 kyu_dan_order = {
     '+full_name': ('user__last_name', 'user__first_name'),
@@ -135,7 +136,6 @@ class EventRankingList(EventDetailMixin, generic.ListView):
 
 
 class MahjongMixin(object):
-
     def get_context_data(self, **kwargs):
         context = super(MahjongMixin, self).get_context_data(**kwargs)
         try:
@@ -149,7 +149,7 @@ class MahjongMixin(object):
             'latest_hanchan_list'] = \
             models.Hanchan.objects.confirmed_hanchans()[
             :3]
-        context['latest_event_list'] = Event.objects.latest_events(num=3)
+        context['latest_event_list'] = Event.objects.upcoming(limit=3)
         return context
 
 
@@ -239,6 +239,7 @@ class PlayerKyuScore(PlayerScore):
 
 
 class PlayerLadderScore(PlayerScore):
+    season = None
     template_name = 'mahjong_ranking/player_ladder_score.html'
 
     def get_context_data(self, **kwargs):
@@ -250,10 +251,9 @@ class PlayerLadderScore(PlayerScore):
         return context
 
     def get_queryset(self, **kwargs):
-        try:
-            self.season = int(self.request.GET.get('season'))
-        except:
-            self.season = date.today().year
+        self.season = int(self.request.GET.get('season', date.today().year))
         hanchan_list = models.Hanchan.objects.season_hanchans(
-            user=self.user, season=self.season)
+            user=self.user,
+            season=self.season
+        )
         return hanchan_list