|
72 | 72 | from labscript_utils.labconfig import LabConfig, config_prefix
|
73 | 73 | from labscript_utils.setup_logging import setup_logging
|
74 | 74 | import labscript_utils.shared_drive as shared_drive
|
| 75 | +from zprocess import raise_exception_in_thread |
75 | 76 | import runmanager
|
76 | 77 |
|
77 | 78 | from qtutils import inmain, inmain_decorator, UiLoader, inthread, DisconnectContextManager
|
@@ -2504,7 +2505,7 @@ def preparse_globals_loop(self):
|
2504 | 2505 | # Raise the error, but keep going so we don't take down the
|
2505 | 2506 | # whole thread if there is a bug.
|
2506 | 2507 | exc_info = sys.exc_info()
|
2507 |
| - zprocess.raise_exception_in_thread(exc_info) |
| 2508 | + raise_exception_in_thread(exc_info) |
2508 | 2509 | continue
|
2509 | 2510 |
|
2510 | 2511 | def get_group_item_by_name(self, globals_file, group_name, column, previous_name=None):
|
@@ -3001,7 +3002,7 @@ def warning(message):
|
3001 | 3002 | self.open_globals_file(globals_file)
|
3002 | 3003 | self.last_opened_globals_folder = os.path.dirname(globals_file)
|
3003 | 3004 | except Exception:
|
3004 |
| - zprocess.raise_exception_in_thread(sys.exc_info()) |
| 3005 | + raise_exception_in_thread(sys.exc_info()) |
3005 | 3006 | continue
|
3006 | 3007 | else:
|
3007 | 3008 | self.output_box.output('\nWarning: globals file %s no longer exists\n' % globals_file, red=True)
|
@@ -3146,7 +3147,7 @@ def compile_loop(self):
|
3146 | 3147 | # Raise it so whatever bug it is gets seen, but keep going so
|
3147 | 3148 | # the thread keeps functioning:
|
3148 | 3149 | exc_info = sys.exc_info()
|
3149 |
| - zprocess.raise_exception_in_thread(exc_info) |
| 3150 | + raise_exception_in_thread(exc_info) |
3150 | 3151 | continue
|
3151 | 3152 |
|
3152 | 3153 | def parse_globals(self, active_groups, raise_exceptions=True, expand_globals=True, expansion_order = None, return_dimensions = False):
|
|
0 commit comments