diff --git a/brewtils/schemas.py b/brewtils/schemas.py index 52999a4e..b0defb53 100644 --- a/brewtils/schemas.py +++ b/brewtils/schemas.py @@ -113,9 +113,9 @@ def to_epoch(value): def from_epoch(value): # If already in datetime form just return it if isinstance(value, datetime.datetime): - return value + return value.replace(tzinfo=datetime.timezone.utc) - return utils.from_timestamp_ms(value) + return utils.from_timestamp_ms(value).replace(tzinfo=datetime.timezone.utc) class BaseSchema(Schema):