From fffa1937e510b85157124a6a59bafc64d3d6640e Mon Sep 17 00:00:00 2001 From: Henddher Pedroza Date: Sun, 20 Oct 2019 15:04:57 -0400 Subject: [PATCH] Fix issue in validatorfuncs.timedelta() in which days and years (in days) aren't added to create datetime.timedelta(days=days, ...). --- evennia/utils/validatorfuncs.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/evennia/utils/validatorfuncs.py b/evennia/utils/validatorfuncs.py index 0245d2a5af..623680b176 100644 --- a/evennia/utils/validatorfuncs.py +++ b/evennia/utils/validatorfuncs.py @@ -102,17 +102,17 @@ def duration(entry, option_key="Duration", **kwargs): for interval in time_string: if _re.match(r"^[\d]+s$", interval): - seconds = +int(interval.rstrip("s")) + seconds += int(interval.rstrip("s")) elif _re.match(r"^[\d]+m$", interval): - minutes = +int(interval.rstrip("m")) + minutes += int(interval.rstrip("m")) elif _re.match(r"^[\d]+h$", interval): - hours = +int(interval.rstrip("h")) + hours += int(interval.rstrip("h")) elif _re.match(r"^[\d]+d$", interval): - days = +int(interval.rstrip("d")) + days += int(interval.rstrip("d")) elif _re.match(r"^[\d]+w$", interval): - weeks = +int(interval.rstrip("w")) + weeks += int(interval.rstrip("w")) elif _re.match(r"^[\d]+y$", interval): - days = +int(interval.rstrip("y")) * 365 + days += int(interval.rstrip("y")) * 365 else: raise ValueError(f"Could not convert section '{interval}' to a {option_key}.")