Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/heliox.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import unittest
from contextlib import contextmanager

from genie_python.genie import PVValue
from ibex_non_ca_helpers.typing import PVValue
from parameterized import parameterized

from utils.channel_access import ChannelAccess
Expand Down
6 changes: 3 additions & 3 deletions utils/channel_access.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
from contextlib import contextmanager
from functools import partial, partialmethod

from genie_python.genie import PVValue
from genie_python.genie_cachannel_wrapper import (
CaChannelWrapper,
UnableToConnectToPVException,
)
from genie_python.genie_p4p_wrapper import P4PWrapper
from ibex_non_ca_helpers.typing import PVValue

from utils.formatters import format_value

Expand Down Expand Up @@ -305,7 +305,7 @@ def _wrapper(message: str) -> str | None:
return None
else:
return "Exception date time: {}{}{}{}{}".format(
datetime.datetime.now(tz=datetime.timezone.utc),
datetime.datetime.now(tz=datetime.UTC),
os.linesep,
message,
os.linesep,
Expand Down Expand Up @@ -643,7 +643,7 @@ def assert_that_pv_exists(self, pv: str, timeout: float | None = None) -> None:
# Last try.
if not self.ca.pv_exists(pv, timeout=1.0):
raise AssertionError(
f"Exception date time: {datetime.datetime.now(tz=datetime.timezone.utc)}\n"
f"Exception date time: {datetime.datetime.now(tz=datetime.UTC)}\n"
f"PV {pv} does not exist after {timeout} seconds"
)

Expand Down
Loading