From 0a39c7057998e155bbd89d64c1999d3179a81888 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 19 Mar 2015 10:38:01 +0100 Subject: [PATCH] Simplify SettingsProxy._unserialize --- src/pretix/base/settings.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 6f77802e91..1d4eed3e06 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -46,10 +46,8 @@ class SettingsProxy: return value elif value is None: return None - elif as_type == int: - return int(value) - elif as_type == float: - return float(value) + elif as_type == int or as_type == float or as_type == decimal.Decimal: + return as_type(value) elif as_type == dict or as_type == list: return json.loads(value) elif as_type == bool: @@ -60,8 +58,6 @@ class SettingsProxy: return dateutil.parser.parse(value).date() elif as_type == time: return dateutil.parser.parse(value).time() - elif as_type == decimal.Decimal: - return decimal.Decimal(value) elif issubclass(as_type, Versionable): return as_type.objects.current.get(identity=value) elif issubclass(as_type, Model):