From d05d4306422b4f5bcf38d8ff8eee1db327ca563f Mon Sep 17 00:00:00 2001
From: Gorgious <nathan.hild@gmail.com>
Date: Mon, 31 Oct 2022 17:30:18 +0100
Subject: [PATCH] Directly use pset doc functions instead of wrapped ones

---
 .../blenderbim/bim/module/pset/prop.py        |  8 +++++--
 src/blenderbim/blenderbim/bim/prop.py         | 21 -------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/blenderbim/blenderbim/bim/module/pset/prop.py b/src/blenderbim/blenderbim/bim/module/pset/prop.py
index 6e56616fa8..26441fc876 100644
--- a/src/blenderbim/blenderbim/bim/module/pset/prop.py
+++ b/src/blenderbim/blenderbim/bim/module/pset/prop.py
@@ -24,7 +24,6 @@ from ifcopenshell.api.pset.data import Data
 import blenderbim.tool as tool
 from blenderbim.bim.module.pset.data import AddEditCustomPropertiesData
 from blenderbim.bim.ifc import IfcStore
-from blenderbim.bim.prop import get_property_set_description
 from bpy.types import PropertyGroup
 from bpy.props import (
     PointerProperty,
@@ -50,7 +49,12 @@ def purge():
 
 
 def blender_formatted_enum_from_psets(psets):
-    return [(p.Name, p.Name, get_property_set_description(p.Name)) for p in psets]
+    enum_items = []
+    version = tool.Ifc.get_schema()
+    for pset in psets:
+        doc = ifcopenshell.util.doc.get_property_set_doc(version, pset.Name) or {}
+        enum_items.append((pset.Name, pset.Name, doc.get("description", "")))
+    return enum_items
 
 
 def get_pset_names(self, context):
diff --git a/src/blenderbim/blenderbim/bim/prop.py b/src/blenderbim/blenderbim/bim/prop.py
index 8eb05e4b1c..f419c92b5c 100644
--- a/src/blenderbim/blenderbim/bim/prop.py
+++ b/src/blenderbim/blenderbim/bim/prop.py
@@ -141,27 +141,6 @@ def get_attribute_description(entity, attribute):
     return doc
 
 
-def get_property_set_docs(pset):
-    schema = tool.Ifc.get_schema()
-    if schema is not None:
-        return get_property_set_doc(schema, pset)
-
-
-def get_property_set_description(pset):
-    docs = get_property_set_docs(pset)
-    return docs.get("description", "") if docs is not None else ""
-
-
-def get_property_set_properties(pset):
-    docs = get_property_set_docs(pset)
-    return docs.get("properties", {}) if docs is not None else {}
-
-
-def get_property_set_doc_url(pset):
-    docs = get_property_set_docs(pset)
-    return docs.get("spec_url", "") if docs is not None else ""
-
-
 def get_attribute_enum_values(prop, context):
     # Support weird buildingSMART dictionary mappings which behave like enums
     items = []