[FIX] Elias fixes on api.py

f83c6c65 · Administrator · 341f45ec · f83c6c65
Commit f83c6c65 authored May 29, 2015 by Administrator
Show whitespace changes
Inline Side-by-side

Showing with 18 additions and 23 deletions

api.py gargantext_web/api.py +18 -23

No files found.
--- a/gargantext_web/api.py
+++ b/gargantext_web/api.py
-from django.http import HttpResponseNotFound, HttpResponse, Http404
+from django.http import HttpResponse, Http404
 from django.core.exceptions import PermissionDenied, SuspiciousOperation
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse

-from django.db.models import Avg, Max, Min, Count, Sum
-# from node.models import Language, ResourceType, Resource
-# from node.models import Node, NodeType, Node_Resource, Project, Corpus
-
-from sqlalchemy import text, distinct
 from sqlalchemy.sql import func
 from sqlalchemy.orm import aliased

@@ -15,6 +10,7 @@ from gargantext_web.views import move_to_trash
 from .db import *
 from node import models

+
 def DebugHttpResponse(data):
    return HttpResponse('<html><body style="background:#000;color:#FFF"><pre>%s</pre></body></html>' % (str(data), ))

@@ -49,7 +45,6 @@ _ngrams_order_columns = {


 from rest_framework.authentication import SessionAuthentication, BasicAuthentication
-from rest_framework.permissions import IsAuthenticated
 from rest_framework.views import APIView
 from rest_framework.response import Response
 from rest_framework.exceptions import APIException as _APIException
@@ -128,8 +123,10 @@ class NodesChildrenNgrams(APIView):

 class NodesChildrenDuplicates(APIView):

-    def _fetch_duplicates(self, request, node_id, extra_columns=[], min_count=1):
+    def _fetch_duplicates(self, request, node_id, extra_columns=None, min_count=1):
        # input validation
+        if extra_columns is None:
+            extra_columns = []
        if 'keys' not in request.GET:
            raise APIException('Missing GET parameter: "keys"', 400)
        keys = request.GET['keys'].split(',')
@@ -667,5 +664,3 @@ class CorpusController:
            )
        else:
            raise ValidationError('Unrecognized "format=%s", should be "csv" or "json"' % (format, ))
-
-