merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
@@ -5,7 +5,7 @@

 import traceback

-import logger
+from platformcode import logger

 try:
    import json
@@ -82,7 +82,7 @@ def get_node_from_file(name_file, node, path=None):
    @rtype: dict
    """
    logger.info()
-    from core import config
+    from platformcode import config
    from core import filetools

    dict_node = {}
@@ -156,7 +156,7 @@ def update_node(dict_node, name_file, node, path=None):
    """
    logger.info()

-    from core import config
+    from platformcode import config
    from core import filetools
    json_data = {}
    result = False