Remove PY2 and labscript_suite_profile variables.

chrisjbillington · chrisjbillington · commit d69a4df7fcc3 · 2020-05-23T16:03:53.000-04:00
diff --git a/labscript_profile/__init__.py b/labscript_profile/__init__.py
@@ -61,8 +61,8 @@ def add_userlib_and_pythonlib():
 
 
 def add_development_directories():
-    """Prepend directories in <labscript_suite_profile>/dev to the search path, if they
-    are listed in the file <labscript_suite_profile>/dev/enabled (if that file
+    """Prepend directories in <LABSCRIPT_SUITE_PROFILE>/dev to the search path, if they
+    are listed in the file <LABSCRIPT_SUITE_PROFILE>/dev/enabled (if that file
     exists)."""
     if LABSCRIPT_SUITE_PROFILE is None:
         return
diff --git a/labscript_utils/__init__.py b/labscript_utils/__init__.py
@@ -17,8 +17,6 @@
 
 from .__version__ import __version__ 
 
-PY2 = sys.version_info[0] == 2
-
 from labscript_profile import LABSCRIPT_SUITE_PROFILE
 
 if not os.path.exists(LABSCRIPT_SUITE_PROFILE):
@@ -30,8 +28,6 @@
     import labscript_profile
     labscript_profile.add_userlib_and_pythonlib()
 
-# labscript_suite_install_dir alias for backward compatibility:
-labscript_suite_profile = labscript_suite_install_dir = str(LABSCRIPT_SUITE_PROFILE)
 
 # This folder
 labscript_utils_dir = os.path.dirname(os.path.realpath(__file__))
diff --git a/labscript_utils/labconfig.py b/labscript_utils/labconfig.py
@@ -17,10 +17,10 @@
 import errno
 import configparser
 
-from labscript_utils import labscript_suite_profile
+from labscript_profile import LABSCRIPT_SUITE_PROFILE
 # Look for a 'labconfig' folder in the labscript install directory:
-if labscript_suite_profile is not None:
-    config_prefix = os.path.join(labscript_suite_profile, 'labconfig')
+if LABSCRIPT_SUITE_PROFILE is not None:
+    config_prefix = os.path.join(LABSCRIPT_SUITE_PROFILE, 'labconfig')
 else:
     # No labscript install directory found? Revert to system defaults
     if os.name == 'nt':
