Factor out some unnecessary string parsing code.

feature/documentation-builds-html
Isis Lovecruft 2013-04-10 17:22:09 +00:00
parent 5fd040c793
commit af7e952b42
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
1 changed files with 2 additions and 7 deletions

View File

@ -541,19 +541,14 @@ def _sanitise(*args):
else: else:
safe_values += (allowed_flag + " ") safe_values += (allowed_flag + " ")
if isinstance(value, str): if isinstance(value, str):
value_list = [] value_list = value.split(' ')
if value.find(' ') > 0:
value_list = value.split(' ')
else:
logger.debug("_check_values(): got non-string for values")
for value in value_list: for value in value_list:
safe_value = _fix_unsafe(value) safe_value = _fix_unsafe(value)
if allowed_flag == '--encrypt' or '--encrypt-files' \ if allowed_flag == '--encrypt' or '--encrypt-files' \
or '--decrypt' or '--decrypt-file' \ or '--decrypt' or '--decrypt-file' \
or '--import' or '--verify': or '--import' or '--verify':
## xxx what other things should we check for?
## Place checks here: ## Place checks here:
if _is_file(safe_value): if not safe_value == "" and _is_file(safe_value):
safe_values += (safe_value + " ") safe_values += (safe_value + " ")
else: else:
logger.debug("Got non-filename for %s option: %s" logger.debug("Got non-filename for %s option: %s"