From 32624cbe949e0af11ac10f1183a1f700fcc3b06b Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Thu, 3 Dec 2015 11:12:59 +0100 Subject: [PATCH] Arch: on ifc import do no longer decode unicode strings before encode them --- src/Mod/Arch/importIFC.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/Arch/importIFC.py b/src/Mod/Arch/importIFC.py index 0ff51df54..1807ba7ff 100644 --- a/src/Mod/Arch/importIFC.py +++ b/src/Mod/Arch/importIFC.py @@ -419,7 +419,7 @@ def insert(filename,docname,skip=[],only=[],root=None): if DEBUG: print count+1,"/",len(products)," creating object #",pid," : ",ptype, name = str(ptype[3:]) if product.Name: - name = product.Name.decode("unicode_escape").encode("utf8") + name = product.Name.encode("utf8") if PREFIX_NUMBERS: name = "ID" + str(pid) + " " + name obj = None baseobj = None @@ -594,7 +594,7 @@ def insert(filename,docname,skip=[],only=[],root=None): for p in properties[pid]: o = ifcfile[p] if o.is_a("IfcPropertySingleValue"): - a[o.Name.decode("unicode_escape").encode("utf8")] = str(o.NominalValue) + a[o.Name.encode("utf8")] = str(o.NominalValue) obj.IfcAttributes = a # color @@ -729,7 +729,7 @@ def insert(filename,docname,skip=[],only=[],root=None): if "IfcAnnotation" in SKIP: continue # preferences-set type skip list name = "Annotation" if annotation.Name: - name = annotation.Name.decode("unicode_escape").encode("utf8") + name = annotation.Name.encode("utf8") if PREFIX_NUMBERS: name = "ID" + str(aid) + " " + name shapes2d = [] for repres in annotation.Representation.Representations: @@ -752,7 +752,7 @@ def insert(filename,docname,skip=[],only=[],root=None): for material in materials: name = "Material" if material.Name: - name = material.Name.decode("unicode_escape").encode("utf8") + name = material.Name.encode("utf8") if MERGE_MATERIALS and (name in fcmats.keys()): mat = fcmats[name] else: