Remove PY2 compat from DAQmx template and regenerate all class files

chrisjbillington · chrisjbillington · commit 80ed3b625c0e · 2020-05-23T16:31:14.000-04:00
diff --git a/labscript_devices/NI_DAQmx/models/NI_PCI_6251.py b/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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_PCI_6534.py b/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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_PCI_6713.py b/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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_PCI_6733.py b/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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_PCI_DIO_32HS.py b/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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_PCIe_6363.py b/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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_PCIe_6738.py b/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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_PXI_6733.py b/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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_PXIe_6361.py b/labscript_devices/NI_DAQmx/models/NI_PXIe_6361.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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_PXIe_6535.py b/labscript_devices/NI_DAQmx/models/NI_PXIe_6535.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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_PXIe_6738.py b/labscript_devices/NI_DAQmx/models/NI_PXIe_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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_USB_6008.py b/labscript_devices/NI_DAQmx/models/NI_USB_6008.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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_USB_6229.py b/labscript_devices/NI_DAQmx/models/NI_USB_6229.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 = {
diff --git a/labscript_devices/NI_DAQmx/models/NI_USB_6343.py b/labscript_devices/NI_DAQmx/models/NI_USB_6343.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 = {
diff --git a/labscript_devices/NI_DAQmx/models/_subclass_template.py b/labscript_devices/NI_DAQmx/models/_subclass_template.py
@@ -13,12 +13,6 @@
 
 ${AUTOGENERATION_WARNING}
 
-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 = ${CAPABILITIES}
diff --git a/labscript_devices/NI_DAQmx/models/generate_subclasses.py b/labscript_devices/NI_DAQmx/models/generate_subclasses.py
@@ -10,14 +10,6 @@
 # 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 io
-    open = io.open
-
 import os
 import warnings
 import json
