Fixed the errors and warnings in test_macros.TestScriptEditor

Author: kyleellefsen

flika/app/script_editor.py

@@ -120,6 +120,7 @@ def __init__(self, parent=None, ):
 
 
     def resetNamespace(self):
+        from .script_namespace import getnamespace
         self.terminal.shell.reset()
         self.terminal.shell.user_ns.update(getnamespace())
         self.terminal.namespace.update({'clear': self.terminal.clear, 'reset': self.resetNamespace})

flika/app/syntax.py

@@ -9,7 +9,7 @@ def format(color, style=''):
     _format = QtGui.QTextCharFormat()
     _format.setForeground(_color)
     if 'bold' in style:
-        _format.setFontWeight(QtGui.QFont.Bold)
+        _format.setFontWeight(QtGui.QFont.Weight.Bold if hasattr(QtGui.QFont, 'Weight') else QtGui.QFont.Bold)
     if 'italic' in style:
         _format.setFontItalic(True)
     return _format
@@ -48,25 +48,31 @@ class PythonHighlighter (QtGui.QSyntaxHighlighter):
         # Comparison
         '==', '!=', '<', '<=', '>', '>=',
         # Arithmetic
-        '\+', '-', '\*', '/', '//', '\%', '\*\*',
+        r'\+', '-', r'\*', '/', '//', r'%', r'\*\*',
         # In-place
-        '\+=', '-=', '\*=', '/=', '\%=',
+        r'\+=', '-=', r'\*=', '/=', r'%=',
         # Bitwise
-        '\^', '\|', '\&', '\~', '>>', '<<',
+        r'\^', r'\|', r'\&', r'\~', '>>', '<<',
     ]
 
     # Python braces
     braces = [
-        '\{', '\}', '\(', '\)', '\[', '\]',
+        r'\{', r'\}', r'\(', r'\)', r'\[', r'\]',
     ]
+    
     def __init__(self, document):
         QtGui.QSyntaxHighlighter.__init__(self, document)
 
         # Multi-line strings (expression, flag, style)
-        # FIXME: The triple-quotes in these two lines will mess up the
-        # syntax highlighting from this point onward
-        self.tri_single = (QtCore.QRegularExpression("'''"), 1, STYLES['string2'])
-        self.tri_double = (QtCore.QRegularExpression('"""'), 2, STYLES['string2'])
+        # Use QRegExp if QRegularExpression is not available
+        if hasattr(QtCore, 'QRegularExpression'):
+            self.tri_single = (QtCore.QRegularExpression("'''"), 1, STYLES['string2'])
+            self.tri_double = (QtCore.QRegularExpression('"""'), 2, STYLES['string2'])
+            self.RegexClass = QtCore.QRegularExpression
+        else:
+            self.tri_single = (QtCore.QRegExp("'''"), 1, STYLES['string2'])
+            self.tri_double = (QtCore.QRegExp('"""'), 2, STYLES['string2'])
+            self.RegexClass = QtCore.QRegExp
 
         rules = []
 
@@ -102,8 +108,8 @@ def __init__(self, document):
             (r'\b[+-]?[0-9]+(?:\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\b', 0, STYLES['numbers']),
         ]
 
-        # Build a QtCore.QRegularExpression for each pattern
-        self.rules = [(QtCore.QRegularExpression(pat), index, fmt)
+        # Build a RegExp for each pattern
+        self.rules = [(self.RegexClass(pat), index, fmt)
             for (pat, index, fmt) in rules]
 
 
@@ -112,12 +118,27 @@ def highlightBlock(self, text):
         """
         # Do other syntax formatting
         for expression, nth, format in self.rules:
-            match = expression.match(text, 0)
-            while match.hasMatch():
-                index = match.capturedStart()
-                length = match.capturedLength()
-                self.setFormat(index, length, format)
-                match = expression.match(text, index + length)
+            if hasattr(QtCore, 'QRegularExpression'):
+                # For QRegularExpression
+                match = expression.match(text, 0)
+                while match.hasMatch():
+                    index = match.capturedStart()
+                    length = match.capturedLength()
+                    if nth > 0:
+                        index = match.capturedStart(nth)
+                        length = match.capturedLength(nth)
+                    self.setFormat(index, length, format)
+                    match = expression.match(text, index + length)
+            else:
+                # For QRegExp
+                index = expression.indexIn(text)
+                while index >= 0:
+                    length = expression.matchedLength()
+                    if nth > 0:
+                        index = expression.pos(nth)
+                        length = len(expression.cap(nth))
+                    self.setFormat(index, length, format)
+                    index = expression.indexIn(text, index + length)
 
         self.setCurrentBlockState(0)
 
@@ -129,7 +150,7 @@ def highlightBlock(self, text):
 
     def match_multiline(self, text, delimiter, in_state, style):
         """Do highlighting of multi-line strings. ``delimiter`` should be a
-        ``QtCore.QRegularExpression`` for triple-single-quotes or triple-double-quotes, and
+        ``QRegExp`` or ``QRegularExpression`` for triple-single-quotes or triple-double-quotes, and
         ``in_state`` should be a unique integer to represent the corresponding
         state changes when inside those strings. Returns True if we're still
         inside a multi-line string when this function is finished.
@@ -140,17 +161,34 @@ def match_multiline(self, text, delimiter, in_state, style):
             add = 0
         # Otherwise, look for the delimiter on this line
         else:
-            start = delimiter.indexIn(text)
-            # Move past this match
-            add = delimiter.matchedLength()
+            if hasattr(QtCore, 'QRegularExpression'):
+                # For QRegularExpression
+                match = delimiter.match(text)
+                start = match.capturedStart() if match.hasMatch() else -1
+                add = match.capturedLength() if match.hasMatch() else 0
+            else:
+                # For QRegExp
+                start = delimiter.indexIn(text)
+                add = delimiter.matchedLength()
 
         # As long as there's a delimiter match on this line...
         while start >= 0:
             # Look for the ending delimiter
-            end = delimiter.indexIn(text, start + add)
+            if hasattr(QtCore, 'QRegularExpression'):
+                # For QRegularExpression
+                match = delimiter.match(text, start + add)
+                end = match.capturedStart() if match.hasMatch() else -1
+            else:
+                # For QRegExp
+                end = delimiter.indexIn(text, start + add)
+                
             # Ending delimiter on this line?
             if end >= add:
-                length = end - start + add + delimiter.matchedLength()
+                # Fix the conditional to properly handle match objects
+                if hasattr(QtCore, 'QRegularExpression') and match.hasMatch():
+                    length = end - start + add + match.capturedLength()
+                else:
+                    length = end - start + add + delimiter.matchedLength()
                 self.setCurrentBlockState(0)
             # No; multi-line string
             else:
@@ -159,7 +197,13 @@ def match_multiline(self, text, delimiter, in_state, style):
             # Apply formatting
             self.setFormat(start, length, style)
             # Look for the next match
-            start = delimiter.indexIn(text, start + length)
+            if hasattr(QtCore, 'QRegularExpression'):
+                # For QRegularExpression
+                match = delimiter.match(text, start + length)
+                start = match.capturedStart() if match.hasMatch() else -1
+            else:
+                # For QRegExp
+                start = delimiter.indexIn(text, start + length)
 
         # Return True if still inside a multi-line string, False otherwise
         if self.currentBlockState() == in_state:

flika/app/terminal.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import sys
+import os
 import atexit
 from contextlib import contextmanager
 from typing import Any, Dict, Optional, Type, Union
@@ -14,7 +15,11 @@
 
 # ZMQ imports
 from zmq import ZMQError
-from zmq.eventloop import ioloop
+# Remove deprecated zmq.eventloop.ioloop import
+# from zmq.eventloop import ioloop
+# Import tornado's ioloop directly instead (if needed)
+import tornado.ioloop
+# Use current import location for ZMQStream
 from zmq.eventloop.zmqstream import ZMQStream
 
 # Import version
@@ -158,9 +163,9 @@ def init_kernel(self) -> None:
 
     def start(self) -> None:
         # Handoff between IOLoop and QApplication event loops
-        loop = ioloop.IOLoop.instance()
+        loop = tornado.ioloop.IOLoop.instance()
         # Use 1ms callback time to prevent application hanging
-        stopper = ioloop.PeriodicCallback(loop.stop, 1, loop)
+        stopper = tornado.ioloop.PeriodicCallback(loop.stop, 1, loop)
         self.timer = QtCore.QTimer()
         self.timer.timeout.connect(loop.start)
         self.timer.start(100)

flika/flika.py

@@ -5,16 +5,17 @@
 import platform
 import optparse
 import warnings
+
+# Set Jupyter to use platformdirs (fixes deprecation warning)
+os.environ['JUPYTER_PLATFORM_DIRS'] = '1'
+
 logger.debug("Started 'reading flika.py, importing numpy'")
 import numpy as np  # type: ignore
 logger.debug("Completed 'reading flika.py, importing numpy'")
 from .version import __version__
 from .app.application import FlikaApplication
 
-
-
-
-
+# Filter out known warnings
 warnings.filterwarnings("ignore", category=np.exceptions.VisibleDeprecationWarning)
 
 def parse_arguments(argv):

flika/tests/test_macros.py

@@ -35,17 +35,17 @@
 #         assert PluginManager.plugins[plugin_name].menu is None and not PluginManager.plugins[plugin_name].installed, "Plugin uninstall"
 
 
-# class TestScriptEditor():
-#     def setup_method(self, method):
-#         ScriptEditor.show()
-
-#     def teardown_method(self, method):
-#         ScriptEditor.close()
-
-#     def test_from_window(self):
-#         w1 = Window(np.random.random([10, 20, 20]))
-#         from ..process import threshold
-#         w2 = threshold(.5)
-#         ScriptEditor.gui.actionFrom_Window.trigger()
-#         text = str(ScriptEditor.gui.currentTab().toPlainText())
-#         assert text == "threshold(value=0.5, darkBackground=False, keepSourceWindow=False)", "From window command not expected"
+class TestScriptEditor():
+    def setup_method(self, method):
+        ScriptEditor.show()
+
+    def teardown_method(self, method):
+        ScriptEditor.close()
+
+    def test_from_window(self):
+        w1 = Window(np.random.random([10, 20, 20]))
+        from ..process import threshold
+        w2 = threshold(.5)
+        ScriptEditor.gui.actionFrom_Window.trigger()
+        text = str(ScriptEditor.gui.currentTab().toPlainText())
+        assert text == "threshold(value=0.5, darkBackground=False, keepSourceWindow=False)", "From window command not expected"