Remove cruft

labscript_devices/AlazarTechBoard.py

@@ -2,18 +2,13 @@
 # Hacked up from NIboard.py by LDT 2017-01-26
 #
 # Copyright (c) Monash University 2017
-from __future__ import division, unicode_literals, print_function
 import ctypes
 import numpy as np
 import signal
 import sys
 import time
 from tqdm import tqdm
 
-from labscript_utils import PY2
-if PY2:
-    str = unicode
-
 # Install atsapi.py into site-packages for this to work
 # or keep in local directory.
 import labscript_devices.atsapi as ats
@@ -275,11 +270,7 @@ def init(self):
         global h5py
         import labscript_utils.h5_lock
         import h5py
-        from labscript_utils import PY2
-        if PY2:
-            from Queue import Queue
-        else:
-            from queue import Queue
+        from queue import Queue
         import threading
 
         # SDK startup

labscript_devices/AndorSolis/andor_sdk/andor_solis.py

@@ -12,8 +12,6 @@
 from .status_codes import _SC
 from .andor_structures import ColorDemosaicInfo, AndorCapabilities
 
-PYTHON = sys.version_info
-
 # Custom ctypes
 at_32 = ctypes.c_long
 at_64 = ctypes.c_uint64

labscript_devices/Camera.py

@@ -10,15 +10,6 @@
 # the project for the full license.                                 #
 #                                                                   #
 #####################################################################
-from __future__ import division, unicode_literals, print_function, absolute_import
-
-from labscript_utils import check_version
-check_version('labscript', '2.0.1', '3')
-check_version('zprocess', '2.4.8', '3')
-from labscript_utils import PY2
-if PY2:
-    str = unicode
-
 from labscript_devices import BLACS_tab
 from labscript import TriggerableDevice, LabscriptError, set_passed_properties
 import numpy as np

labscript_devices/CiceroOpalKellyXEM3001.py

@@ -11,11 +11,6 @@
 #                                                                   #
 #####################################################################
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-if PY2:
-    str = unicode
-
 from labscript import Device, PseudoclockDevice, Pseudoclock, ClockLine, config, LabscriptError, set_passed_properties, compiler, IntermediateDevice, WaitMonitor, DigitalOut
 from labscript_devices import runviewer_parser, BLACS_tab, BLACS_worker, labscript_device
 
@@ -461,8 +456,6 @@ def init(self):
 
         # Initialise connection to OPAL KELLY Board
         self.dev = ok.okCFrontPanel()
-        if PY2:
-            self.serial = bytes(self.serial)
         assert self.dev.OpenBySerial(self.serial) == self.dev.NoError
 
         try:
@@ -488,8 +481,6 @@ def flash_FPGA(self):
             raise RuntimeError('Cannot flash the FPGA for the current reference clock configuration as the .bit file is missing. Please ensure the correct bit file is available at %s'%fpga_path)
 
         self.logger.debug('Flashing FPGA bit file located at: %s'%fpga_path)
-        if PY2:
-            fpga_path = bytes(fpga_path)
         self.dev.ConfigureFPGA(fpga_path)
         assert self.dev.IsFrontPanelEnabled(), 'Flashing of the FPGA failed. The device is not configured with the .bit file correctly'
 

labscript_devices/DummyIntermediateDevice.py

@@ -11,10 +11,6 @@
 #                                                                   #
 #####################################################################
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-if PY2:
-    str = unicode
 
 # This file represents a dummy labscript device for purposes of testing BLACS
 # and labscript. The device is a Intermediate Device, and can be attached to

labscript_devices/DummyPseudoclock/__init__.py

@@ -10,11 +10,6 @@
 # the project for the full license.                                 #
 #                                                                   #
 #####################################################################
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-if PY2:
-    str = unicode
-
 from labscript_devices import deprecated_import_alias
 
 

labscript_devices/DummyPseudoclock/blacs_tabs.py

@@ -10,10 +10,6 @@
 # the project for the full license.                                 #
 #                                                                   #
 #####################################################################
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-if PY2:
-    str = unicode
 from blacs.device_base_class import DeviceTab, define_state, MODE_BUFFERED
 
 class DummyPseudoclockTab(DeviceTab):

labscript_devices/DummyPseudoclock/blacs_workers.py

@@ -10,10 +10,6 @@
 # the project for the full license.                                 #
 #                                                                   #
 #####################################################################
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-if PY2:
-    str = unicode
 import time
 import labscript_utils.h5_lock
 import h5py

labscript_devices/DummyPseudoclock/labscript_devices.py

@@ -10,10 +10,6 @@
 # the project for the full license.                                 #
 #                                                                   #
 #####################################################################
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-if PY2:
-    str = unicode
 
 # This file represents a dummy labscript device for purposes of testing BLACS
 # and labscript. The device is a PseudoclockDevice, and can be the sole device

labscript_devices/FlyCapture2Camera/__init__.py

@@ -1,4 +0,0 @@
-
-import sys
-if sys.version_info < (3,6):
-    raise RuntimeError("FlyCapture2Camera strongly prefers Python 3.6+")

labscript_devices/FunctionRunner/__init__.py

@@ -9,10 +9,4 @@
 # Simplified BSD License. See the license.txt file in the root of   #
 # the project for the full license.                                 #
 #                                                                   #
-#####################################################################
-
-from labscript_utils import check_version
-
-import sys
-if sys.version_info < (3, 5):
-    raise RuntimeError("FunctionRunner requires Python 3.5+")
+#####################################################################

labscript_devices/IMAQdxCamera/__init__.py

@@ -1,9 +0,0 @@
-from labscript_utils import check_version
-
-import sys
-if sys.version_info < (3, 6):
-    raise RuntimeError("IMAQdxCamera driver requires Python 3.6+")
-
-
-check_version('labscript_utils', '2.14.0', '3')
-check_version('labscript', '2.5.2', '3')

labscript_devices/IMAQdxCamera/blacs_workers.py

@@ -30,11 +30,6 @@
 from labscript_utils.shared_drive import path_to_local
 from labscript_utils.properties import set_attributes
 
-# Required for knowing the parent device's hostname when running remotely:
-from labscript_utils import check_version
-
-check_version('zprocess', '2.12.0', '3')
-
 # Don't import nv yet so as not to throw an error, allow worker to run as a dummy
 # device, or for subclasses to import this module to inherit classes without requiring
 # nivision

labscript_devices/LightCrafterDMD.py

@@ -10,20 +10,13 @@
 # the project for the full license.                                 #
 #                                                                   #
 #####################################################################
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-if PY2:
-    str = unicode
 
 # COMMON IMPORTS
 import base64
 import os
 import struct
 import PIL.Image
-if PY2:
-    from StringIO import StringIO as BytesIO
-else:
-    from io import BytesIO
+from io import BytesIO
 
 import labscript_utils.h5_lock, h5py
 

labscript_devices/NI_DAQmx/__init__.py

@@ -9,9 +9,4 @@
 # licensed under the Simplified BSD License. See the license.txt    #
 # file in the root of the project for the full license.             #
 #                                                                   #
-#####################################################################
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
+#####################################################################

labscript_devices/NI_DAQmx/blacs_tabs.py

@@ -10,15 +10,9 @@
 # file in the root of the project for the full license.             #
 #                                                                   #
 #####################################################################
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
-
 import labscript_utils.h5_lock
 import h5py
-from labscript_utils import VersionException, dedent
+from labscript_utils import dedent
 
 from blacs.device_base_class import DeviceTab
 from .utils import split_conn_AO, split_conn_DO
@@ -43,7 +37,7 @@ def initialise_GUI(self):
                 to 2.4.0 or less, or recompile the connection table with
                 labscript_devices 2.5.0 or greater.
                 """
-            raise VersionException(dedent(msg))
+            raise RuntimeError(dedent(msg))
 
         num_AO = properties['num_AO']
         num_AI = properties['num_AI']

labscript_devices/NI_DAQmx/blacs_workers.py

@@ -10,21 +10,9 @@
 # file in the root of the project for the full license.             #
 #                                                                   #
 #####################################################################
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
-
 import sys
 import time
 import threading
-import logging
-
-from labscript_utils import check_version
-
-check_version('PyDAQmx', '1.4.2', '2.0.0')
-
 from PyDAQmx import *
 from PyDAQmx.DAQmxConstants import *
 from PyDAQmx.DAQmxTypes import *

labscript_devices/NI_DAQmx/daqmx_utils.py

@@ -1,9 +1,3 @@
-from __future__ import print_function, unicode_literals, division, absolute_import
-
-from labscript_utils import check_version
-
-check_version('PyDAQmx', '1.4.2', '2.0.0')
-
 import ctypes
 import PyDAQmx as daqmx
 import PyDAQmx.DAQmxConstants as c

labscript_devices/NI_DAQmx/labscript_devices.py

@@ -11,16 +11,8 @@
 #                                                                   #
 #####################################################################
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2, check_version
-
-if PY2:
-    str = unicode
-
-
 __version__ = '1.0.0'
 
-check_version('labscript', '2.5.0', '3.0.0')
 
 from labscript import (
     IntermediateDevice,

labscript_devices/NI_DAQmx/models/NI_PCI_6251.py

@@ -20,12 +20,6 @@
 #####################################################################
 
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
-
 from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx
 
 CAPABILITIES = {

labscript_devices/NI_DAQmx/models/NI_PCI_6534.py

@@ -20,12 +20,6 @@
 #####################################################################
 
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
-
 from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx
 
 CAPABILITIES = {

labscript_devices/NI_DAQmx/models/NI_PCI_6713.py

@@ -20,12 +20,6 @@
 #####################################################################
 
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
-
 from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx
 
 CAPABILITIES = {

labscript_devices/NI_DAQmx/models/NI_PCI_6733.py

@@ -20,12 +20,6 @@
 #####################################################################
 
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
-
 from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx
 
 CAPABILITIES = {

labscript_devices/NI_DAQmx/models/NI_PCI_DIO_32HS.py

@@ -20,12 +20,6 @@
 #####################################################################
 
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
-
 from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx
 
 CAPABILITIES = {

labscript_devices/NI_DAQmx/models/NI_PCIe_6363.py

@@ -20,12 +20,6 @@
 #####################################################################
 
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
-
 from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx
 
 CAPABILITIES = {

labscript_devices/NI_DAQmx/models/NI_PCIe_6738.py

@@ -20,12 +20,6 @@
 #####################################################################
 
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
-
 from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx
 
 CAPABILITIES = {

labscript_devices/NI_DAQmx/models/NI_PXI_6733.py

@@ -20,12 +20,6 @@
 #####################################################################
 
 
-from __future__ import division, unicode_literals, print_function, absolute_import
-from labscript_utils import PY2
-
-if PY2:
-    str = unicode
-
 from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx
 
 CAPABILITIES = {