Merge pull request #50 from chrisjbillington/remove-cruft

Remove cruft

Author: chrisjbillington

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+")