Merge pull request #16 from peppelinux/master

just code linting and dep to oidcop removed. util.py improved

Author: rohe

flask_rp/application.py

@@ -3,9 +3,9 @@
 from cryptojwt import KeyJar
 from cryptojwt.key_jar import init_key_jar
 from flask.app import Flask
-from oidcop.utils import load_yaml_config
 
 from oidcrp import RPHandler
+from oidcrp.util import load_yaml_config
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 

src/oidcrp/util.py

@@ -6,7 +6,10 @@
 from http.cookiejar import Cookie
 from http.cookiejar import http2time
 
+import io
+import json
 import yaml
+
 from oidcservice import sanitize
 from oidcservice.exception import TimeFormatError
 from oidcservice.exception import WrongContentType
@@ -249,6 +252,28 @@ def load_configuration(filename):
 
 
 def do_add_ons(add_ons, services):
-        for key, spec in add_ons.items():
-            _func = importer(spec['function'])
-            _func(services, **spec['kwargs'])
+    for key, spec in add_ons.items():
+        _func = importer(spec['function'])
+        _func(services, **spec['kwargs'])
+
+
+def load_json(file_name):
+    with open(file_name) as fp:
+        js = json.load(fp)
+    return js
+
+
+def load_yaml_config(file_name):
+    with open(file_name) as fp:
+        c = yaml.safe_load(fp)
+    return c
+
+
+def yaml_to_py_stream(file_name):
+    d = load_yaml_config(file_name)
+    fstream = io.StringIO()
+    for i in d:
+        section = '{} = {}\n\n'.format(i, json.dumps(d[i], indent=2))
+        fstream.write(section)
+    fstream.seek(0)
+    return fstream