Skip to content

Commit b8b14b8

Browse files
authored
waveform: Refactor timing imports (#8)
1 parent a595c17 commit b8b14b8

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

src/nitypes/waveform/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
NoneScaleMode,
1212
ScaleMode,
1313
)
14-
from nitypes.waveform._timing._base import BaseTiming, SampleIntervalMode
15-
from nitypes.waveform._timing._precision import PrecisionTiming
16-
from nitypes.waveform._timing._standard import Timing
14+
from nitypes.waveform._timing import BaseTiming, PrecisionTiming, SampleIntervalMode, Timing
1715

1816
__all__ = [
1917
"AnalogWaveform",

src/nitypes/waveform/_analog_waveform.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
ExtendedPropertyDictionary,
1515
)
1616
from nitypes.waveform._scaling import NO_SCALING, ScaleMode
17-
from nitypes.waveform._timing._conversion import convert_timing
18-
from nitypes.waveform._timing._precision import PrecisionTiming
19-
from nitypes.waveform._timing._standard import Timing
17+
from nitypes.waveform._timing import PrecisionTiming, Timing, convert_timing
2018

2119
if sys.version_info < (3, 10):
2220
import array as std_array
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
11
"""Waveform timing data types for NI Python APIs."""
2+
3+
from nitypes.waveform._timing._base import BaseTiming, SampleIntervalMode
4+
from nitypes.waveform._timing._conversion import convert_timing
5+
from nitypes.waveform._timing._precision import PrecisionTiming
6+
from nitypes.waveform._timing._standard import Timing
7+
8+
__all__ = ["BaseTiming", "convert_timing", "PrecisionTiming", "SampleIntervalMode", "Timing"]

tests/unit/waveform/_timing/test_conversion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import hightime as ht
77

88
from nitypes.waveform import PrecisionTiming, SampleIntervalMode, Timing
9-
from nitypes.waveform._timing._conversion import convert_timing
9+
from nitypes.waveform._timing import convert_timing
1010

1111
if sys.version_info >= (3, 11):
1212
from typing import assert_type

0 commit comments

Comments
 (0)