import IS_WINDOWS from constants.py

MSLNZ · Oct 25, 2023 · ca74577 · ca74577
1 parent 416945c
commit ca74577
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/msl/equipment/resources/avantes/avaspec.py b/msl/equipment/resources/avantes/avaspec.py
@@ -5,7 +5,6 @@
 """
 from __future__ import annotations
 
-import sys
 from ctypes import POINTER
 from ctypes import Structure
 from ctypes import c_bool
@@ -28,11 +27,10 @@
 from msl.loadlib import LoadLibrary
 
 from msl.equipment.connection_sdk import ConnectionSDK
+from msl.equipment.constants import IS_WINDOWS
 from msl.equipment.exceptions import AvantesError
 from msl.equipment.resources import register
 
-IS_WINDOWS = sys.platform == 'win32'
-
 WM_MEAS_READY = 0x8001
 SETTINGS_RESERVED_LEN = 9720
 INVALID_AVS_HANDLE_VALUE = 1000

diff --git a/msl/equipment/resources/picotech/picoscope/picoscope.py b/msl/equipment/resources/picotech/picoscope/picoscope.py
@@ -5,7 +5,6 @@
 
 import os
 import re
-import sys
 import time
 from ctypes import addressof
 from ctypes import byref
@@ -18,6 +17,7 @@
 from msl.loadlib import LoadLibrary
 
 from msl.equipment.connection_sdk import ConnectionSDK
+from msl.equipment.constants import IS_WINDOWS
 from msl.equipment.exceptions import PicoTechError
 from . import callbacks
 from . import enums
@@ -29,8 +29,6 @@
 
 ALLOWED_SDKs = ('ps2000', 'ps2000a', 'ps3000', 'ps3000a', 'ps4000', 'ps4000a', 'ps5000', 'ps5000a', 'ps6000')
 
-IS_WINDOWS = sys.platform == 'win32'
-
 
 def enumerate_units():
     """Find the PicoScopes that are connected to the computer.

diff --git a/msl/equipment/resources/picotech/pt104.py b/msl/equipment/resources/picotech/pt104.py
@@ -3,7 +3,6 @@
 """
 from __future__ import annotations
 
-import sys
 from ctypes import POINTER
 from ctypes import addressof
 from ctypes import byref
@@ -18,6 +17,7 @@
 from msl.loadlib import LoadLibrary
 
 from msl.equipment.connection_sdk import ConnectionSDK
+from msl.equipment.constants import IS_WINDOWS
 from msl.equipment.exceptions import PicoTechError
 from msl.equipment.resources import register
 from . import c_enum
@@ -27,8 +27,6 @@
 from .errors import PICO_OK
 from .picoscope.enums import PicoScopeInfoApi
 
-IS_WINDOWS = sys.platform == 'win32'
-
 
 class Pt104DataType(IntEnum):
     """