Make scripts/objects lists use EvMore. Change EvMore to not justify by default.

This commit is contained in:
Griatch 2020-01-11 15:49:12 +01:00
parent b5aee2c41e
commit 69d85bd184
221 changed files with 2190 additions and 6810 deletions

View file

@ -114,9 +114,7 @@ def duration(entry, option_key="Duration", **kwargs):
elif _re.match(r"^[\d]+y$", interval):
days += int(interval.rstrip("y")) * 365
else:
raise ValueError(
f"Could not convert section '{interval}' to a {option_key}."
)
raise ValueError(f"Could not convert section '{interval}' to a {option_key}.")
return _dt.timedelta(days, seconds, 0, 0, minutes, hours, weeks)
@ -124,9 +122,7 @@ def duration(entry, option_key="Duration", **kwargs):
def future(entry, option_key="Future Datetime", from_tz=None, **kwargs):
time = datetime(entry, option_key, from_tz=from_tz)
if time < _dt.datetime.utcnow().replace(tzinfo=_dt.timezone.utc):
raise ValueError(
f"That {option_key} is in the past! Must give a Future datetime!"
)
raise ValueError(f"That {option_key} is in the past! Must give a Future datetime!")
return time
@ -136,9 +132,7 @@ def signed_integer(entry, option_key="Signed Integer", **kwargs):
try:
num = int(entry)
except ValueError:
raise ValueError(
f"Could not convert '{entry}' to a whole number for {option_key}!"
)
raise ValueError(f"Could not convert '{entry}' to a whole number for {option_key}!")
return num
@ -152,9 +146,7 @@ def positive_integer(entry, option_key="Positive Integer", **kwargs):
def unsigned_integer(entry, option_key="Unsigned Integer", **kwargs):
num = signed_integer(entry, option_key)
if not num >= 0:
raise ValueError(
f"{option_key} must be a whole number greater than or equal to 0!"
)
raise ValueError(f"{option_key} must be a whole number greater than or equal to 0!")
return num
@ -222,9 +214,7 @@ def lock(entry, option_key="locks", access_options=None, **kwargs):
raise ValueError("Must enter an access type!")
if access_options:
if access_type not in access_options:
raise ValueError(
f"Access type must be one of: {', '.join(access_options)}"
)
raise ValueError(f"Access type must be one of: {', '.join(access_options)}")
if not lockfunc:
raise ValueError("Lock func not entered.")
return entry