summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/blog/views.py4
-rw-r--r--app/photos/views.py8
2 files changed, 6 insertions, 6 deletions
diff --git a/app/blog/views.py b/app/blog/views.py
index bfdc593..02acef4 100644
--- a/app/blog/views.py
+++ b/app/blog/views.py
@@ -42,7 +42,7 @@ def entry_list(request,page):
'page':page,
'MEDIA_URL': settings.BAKED_MEDIA_URL
}
- except:
+ except KeyError:
extra_context={'page':page}
qs = Entry.objects.filter(status__exact=1).order_by('-pub_date').select_related()
return object_list(request, queryset=qs, template_name='archives/writing.html',extra_context=extra_context)
@@ -68,7 +68,7 @@ def entry_list_by_area(request,slug,page):
try:
region = Region.objects.get(slug__exact=slug)
qs = Entry.objects.filter(status__exact=1,region = region).order_by('-pub_date')
- except:
+ except KeyError:
region = Country.objects.get(slug__exact=slug)
qs = Entry.objects.filter(status__exact=1,location__state__country = region).order_by('-pub_date')
if not region:
diff --git a/app/photos/views.py b/app/photos/views.py
index be97810..7d10841 100644
--- a/app/photos/views.py
+++ b/app/photos/views.py
@@ -3,7 +3,7 @@ from django.template import RequestContext
from django.views.generic.list_detail import object_list
from django.http import Http404,HttpResponse
from django.core import serializers
-
+from django.conf import settings
from photos.models import Photo,PhotoGallery
from locations.models import Country, Region
@@ -16,12 +16,12 @@ def gallery_list(request,page):
qs = PhotoGallery.objects.all()
try:
is_build = request.POST['builder']
- extra_context={
+ extra_context= {
'page':page,
'MEDIA_URL': settings.BAKED_MEDIA_URL
}
- except:
- extra_context={'page':page}
+ except KeyError:
+ extra_context={'page':page,}
return object_list(request, queryset=qs, template_name='archives/photos.html',extra_context=extra_context)
def gallery(request,slug):