Commit ecc2a831 authored by J. Fernando Sánchez's avatar J. Fernando Sánchez
Browse files

Still not functional

parent aafd6a09
...@@ -19,6 +19,7 @@ Blueprints for Senpy ...@@ -19,6 +19,7 @@ Blueprints for Senpy
""" """
from flask import Blueprint, request, current_app, Flask, redirect, url_for, render_template from flask import Blueprint, request, current_app, Flask, redirect, url_for, render_template
from .models import Error, Response, Leaf from .models import Error, Response, Leaf
from future.utils import iteritems
import json import json
import logging import logging
...@@ -58,7 +59,7 @@ def get_params(req, params=BASIC_PARAMS): ...@@ -58,7 +59,7 @@ def get_params(req, params=BASIC_PARAMS):
outdict = {} outdict = {}
wrong_params = {} wrong_params = {}
for param, options in params.iteritems(): for param, options in iteritems(params):
if param[0] != "@": # Exclude json-ld properties if param[0] != "@": # Exclude json-ld properties
logger.debug("Param: %s - Options: %s", param, options) logger.debug("Param: %s - Options: %s", param, options)
for alias in options["aliases"]: for alias in options["aliases"]:
...@@ -79,7 +80,7 @@ def get_params(req, params=BASIC_PARAMS): ...@@ -79,7 +80,7 @@ def get_params(req, params=BASIC_PARAMS):
"message": "Missing or invalid parameters", "message": "Missing or invalid parameters",
"parameters": outdict, "parameters": outdict,
"errors": {param: error for param, error in "errors": {param: error for param, error in
wrong_params.iteritems()} iteritems(wrong_params)}
}) })
raise ValueError(message) raise ValueError(message)
return outdict return outdict
......
""" """
""" """
from future import standard_library
standard_library.install_aliases()
import gevent import gevent
from gevent import monkey from gevent import monkey
monkey.patch_all() monkey.patch_all()
...@@ -102,7 +104,7 @@ class Senpy(object): ...@@ -102,7 +104,7 @@ class Senpy(object):
def default_plugin(self): def default_plugin(self):
candidates = self.filter_plugins(is_activated=True) candidates = self.filter_plugins(is_activated=True)
if len(candidates) > 0: if len(candidates) > 0:
candidate = candidates.values()[0] candidate = list(candidates.values())[0]
logger.debug("Default: {}".format(candidate)) logger.debug("Default: {}".format(candidate))
return candidate return candidate
else: else:
......
import json import json
import os import os
import logging
from builtins import str
from collections import defaultdict from collections import defaultdict
from pyld import jsonld from pyld import jsonld
import logging
from flask import Response as FlaskResponse from flask import Response as FlaskResponse
...@@ -93,7 +95,7 @@ class Leaf(dict): ...@@ -93,7 +95,7 @@ class Leaf(dict):
return contexts return contexts
elif isinstance(context, dict): elif isinstance(context, dict):
return context return context
elif isinstance(context, basestring): elif isinstance(context, str):
try: try:
with open(context) as f: with open(context) as f:
return json.loads(f.read()) return json.loads(f.read())
......
from future import standard_library
standard_library.install_aliases()
import inspect import inspect
import os.path import os.path
import shelve import shelve
import logging import logging
import ConfigParser
from .models import Response, Leaf from .models import Response, Leaf
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
......
Markdown is supported
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