diff --git a/senpy/blueprints.py b/senpy/blueprints.py index 5d27b46..5fa9f44 100644 --- a/senpy/blueprints.py +++ b/senpy/blueprints.py @@ -19,6 +19,7 @@ Blueprints for Senpy """ from flask import Blueprint, request, current_app, Flask, redirect, url_for, render_template from .models import Error, Response, Leaf +from future.utils import iteritems import json import logging @@ -58,7 +59,7 @@ def get_params(req, params=BASIC_PARAMS): outdict = {} wrong_params = {} - for param, options in params.iteritems(): + for param, options in iteritems(params): if param[0] != "@": # Exclude json-ld properties logger.debug("Param: %s - Options: %s", param, options) for alias in options["aliases"]: @@ -79,7 +80,7 @@ def get_params(req, params=BASIC_PARAMS): "message": "Missing or invalid parameters", "parameters": outdict, "errors": {param: error for param, error in - wrong_params.iteritems()} + iteritems(wrong_params)} }) raise ValueError(message) return outdict diff --git a/senpy/extensions.py b/senpy/extensions.py index 7be339e..50f6ace 100644 --- a/senpy/extensions.py +++ b/senpy/extensions.py @@ -1,5 +1,7 @@ """ """ +from future import standard_library +standard_library.install_aliases() import gevent from gevent import monkey monkey.patch_all() @@ -102,7 +104,7 @@ class Senpy(object): def default_plugin(self): candidates = self.filter_plugins(is_activated=True) if len(candidates) > 0: - candidate = candidates.values()[0] + candidate = list(candidates.values())[0] logger.debug("Default: {}".format(candidate)) return candidate else: diff --git a/senpy/models.py b/senpy/models.py index 195619f..5b4df20 100644 --- a/senpy/models.py +++ b/senpy/models.py @@ -1,8 +1,10 @@ import json import os +import logging + +from builtins import str from collections import defaultdict from pyld import jsonld -import logging from flask import Response as FlaskResponse @@ -93,7 +95,7 @@ class Leaf(dict): return contexts elif isinstance(context, dict): return context - elif isinstance(context, basestring): + elif isinstance(context, str): try: with open(context) as f: return json.loads(f.read()) diff --git a/senpy/plugins.py b/senpy/plugins.py index 696d4ec..7276acd 100644 --- a/senpy/plugins.py +++ b/senpy/plugins.py @@ -1,9 +1,10 @@ +from future import standard_library +standard_library.install_aliases() import inspect import os.path import shelve import logging -import ConfigParser from .models import Response, Leaf logger = logging.getLogger(__name__)