Merge branch 'master' of https://intra.acdp.at/gogs/tanja/cdplib

cdplib/FlattenData.py

@@ -13,7 +13,7 @@ import time
 import pandas as pd
 import copy
 sys.path.append(os.getcwd())
-from libraries.log import Log
+from cdplib.log import Log
 log = Log("Flatten data")
 
 class FlattenData():
@@ -68,7 +68,7 @@ class FlattenData():
                     temp_result_dict = self.append_to_dict(temp_result_dict, temp_result)
 
             result_dict[index] = copy.deepcopy(temp_result_dict)
-        
+
         result_dataframe = pd.DataFrame.from_dict(result_dict, orient='index')
         return result_dataframe
 
@@ -125,14 +125,14 @@ class FlattenData():
                 # OEBB SPECIFIC IF STATEMENT
                 if type(data_list[iteration]) is dict:
                     if 'stationsnummer' in data_list[iteration].keys() and 'stage' in data_list[iteration].keys() :
-                        
+
                         key = incoming_key + '_' + str(data_list[iteration]['stationsnummer']) + '_' + str(data_list[iteration]['stage'])
                 else:
                     key = incoming_key + '_' + str(iteration)
             if type(temp_dataframe) == list:
                 temp_result = self.flatten_list(temp_dataframe, key)
                 result_dict = self.append_to_dict(result_dict, temp_result)
-            
+
             elif type(temp_dataframe) == dict:
                 temp_result = self.flatten_dict(temp_dataframe, key)
                 result_dict = self.append_to_dict(result_dict, temp_result)
@@ -141,7 +141,7 @@ class FlattenData():
 
             if len(temp_result) > 0:
                 result_dict = self.append_to_dict(result_dict, temp_result)
-                
+
         return result_dict
 
     def append_to_dict(self, dictionary: dict, to_append):
@@ -156,5 +156,5 @@ class FlattenData():
 
         for key in to_append:
             dictionary[key] = to_append[key]
-        
+
         return dictionary