Skip to content
Snippets Groups Projects
Commit d9bc1d88 authored by Branson Craig Stephens's avatar Branson Craig Stephens
Browse files

Changes required for upgrade to Rest Framework 3.3

parent 8a7e0c6f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
gracedb/api.py
+ 34
− 30
View file @ d9bc1d88
...@@ -152,10 +152,10 @@ def event_and_auth_required(view): ...@@ -152,10 +152,10 @@ def event_and_auth_required(view):
def pipeline_auth_required(view): def pipeline_auth_required(view):
@wraps(view) @wraps(view)
def inner(self, request, *args, **kwargs): def inner(self, request, *args, **kwargs):
group_name = request.POST.get('group', None) group_name = request.data.get('group', None)
if not group_name=='Test': if not group_name=='Test':
try: try:
pipeline = Pipeline.objects.get(name=request.POST['pipeline']) pipeline = Pipeline.objects.get(name=request.data['pipeline'])
except: except:
return Response({'error': "Please provide a valid pipeline."}, return Response({'error': "Please provide a valid pipeline."},
status = status.HTTP_400_BAD_REQUEST) status = status.HTTP_400_BAD_REQUEST)
...@@ -399,11 +399,11 @@ class EventList(APIView): ...@@ -399,11 +399,11 @@ class EventList(APIView):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
"""I am the GET docstring for EventList""" """I am the GET docstring for EventList"""
query = request.QUERY_PARAMS.get("query") query = request.query_params.get("query")
count = request.QUERY_PARAMS.get("count", PAGINATE_BY) count = request.query_params.get("count", PAGINATE_BY)
start = request.QUERY_PARAMS.get("start", 0) start = request.query_params.get("start", 0)
sort = request.QUERY_PARAMS.get("sort", "-created") sort = request.query_params.get("sort", "-created")
columns = request.QUERY_PARAMS.get("columns", "") columns = request.query_params.get("columns", "")
events = Event.objects events = Event.objects
if query: if query:
...@@ -495,24 +495,28 @@ class EventList(APIView): ...@@ -495,24 +495,28 @@ class EventList(APIView):
# Eventually, we will want to get rid of this check and just let it fail. # Eventually, we will want to get rid of this check and just let it fail.
rv = {} rv = {}
rv['warnings'] = [] rv['warnings'] = []
if 'type' in request.POST: if 'type' in request.data:
request = fix_old_creation_request(request) request = fix_old_creation_request(request)
rv['warnings'] += ['It looks like you are using the old GraceDB client (v<=1.14). ' + \ rv['warnings'] += ['It looks like you are using the old GraceDB client (v<=1.14). ' + \
'Please update! This will eventually stop working.'] 'Please update! This will eventually stop working.']
# Check user authorization for pipeline. # Check user authorization for pipeline.
# XXX This is a temporary hack until they roll out the new client. # XXX This is a temporary hack until they roll out the new client.
group_name = request.POST.get('group', None) group_name = request.data.get('group', None)
if not group_name=='Test': if not group_name=='Test':
try: try:
pipeline = Pipeline.objects.get(name=request.POST['pipeline']) pipeline = Pipeline.objects.get(name=request.data['pipeline'])
except: except:
return Response({'error': "Please provide a valid pipeline."}, return Response({'error': "Please provide a valid pipeline."},
status = status.HTTP_400_BAD_REQUEST) status = status.HTTP_400_BAD_REQUEST)
if not user_has_perm(request.user, "populate", pipeline): if not user_has_perm(request.user, "populate", pipeline):
return HttpResponseForbidden("You don't have permission on this pipeline.") return HttpResponseForbidden("You don't have permission on this pipeline.")
form = CreateEventForm(request.POST, request.FILES) # The following looks a bit funny but it is actually necessary. The
# django form expects a dict containing the POST data as the first
# arg, and a dict containing the FILE data as the second. In the
# django-restframework, however, both are in request.data
form = CreateEventForm(request.data, request.data)
if form.is_valid(): if form.is_valid():
event, warnings = _createEventFromForm(request, form) event, warnings = _createEventFromForm(request, form)
if event: if event:
...@@ -610,22 +614,22 @@ class EventDetail(APIView): ...@@ -610,22 +614,22 @@ class EventDetail(APIView):
return Response(str(e)) return Response(str(e))
# messages = [] # messages = []
# if event.group.name != request.DATA['group']: # if event.group.name != request.data['group']:
# messages += [ # messages += [
# "Existing event group ({0}) does not match " # "Existing event group ({0}) does not match "
# "replacement event group ({1})".format( # "replacement event group ({1})".format(
# event.group.name, request.DATA['group'])] # event.group.name, request.data['group'])]
# if event.analysisType != request.DATA['type']: # if event.analysisType != request.data['type']:
# messages += [ # messages += [
# "Existing event type ({0}) does not match " # "Existing event type ({0}) does not match "
# "replacement event type ({1})".format( # "replacement event type ({1})".format(
# event.analysisType, request.DATA['type'])] # event.analysisType, request.data['type'])]
# if messages: # if messages:
# return Response("\n".join(messages), # return Response("\n".join(messages),
# status=status.HTTP_400_BAD_REQUEST) # status=status.HTTP_400_BAD_REQUEST)
# XXX handle duplicate file names. # XXX handle duplicate file names.
f = request.FILES['eventFile'] f = request.data['eventFile']
uploadDestination = os.path.join(event.datadir(), f.name) uploadDestination = os.path.join(event.datadir(), f.name)
fdest = VersionedFile(uploadDestination, 'w') fdest = VersionedFile(uploadDestination, 'w')
#for chunk in f.chunks(): #for chunk in f.chunks():
...@@ -668,8 +672,8 @@ class EventNeighbors(APIView): ...@@ -668,8 +672,8 @@ class EventNeighbors(APIView):
# and TSV renderers. # and TSV renderers.
@event_and_auth_required @event_and_auth_required
def get(self, request, event): def get(self, request, event):
if request.QUERY_PARAMS.has_key('neighborhood'): if request.query_params.has_key('neighborhood'):
delta = request.QUERY_PARAMS['neighborhood'] delta = request.query_params['neighborhood']
try: try:
if delta.find(',') < 0: if delta.find(',') < 0:
neighborhood = (int(delta), int(delta)) neighborhood = (int(delta), int(delta))
...@@ -780,8 +784,8 @@ class EventLogList(APIView): ...@@ -780,8 +784,8 @@ class EventLogList(APIView):
@event_and_auth_required @event_and_auth_required
def post(self, request, event): def post(self, request, event):
message = request.DATA.get('message') message = request.data.get('message')
tagnames = request.DATA.get('tagname', None) tagnames = request.data.get('tagname', None)
# Convert tagnames from comma separated list. # Convert tagnames from comma separated list.
if tagnames: if tagnames:
tagnames = tagnames.split(',') tagnames = tagnames.split(',')
...@@ -789,7 +793,7 @@ class EventLogList(APIView): ...@@ -789,7 +793,7 @@ class EventLogList(APIView):
tagnames = [] tagnames = []
try: try:
uploadedFile = request.FILES['upload'] uploadedFile = request.data['upload']
self.check_object_permissions(self.request, event) self.check_object_permissions(self.request, event)
except: except:
uploadedFile = None uploadedFile = None
...@@ -913,7 +917,7 @@ class EMBBEventLogList(APIView): ...@@ -913,7 +917,7 @@ class EMBBEventLogList(APIView):
@event_and_auth_required @event_and_auth_required
def post(self, request, event): def post(self, request, event):
try: try:
eel = create_eel(request.DATA, event, request.user) eel = create_eel(request.data, event, request.user)
except ValueError, e: except ValueError, e:
return Response("%s" % str(e), status=status.HTTP_400_BAD_REQUEST) return Response("%s" % str(e), status=status.HTTP_400_BAD_REQUEST)
except IntegrityError, e: except IntegrityError, e:
...@@ -969,7 +973,7 @@ class EMObservationList(APIView): ...@@ -969,7 +973,7 @@ class EMObservationList(APIView):
# XXX Note the following hack. # XXX Note the following hack.
# If this JSON information is requested for skymapViewer, use a different # If this JSON information is requested for skymapViewer, use a different
# representation for backwards compatibility. # representation for backwards compatibility.
if 'skymapViewer' in request.QUERY_PARAMS.keys(): if 'skymapViewer' in request.query_params.keys():
emo = [ skymapViewerEMObservationToDict(emo, request) emo = [ skymapViewerEMObservationToDict(emo, request)
for emo in emo_set.iterator() ] for emo in emo_set.iterator() ]
...@@ -1218,7 +1222,7 @@ class EventLogTagDetail(APIView): ...@@ -1218,7 +1222,7 @@ class EventLogTagDetail(APIView):
try: try:
tag = Tag.objects.filter(name=tagname)[0] tag = Tag.objects.filter(name=tagname)[0]
except: except:
displayName = request.DATA.get('displayName') displayName = request.data.get('displayName')
tag = Tag(name=tagname, displayName=displayName) tag = Tag(name=tagname, displayName=displayName)
tag.save() tag.save()
...@@ -1733,7 +1737,7 @@ class Files(APIView): ...@@ -1733,7 +1737,7 @@ class Files(APIView):
try: try:
# Open / Write the file. # Open / Write the file.
fdest = VersionedFile(filepath, 'w') fdest = VersionedFile(filepath, 'w')
f = request.FILES['upload'] f = request.data['upload']
for chunk in f.chunks(): for chunk in f.chunks():
fdest.write(chunk) fdest.write(chunk)
fdest.close() fdest.close()
...@@ -1851,16 +1855,16 @@ class VOEventList(APIView): ...@@ -1851,16 +1855,16 @@ class VOEventList(APIView):
@event_and_auth_required @event_and_auth_required
def post(self, request, event): def post(self, request, event):
voevent_type = request.DATA.get('voevent_type', None) voevent_type = request.data.get('voevent_type', None)
if not voevent_type: if not voevent_type:
msg = "You must provide a valid voevent_type." msg = "You must provide a valid voevent_type."
return Response({'error': msg}, status = status.HTTP_400_BAD_REQUEST) return Response({'error': msg}, status = status.HTTP_400_BAD_REQUEST)
internal = request.DATA.get('internal', 1) internal = request.data.get('internal', 1)
skymap_type = request.DATA.get('skymap_type', None) skymap_type = request.data.get('skymap_type', None)
skymap_filename = request.DATA.get('skymap_filename', None) skymap_filename = request.data.get('skymap_filename', None)
skymap_image_filename = request.DATA.get('skymap_image_filename', None) skymap_image_filename = request.data.get('skymap_image_filename', None)
if (skymap_filename and not skymap_type) or (skymap_type and not skymap_filename): if (skymap_filename and not skymap_type) or (skymap_type and not skymap_filename):
msg = "Both or neither of skymap_time and skymap_filename must be specified." msg = "Both or neither of skymap_time and skymap_filename must be specified."
......
gracedb/view_logic.py
+ 2
− 2
View file @ d9bc1d88
...@@ -414,10 +414,10 @@ def create_eel(d, event, user): ...@@ -414,10 +414,10 @@ def create_eel(d, event, user):
# Create an EMBB Observaton Record # Create an EMBB Observaton Record
# #
def create_emobservation(request, event): def create_emobservation(request, event):
d = getattr(request, 'DATA', None) d = getattr(request, 'data', None)
if not d: if not d:
d = getattr(request, 'POST', None) d = getattr(request, 'POST', None)
# Still haven't got the d? # Still haven't got the data?
if not d: if not d:
raise ValueError('create_emobservation: got no post data from the request.') raise ValueError('create_emobservation: got no post data from the request.')
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment