Merge pull request #701 from nguyen-v/fix_colon

[PCB Print][Fixed] Allow colons in sheet and layer_var expansions

kibot/optionable.py

@@ -550,11 +550,11 @@ def expand_filename_both(self, name, is_sch=True, make_safe=True):
             logger.debug('Expanded `{}`'.format(name))
         return name
 
-    def expand_filename_pcb(self, name):
+    def expand_filename_pcb(self, name, make_safe=True):
         """ Expands %* values in filenames.
             Uses data from the PCB. """
         # This member can be called with a preflight object
-        return Optionable.expand_filename_both(self, name, is_sch=False)
+        return Optionable.expand_filename_both(self, name, is_sch=False, make_safe=make_safe)
 
     def expand_filename_sch(self, name):
         """ Expands %* values in filenames.

kibot/out_pcb_print.py

@@ -248,7 +248,7 @@ def expand_sheet_patterns(self, parent, sheet, layers, layer=None):
             sheet = sheet.replace('%ln', layer.layer)
             sheet = sheet.replace('%ls', layer.suffix)
             sheet = sheet.replace('%ld', layer.description)
-        return self.expand_filename_pcb(sheet)
+        return self.expand_filename_pcb(sheet, make_safe=False)
 
     def config(self, parent):
         super().config(parent)