From 118ca1d14e257b8cb0a83288a487be7c885df25a Mon Sep 17 00:00:00 2001 From: fluzzi Date: Tue, 5 Apr 2022 18:31:19 -0300 Subject: [PATCH] fix getitem folder with subfolders --- connpy/configfile.py | 9 +++++++-- docs/connpy/index.html | 18 ++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/connpy/configfile.py b/connpy/configfile.py index a60a01f..9f2ea44 100755 --- a/connpy/configfile.py +++ b/connpy/configfile.py @@ -155,9 +155,14 @@ class configfile: folder = self.connections[uniques["folder"]] newfolder = folder.copy() newfolder.pop("type") - for node in newfolder.keys(): + for node in folder.keys(): + if node == "type": + continue if "type" in newfolder[node].keys(): - newfolder[node].pop("type") + if newfolder[node]["type"] == "subfolder": + newfolder.pop(node) + else: + newfolder[node].pop("type") if keys == None: return newfolder else: diff --git a/docs/connpy/index.html b/docs/connpy/index.html index 7586068..1e49f27 100644 --- a/docs/connpy/index.html +++ b/docs/connpy/index.html @@ -458,9 +458,14 @@ __pdoc__ = { folder = self.connections[uniques["folder"]] newfolder = folder.copy() newfolder.pop("type") - for node in newfolder.keys(): + for node in folder.keys(): + if node == "type": + continue if "type" in newfolder[node].keys(): - newfolder[node].pop("type") + if newfolder[node]["type"] == "subfolder": + newfolder.pop(node) + else: + newfolder[node].pop("type") if keys == None: return newfolder else: @@ -575,9 +580,14 @@ __pdoc__ = { folder = self.connections[uniques["folder"]] newfolder = folder.copy() newfolder.pop("type") - for node in newfolder.keys(): + for node in folder.keys(): + if node == "type": + continue if "type" in newfolder[node].keys(): - newfolder[node].pop("type") + if newfolder[node]["type"] == "subfolder": + newfolder.pop(node) + else: + newfolder[node].pop("type") if keys == None: return newfolder else: