use str representation of sorted tuples to be compatible with literal eval

Author: tomvanmele

src/compas/datastructures/mesh/core/halfedge.py

@@ -1278,7 +1278,7 @@ def edge_attribute(self, edge, name, value=None):
         u, v = edge
         if u not in self.halfedge or v not in self.halfedge[u]:
             raise KeyError(edge)
-        key = "-".join(map(str, sorted(edge)))
+        key = str(tuple(sorted(edge)))
         if value is not None:
             if key not in self.edgedata:
                 self.edgedata[key] = {}
@@ -1312,7 +1312,7 @@ def unset_edge_attribute(self, edge, name):
         u, v = edge
         if u not in self.halfedge or v not in self.halfedge[u]:
             raise KeyError(edge)
-        key = "-".join(map(str, sorted(edge)))
+        key = str(tuple(sorted(edge)))
         if key in self.edgedata and name in self.edgedata[key]:
             del self.edgedata[key][name]
 
@@ -1352,7 +1352,7 @@ def edge_attributes(self, edge, names=None, values=None):
             return
         # use it as a getter
         if not names:
-            key = "-".join(map(str, sorted(edge)))
+            key = str(tuple(sorted(edge)))
             # get the entire attribute dict
             return EdgeAttributeView(self.default_edge_attributes, self.edgedata.setdefault(key, {}))
         # get only the values of the named attributes

src/compas/datastructures/volmesh/core/halfface.py

@@ -900,7 +900,7 @@ def edge_attribute(self, edge, name, value=None):
         u, v = edge
         if u not in self._plane or v not in self._plane[u]:
             raise KeyError(edge)
-        key = "-".join(map(str, sorted(edge)))
+        key = ",".join(map(str, sorted(edge)))
         if value is not None:
             if key not in self._edge_data:
                 self._edge_data[key] = {}
@@ -934,7 +934,7 @@ def unset_edge_attribute(self, edge, name):
         u, v = edge
         if u not in self._plane or v not in self._plane[u]:
             raise KeyError(edge)
-        key = "-".join(map(str, sorted(edge)))
+        key = ",".join(map(str, sorted(edge)))
         if key in self._edge_data and name in self._edge_data[key]:
             del self._edge_data[key][name]
 
@@ -967,7 +967,7 @@ def edge_attributes(self, edge, names=None, values=None):
         u, v = edge
         if u not in self._plane or v not in self._plane[u]:
             raise KeyError(edge)
-        key = "-".join(map(str, sorted(edge)))
+        key = ",".join(map(str, sorted(edge)))
         if values:
             for name, value in zip(names, values):
                 if key not in self._edge_data:
@@ -1097,7 +1097,7 @@ def face_attribute(self, face, name, value=None):
         """
         if face not in self._halfface:
             raise KeyError(face)
-        key = "-".join(map(str, sorted(self.halfface_vertices(face))))
+        key = str(tuple(sorted(self.halfface_vertices(face))))
         if value is not None:
             if key not in self._face_data:
                 self._face_data[key] = {}
@@ -1130,7 +1130,7 @@ def unset_face_attribute(self, face, name):
         """
         if face not in self._halfface:
             raise KeyError(face)
-        key = "-".join(map(str, sorted(self.halfface_vertices(face))))
+        key = str(tuple(sorted(self.halfface_vertices(face))))
         if key in self._face_data and name in self._face_data[key]:
             del self._face_data[key][name]
 
@@ -1162,7 +1162,7 @@ def face_attributes(self, face, names=None, values=None):
         """
         if face not in self._halfface:
             raise KeyError(face)
-        key = "-".join(map(str, sorted(self.halfface_vertices(face))))
+        key = str(tuple(sorted(self.halfface_vertices(face))))
         if values:
             for name, value in zip(names, values):
                 if key not in self._face_data: