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
6 changes: 5 additions & 1 deletion src/nitypes/waveform/_digital/_signal.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@ def __init__(
self,
owner: DigitalWaveform[TDigitalState],
signal_index: SupportsIndex,
column_index: SupportsIndex,
column_index: SupportsIndex | None = None,
) -> None:
"""Initialize a new digital waveform signal."""
if column_index is None:
# when unpickling an old version, column_index may not be provided
column_index = signal_index

self._owner = owner
self._signal_index = arg_to_uint("signal index", signal_index)
self._column_index = arg_to_uint("column index", column_index)
Expand Down
3 changes: 3 additions & 0 deletions src/nitypes/waveform/_digital/_waveform.py
Original file line number Diff line number Diff line change
Expand Up @@ -838,6 +838,9 @@ def __init__(
):
extended_properties = ExtendedPropertyDictionary(extended_properties)
self._extended_properties = extended_properties
if not hasattr(self._extended_properties, "_on_key_changed"):
# when unpickling an old version, _on_key_changed may not exist
self._extended_properties._on_key_changed = []
self._extended_properties._on_key_changed.append(
weakref.WeakMethod(self._on_extended_property_changed)
)
Expand Down
4 changes: 0 additions & 4 deletions tests/unit/waveform/test_digital_waveform.py
Original file line number Diff line number Diff line change
Expand Up @@ -1976,10 +1976,6 @@ def test___waveform___pickle___references_public_modules() -> None:
extended_properties={"NI_ChannelName": "Dev1/ai0", "NI_UnitDescription": "Volts"},
timing=Timing.create_with_regular_interval(dt.timedelta(milliseconds=1)),
),
marks=pytest.mark.xfail(
raises=AttributeError,
reason="https://github.com/ni/nitypes-python/issues/234 - ExtendedPropertyDictionary._on_key_changed breaks pickle compatibility",
),
),
# nitypes 1.0.1
(
Expand Down
4 changes: 0 additions & 4 deletions tests/unit/waveform/test_digital_waveform_signal.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,10 +378,6 @@ def test___waveform___pickle___references_public_modules() -> None:
DigitalWaveform(
3, 2, extended_properties={"NI_LineNames": "port0/line1, port0/line0"}
).signals[1],
marks=pytest.mark.xfail(
raises=AttributeError,
reason="https://github.com/ni/nitypes-python/issues/234 - ExtendedPropertyDictionary._on_key_changed breaks pickle compatibility",
),
),
# nitypes 1.0.1
(
Expand Down