Accords-Library-Archive
/
gallery.accords-library.com
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server/util: improve catching bad field names 

KeyError could catch exceptions that happened inside the serializer
routine and mistakenly report them as an error with user input.
This commit is contained in:
rr- 2016-08-14 11:41:33 +02:00
parent f6f07a35df
commit 86452019a3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/szurubooru/func/util.py
View File

@ -26,12 +26,11 @@ def serialize_entity(entity, field_factories, options):
options = field_factories.keys() options = field_factories.keys()
ret = {} ret = {}
for key in options: for key in options:
try: if not key in field_factories:
factory = field_factories[key]
ret[key] = factory()
except KeyError:
raise errors.ValidationError('Invalid key: %r. Valid keys: %r.' % ( raise errors.ValidationError('Invalid key: %r. Valid keys: %r.' % (
key, list(sorted(field_factories.keys())))) key, list(sorted(field_factories.keys()))))
factory = field_factories[key]
ret[key] = factory()
return ret return ret
@contextmanager @contextmanager