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.

1 files changed, 3 insertions, 4 deletions

diff --git a/server/szurubooru/func/util.py b/server/szurubooru/func/util.py
index f1e8f8f..bbc3bd2 100644
--- a/server/szurubooru/func/util.py
+++ b/server/szurubooru/func/util.py
@@ -26,12 +26,11 @@ def serialize_entity(entity, field_factories, options):
         options = field_factories.keys()
     ret = {}
     for key in options:
-        try:
-            factory = field_factories[key]
-            ret[key] = factory()
-        except KeyError:
+        if not key in field_factories:
             raise errors.ValidationError('Invalid key: %r. Valid keys: %r.' % (
                 key, list(sorted(field_factories.keys()))))
+        factory = field_factories[key]
+        ret[key] = factory()
     return ret
 
 @contextmanager