Skip to content

Commit cdfae0e

Browse files
Fix regression: restore missing import zprocess.raise_exception_in_thread.
Fixes labscript-suite#63
1 parent 3eac923 commit cdfae0e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

__main__.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
from labscript_utils.labconfig import LabConfig, config_prefix
7373
from labscript_utils.setup_logging import setup_logging
7474
import labscript_utils.shared_drive as shared_drive
75+
from zprocess import raise_exception_in_thread
7576
import runmanager
7677

7778
from qtutils import inmain, inmain_decorator, UiLoader, inthread, DisconnectContextManager
@@ -2504,7 +2505,7 @@ def preparse_globals_loop(self):
25042505
# Raise the error, but keep going so we don't take down the
25052506
# whole thread if there is a bug.
25062507
exc_info = sys.exc_info()
2507-
zprocess.raise_exception_in_thread(exc_info)
2508+
raise_exception_in_thread(exc_info)
25082509
continue
25092510

25102511
def get_group_item_by_name(self, globals_file, group_name, column, previous_name=None):
@@ -3001,7 +3002,7 @@ def warning(message):
30013002
self.open_globals_file(globals_file)
30023003
self.last_opened_globals_folder = os.path.dirname(globals_file)
30033004
except Exception:
3004-
zprocess.raise_exception_in_thread(sys.exc_info())
3005+
raise_exception_in_thread(sys.exc_info())
30053006
continue
30063007
else:
30073008
self.output_box.output('\nWarning: globals file %s no longer exists\n' % globals_file, red=True)
@@ -3146,7 +3147,7 @@ def compile_loop(self):
31463147
# Raise it so whatever bug it is gets seen, but keep going so
31473148
# the thread keeps functioning:
31483149
exc_info = sys.exc_info()
3149-
zprocess.raise_exception_in_thread(exc_info)
3150+
raise_exception_in_thread(exc_info)
31503151
continue
31513152

31523153
def parse_globals(self, active_groups, raise_exceptions=True, expand_globals=True, expansion_order = None, return_dimensions = False):

0 commit comments

Comments
 (0)