remove some trailing undescores

masque/builder/builder.py

@@ -518,7 +518,7 @@ class Builder(PortList):
             length: float,
             *,
             tool_port_names: Sequence[str] = ('A', 'B'),
-            base_name: str = '_path_',
+            base_name: str = '_path',
             **kwargs,
             ) -> BB:
         if self._dead:
@@ -539,7 +539,7 @@ class Builder(PortList):
             position: float,
             *,
             tool_port_names: Sequence[str] = ('A', 'B'),
-            base_name: str = '_pathto_',
+            base_name: str = '_pathto',
             **kwargs,
             ) -> BB:
         if self._dead:
@@ -575,7 +575,7 @@ class Builder(PortList):
             set_rotation: Optional[float] = None,
             tool_port_names: Sequence[str] = ('A', 'B'),
             force_container: bool = False,
-            base_name: str = '_mpath_',
+            base_name: str = '_mpath',
             **kwargs,
             ) -> BB:
         if self._dead:

masque/builder/flatbuilder.py

@@ -435,7 +435,7 @@ class FlatBuilder(PortList):
             length: float,
             *,
             tool_port_names: Sequence[str] = ('A', 'B'),
-            base_name: str = '_path_',
+            base_name: str = '_path',
             **kwargs,
             ) -> BB:
         if self._dead:
@@ -454,7 +454,7 @@ class FlatBuilder(PortList):
             position: float,
             *,
             tool_port_names: Sequence[str] = ('A', 'B'),
-            base_name: str = '_pathto_',
+            base_name: str = '_pathto',
             **kwargs,
             ) -> BB:
         if self._dead:
@@ -490,7 +490,7 @@ class FlatBuilder(PortList):
             set_rotation: Optional[float] = None,
             tool_port_names: Sequence[str] = ('A', 'B'),
             force_container: bool = False,
-            base_name: str = '_mpath_',
+            base_name: str = '_mpath',
             **kwargs,
             ) -> BB:
         if self._dead:

masque/library.py

@@ -557,7 +557,7 @@ class MutableLibrary(Library, MutableMapping[str, 'Pattern'], metaclass=ABCMeta)
 
         if label2name is None:
             def label2name(label):
-                return self.get_name('_shape_')
+                return self.get_name('_shape')
             #label2name = lambda label: self.get_name('_shape')
 
         shape_counts: MutableMapping[Tuple, int] = defaultdict(int)
@@ -641,7 +641,7 @@ class MutableLibrary(Library, MutableMapping[str, 'Pattern'], metaclass=ABCMeta)
 
         if name_func is None:
             def name_func(_pat, _shape):
-                return self.get_name('_rep_')
+                return self.get_name('_rep')
             #name_func = lambda _pat, _shape: self.get_name('_rep')
 
         for pat in tuple(self.values()):