From e025e94bebf01631970b16cc826cf533bdceb57f Mon Sep 17 00:00:00 2001 From: William Date: Fri, 12 Feb 2021 10:09:39 -0600 Subject: [PATCH 1/2] Fixing type reference to self --- CppHeaderParser/CppHeaderParser.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py index a369308..9737d75 100644 --- a/CppHeaderParser/CppHeaderParser.py +++ b/CppHeaderParser/CppHeaderParser.py @@ -3707,13 +3707,25 @@ def _strip_parent_keys(self): def toJSON(self, indent=4, separators=None): """Converts a parsed structure to JSON""" import json - self._strip_parent_keys() + def clean_dict(markers, keys = []): + if (id(markers) in keys): + return None + elif isinstance(markers, dict): + keys_ = keys + [id(markers)] + return {key: clean_dict(markers[key], keys_) for + key, value in markers.items()} + elif type(markers) in [list, set, tuple]: + return type(markers)(clean_dict(m, keys) for m in markers) + return markers try: del self.__dict__["classes_order"] except: pass - return json.dumps(self.__dict__, indent=indent, separators=separators) + + d = self.__dict__ + d["classes"] = clean_dict(d["classes"]) + return json.dumps(d, indent=indent, separators=separators, default = "") def __repr__(self): rtn = { From f3b91084318fcb09c98a3d0d7d927e66decdd69a Mon Sep 17 00:00:00 2001 From: William Date: Fri, 12 Feb 2021 10:28:15 -0600 Subject: [PATCH 2/2] Reformatting for consistency --- CppHeaderParser/CppHeaderParser.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py index 9737d75..70cffda 100644 --- a/CppHeaderParser/CppHeaderParser.py +++ b/CppHeaderParser/CppHeaderParser.py @@ -3707,17 +3707,22 @@ def _strip_parent_keys(self): def toJSON(self, indent=4, separators=None): """Converts a parsed structure to JSON""" import json + self._strip_parent_keys() - def clean_dict(markers, keys = []): - if (id(markers) in keys): + + def clean_dict(markers, keys=[]): + if id(markers) in keys: return None elif isinstance(markers, dict): keys_ = keys + [id(markers)] - return {key: clean_dict(markers[key], keys_) for - key, value in markers.items()} + return { + key: clean_dict(markers[key], keys_) + for key, value in markers.items() + } elif type(markers) in [list, set, tuple]: return type(markers)(clean_dict(m, keys) for m in markers) return markers + try: del self.__dict__["classes_order"] except: @@ -3725,7 +3730,7 @@ def clean_dict(markers, keys = []): d = self.__dict__ d["classes"] = clean_dict(d["classes"]) - return json.dumps(d, indent=indent, separators=separators, default = "") + return json.dumps(d, indent=indent, separators=separators, default="") def __repr__(self): rtn = { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy