Skip to content

Commit

Permalink
Changed the way DoesNotExist exceptions are handled
Browse files Browse the repository at this point in the history
  • Loading branch information
jay committed Mar 12, 2014
1 parent 767ed7f commit 9594685
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions tavern/views.py
@@ -1,6 +1,5 @@
""" Opentavern Views"""
from django.utils import timezone
from django.core.exceptions import ObjectDoesNotExist
from django.shortcuts import render, redirect
from django.views.generic.edit import UpdateView
from django.contrib.auth.decorators import login_required
Expand Down Expand Up @@ -55,22 +54,22 @@ def group_details(request, slug):
Member.objects.get(tavern_group=TavernGroup.objects.get(slug=slug),
user=request.user)
user_is_member = True
except ObjectDoesNotExist:
except Member.DoesNotExist:
user_is_member = False
context.update({'user_is_member': user_is_member})

try:
tavern_group = TavernGroup.objects.get(slug=slug, creator=request.user)
user_is_creator = True
except ObjectDoesNotExist:
except TavernGroup.DoesNotExist:
user_is_creator = False
context.update({'user_is_creator': user_is_creator})

try:
recent_group_members = Member.objects.filter(
tavern_group=TavernGroup.objects.get(slug=slug)
).order_by('-join_date')[:5]
except ObjectDoesNotExist:
except Member.DoesNotExist:
user_is_member = False
raise Http404

Expand All @@ -94,7 +93,7 @@ def tavern_toggle_member(request):
member = Member.objects.get(user=user, tavern_group=group)
response = "Join Group"
member.delete()
except ObjectDoesNotExist:
except Member.DoesNotExist:
member = Member.objects.create(
user=user,
tavern_group=group,
Expand All @@ -115,7 +114,7 @@ def event_details(request, slug):
event = Event.objects.get(slug=slug, creator=request.user)
# condition to test if the event has already started.
editable = event.starts_at > timezone.now()
except ObjectDoesNotExist:
except Event.DoesNotExist:
editable = False
context.update({'editable': editable})

Expand Down

0 comments on commit 9594685

Please sign in to comment.