marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move options style_type to sanitizeOptions.

Browse source
This commit is contained in:
doom-goober 2021-12-23 16:45:54 -08:00
parent 6e1afe74d1
commit 5a62f888cd
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scour/scour.py
View file

@ -4084,10 +4084,6 @@ def parse_args(args=None, ignore_additional_args=False):
if options.style_type not in ['none', 'preserve', 'attributes', 'inline-css']: if options.style_type not in ['none', 'preserve', 'attributes', 'inline-css']:
_options_parser.error("Invalid value for --style, see --help") _options_parser.error("Invalid value for --style, see --help")
#For backwards compatibility, we support style_to_xml but style_type can override it.
if options.style_type == 'none' and options.style_to_xml:
options.style_type = 'attributes'
return options return options
@ -4104,6 +4100,10 @@ def sanitizeOptions(options=None):
sanitizedOptions = _options_parser.get_default_values() sanitizedOptions = _options_parser.get_default_values()
sanitizedOptions._update_careful(optionsDict) sanitizedOptions._update_careful(optionsDict)
#For backwards compatibility, we support style_to_xml but style_type can override it.
if sanitizedOptions.style_type == 'none' and sanitizedOptions.style_to_xml:
sanitizedOptions.style_type = 'attributes'
return sanitizedOptions return sanitizedOptions