X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rest%2F__init__.py;h=fccfede72299bf4fb050e56a5354f6885016a07b;hb=07bad1e2f69df285d8764eb2d243b31d8e6c8e3d;hp=9a28ad64c6e2c50af6cc184d550d25f1e4600322;hpb=29a9340139de5dc9537985c0fefa145b0b1c2afd;p=myslice.git diff --git a/rest/__init__.py b/rest/__init__.py index 9a28ad64..fccfede7 100644 --- a/rest/__init__.py +++ b/rest/__init__.py @@ -1,15 +1,13 @@ -from __future__ import print_function - -from manifold.core.query import Query -from manifoldapi.manifoldapi import execute_query -from portal.actions import is_pi +import decimal +import datetime +import json from django.http import HttpResponse +from manifold.core.query import Query +from manifoldapi.manifoldapi import execute_query -import decimal -import datetime -import json +from myslice.settings import logger # handles serialization of datetime in json DateEncoder = lambda obj: obj.strftime("%B %d, %Y %H:%M:%S") if isinstance(obj, datetime.datetime) else None @@ -77,7 +75,7 @@ class ObjectRequest(object): # What about key formed of multiple fields??? query = Query.get('local:object').filter_by('table', '==', self.type).select('key') results = execute_query(self.request, query) - print("key of object = %s" % results) + logger.debug("key of object = {}".format(results)) if results : for r in results[0]['key'] : self.id = r @@ -138,9 +136,9 @@ class ObjectRequest(object): if self.params : for p in self.params : for k,v in p.iteritems() : - print("param: %s : %s" % (k,v)) + logger.debug("param: {} : {}".format(k, v)) query.set({k : v}) - print("query = ",query) + logger.debug("query = {}".format(query)) else: raise Exception, "Params are required for create" return execute_query(self.request, query) @@ -152,9 +150,9 @@ class ObjectRequest(object): if self.params : for p in self.params : for k,v in p.iteritems() : - print("param: %s : %s" % (k,v)) + logger.debug("param: {} : {}".format(k, v)) query.set({k : v}) - print("query = ",query) + logger.debug("query = {}".format(query)) else: raise Exception, "Params are required for update"