jan/masque
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Expect name to still be a string after disambiguation

Browse Source 
Check that encode('ascii') doesn't make it zero-length, but don't
actually return the encoded form.
This commit is contained in:
Jan Petykiewicz 2020-07-22 21:49:27 -07:00
parent 794ebb6b37
commit ad6fa88e53
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
masque/file/gdsii.py
View File

@ -119,7 +119,7 @@ def build(patterns: Union[Pattern, List[Pattern]],
# Now create a structure for each pattern, and add in any Boundary and SREF elements # Now create a structure for each pattern, and add in any Boundary and SREF elements
for pat in patterns_by_id.values(): for pat in patterns_by_id.values():
structure = gdsii.structure.Structure(name=pat.name) structure = gdsii.structure.Structure(name=pat.name.encode('ASCII'))
lib.append(structure) lib.append(structure)
structure += _shapes_to_elements(pat.shapes) structure += _shapes_to_elements(pat.shapes)
@ -385,7 +385,7 @@ def _subpatterns_to_refs(subpatterns: List[SubPattern]
for subpat in subpatterns: for subpat in subpatterns:
if subpat.pattern is None: if subpat.pattern is None:
continue continue
encoded_name = subpat.pattern.name encoded_name = subpat.pattern.name.encode('ASCII')
# Note: GDS mirrors first and rotates second # Note: GDS mirrors first and rotates second
mirror_across_x, extra_angle = normalize_mirror(subpat.mirrored) mirror_across_x, extra_angle = normalize_mirror(subpat.mirrored)
@ -514,5 +514,5 @@ def disambiguate_pattern_names(patterns: Sequence[Pattern],
if len(encoded_name) > max_name_length: if len(encoded_name) > max_name_length:
raise PatternError('Pattern name "{!r}" length > {} after encode,\n originally "{}"'.format(encoded_name, max_name_length, pat.name)) raise PatternError('Pattern name "{!r}" length > {} after encode,\n originally "{}"'.format(encoded_name, max_name_length, pat.name))
pat.name = encoded_name pat.name = suffixed_name
used_names.append(suffixed_name) used_names.append(suffixed_name)