opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove more unnecessary unicode/text_type, since sanitize_html will always return unicode.

Browse Source
This commit is contained in:
Dannon Baker
2016-04-20 10:00:08 -04:00
parent 7c7d6edbfd
commit 0cde386a2c
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/util/validation.py
+3 -4
View File
@@ -3,23 +3,22 @@
TODO: Refactor BaseController references to similar methods to use this module.
"""
from galaxy import exceptions
from galaxy.util import unicodify
from galaxy.util.sanitize_html import sanitize_html
from six import string_types, text_type
from six import string_types
def validate_and_sanitize_basestring( key, val ):
if not isinstance( val, string_types ):
raise exceptions.RequestParameterInvalidException( '%s must be a string or unicode: %s'
% ( key, str( type( val ) ) ) )
return unicodify( sanitize_html( val, 'utf-8', 'text/html' ), 'utf-8' )
return sanitize_html( val, 'utf-8', 'text/html' )
def validate_and_sanitize_basestring_list( key, val ):
try:
assert isinstance( val, list )
return [ text_type( sanitize_html( t, 'utf-8', 'text/html' ), 'utf-8' ) for t in val ]
return [ sanitize_html( t, 'utf-8', 'text/html' ) for t in val ]
except ( AssertionError, TypeError ):
raise exceptions.RequestParameterInvalidException( '%s must be a list of strings: %s'
% ( key, str( type( val ) ) ) )