updated to match master

ElementTree
Andy Port 2018-05-28 20:40:54 -07:00
parent 45d3389303
commit d4ab8ad435
1 changed files with 6 additions and 6 deletions

View File

@ -69,29 +69,29 @@ def svg2paths(svg_file_location,
return dict(list(zip(keys, values))) return dict(list(zip(keys, values)))
# Use minidom to extract path strings from input SVG # Use minidom to extract path strings from input SVG
paths = [dom2dict(el) for el in doc.get_elements_by_tag('path')] paths = [dom2dict(el) for el in doc.getElementsByTagName('path')]
d_strings = [el['d'] for el in paths] d_strings = [el['d'] for el in paths]
attribute_dictionary_list = paths attribute_dictionary_list = paths
# if pathless_svg: # if pathless_svg:
# for el in doc.get_elements_by_tag('path'): # for el in doc.getElementsByTagName('path'):
# el.parentNode.removeChild(el) # el.parentNode.removeChild(el)
# Use minidom to extract polyline strings from input SVG, convert to # Use minidom to extract polyline strings from input SVG, convert to
# path strings, add to list # path strings, add to list
if convert_polylines_to_paths: if convert_polylines_to_paths:
plins = [dom2dict(el) for el in doc.get_elements_by_tag('polyline')] plins = [dom2dict(el) for el in doc.getElementsByTagName('polyline')]
d_strings += [polyline2pathd(pl['points']) for pl in plins] d_strings += [polyline2pathd(pl['points']) for pl in plins]
attribute_dictionary_list += plins attribute_dictionary_list += plins
# Use minidom to extract polygon strings from input SVG, convert to # Use minidom to extract polygon strings from input SVG, convert to
# path strings, add to list # path strings, add to list
if convert_polygons_to_paths: if convert_polygons_to_paths:
pgons = [dom2dict(el) for el in doc.get_elements_by_tag('polygon')] pgons = [dom2dict(el) for el in doc.getElementsByTagName('polygon')]
d_strings += [polyline2pathd(pg['points']) + 'z' for pg in pgons] d_strings += [polyline2pathd(pg['points']) + 'z' for pg in pgons]
attribute_dictionary_list += pgons attribute_dictionary_list += pgons
if convert_lines_to_paths: if convert_lines_to_paths:
lines = [dom2dict(el) for el in doc.get_elements_by_tag('line')] lines = [dom2dict(el) for el in doc.getElementsByTagName('line')]
d_strings += [('M' + l['x1'] + ' ' + l['y1'] + d_strings += [('M' + l['x1'] + ' ' + l['y1'] +
'L' + l['x2'] + ' ' + l['y2']) for l in lines] 'L' + l['x2'] + ' ' + l['y2']) for l in lines]
attribute_dictionary_list += lines attribute_dictionary_list += lines
@ -101,7 +101,7 @@ def svg2paths(svg_file_location,
# doc.writexml(f) # doc.writexml(f)
if return_svg_attributes: if return_svg_attributes:
svg_attributes = dom2dict(doc.get_elements_by_tag('svg')[0]) svg_attributes = dom2dict(doc.getElementsByTagName('svg')[0])
doc.unlink() doc.unlink()
path_list = [parse_path(d) for d in d_strings] path_list = [parse_path(d) for d in d_strings]
return path_list, attribute_dictionary_list, svg_attributes return path_list, attribute_dictionary_list, svg_attributes