Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
5f5421ca
Commit
5f5421ca
authored
Oct 30, 2017
by
Tom van Bussel
Browse files
Merge branch 'fix/flake8-bare-except-specific' into 'master'
Use more specific exceptions and include context See merge request
!618
parents
e33e6550
34135e5c
Changes
3
Hide whitespace changes
Inline
Side-by-side
website/events/api/viewsets.py
View file @
5f5421ca
...
...
@@ -13,6 +13,7 @@ from rest_framework.permissions import (
)
from
rest_framework.response
import
Response
from
rest_framework.viewsets
import
GenericViewSet
from
pytz.exceptions
import
InvalidTimeError
from
events
import
services
from
events.api.permissions
import
UnpublishedEventPermissions
...
...
@@ -34,8 +35,8 @@ def _extract_date_range(request):
end
=
timezone
.
make_aware
(
datetime
.
strptime
(
request
.
query_params
[
'end'
],
'%Y-%m-%d'
)
)
except
Exception
:
raise
ParseError
(
detail
=
'start or end query parameters invalid'
)
except
(
ValueError
,
KeyError
,
InvalidTimeError
)
as
e
:
raise
ParseError
(
detail
=
'start or end query parameters invalid'
)
from
e
return
end
,
start
...
...
website/members/api/viewsets.py
View file @
5f5421ca
...
...
@@ -7,6 +7,7 @@ from rest_framework import viewsets, filters
from
rest_framework.decorators
import
list_route
from
rest_framework.exceptions
import
ParseError
from
rest_framework.response
import
Response
from
pytz.exceptions
import
InvalidTimeError
from
members.api.serializers
import
(
MemberBirthdaySerializer
,
MemberRetrieveSerializer
,
...
...
@@ -63,8 +64,9 @@ class MemberViewset(viewsets.ReadOnlyModelViewSet):
end
=
timezone
.
make_aware
(
datetime
.
strptime
(
request
.
query_params
[
'end'
],
'%Y-%m-%d'
)
)
except
Exception
:
raise
ParseError
(
detail
=
'start or end query parameters invalid'
)
except
(
ValueError
,
KeyError
,
InvalidTimeError
)
as
e
:
raise
ParseError
(
detail
=
'start or end query parameters invalid'
)
from
e
queryset
=
(
Member
.
active_members
...
...
website/partners/api/viewsets.py
View file @
5f5421ca
...
...
@@ -7,6 +7,7 @@ from rest_framework.exceptions import ParseError
from
rest_framework.permissions
import
IsAuthenticatedOrReadOnly
,
\
IsAuthenticated
from
rest_framework.response
import
Response
from
pytz.exceptions
import
InvalidTimeError
from
partners.api.serializers
import
PartnerEventCalendarJSSerializer
,
\
PartnerEventSerializer
,
PartnerSerializer
...
...
@@ -21,8 +22,8 @@ def _extract_date_range(request):
end
=
timezone
.
make_aware
(
datetime
.
strptime
(
request
.
query_params
[
'end'
],
'%Y-%m-%d'
)
)
except
Exception
:
raise
ParseError
(
detail
=
'start or end query parameters invalid'
)
except
(
ValueError
,
KeyError
,
InvalidTimeError
)
as
e
:
raise
ParseError
(
detail
=
'start or end query parameters invalid'
)
from
e
return
end
,
start
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment