psychopy 2024.2.4__py3-none-any.whl → 2025.1.0__py3-none-any.whl

psychopy/tests/test_visual/test_form.py

@@ -7,7 +7,7 @@ from pathlib import Path
 import pytest
 from pandas import DataFrame
 
-from psychopy.tests.test_visual.test_basevisual import _TestColorMixin
+from psychopy.tests.test_visual.test_basevisual import _TestColorMixin, _TestSerializationMixin
 from psychopy.tests.test_experiment.test_component_compile_python import _TestBoilerplateMixin
 from psychopy.visual.window import Window
 from psychopy.visual.form import Form
@@ -19,7 +19,7 @@ from tempfile import mkdtemp
 import numpy as np
 
 
-class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
+class Test_Form(_TestColorMixin, _TestBoilerplateMixin, _TestSerializationMixin):
     """Test suite for Form component"""
 
     def setup_class(self):
@@ -129,7 +129,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
                     'itemWidth': 0.3,
                     'responseColor': 'darkred',
                     'responseWidth': 0.7,
-                    'font': 'Open Sans',
+                    'font': 'Noto Sans',
                 },
                 {
                     'index': 0,
@@ -141,7 +141,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
                     'itemWidth': 0.3,
                     'responseColor': 'darkslateblue',
                     'responseWidth': 0.7,
-                    'font': 'Open Sans',
+                    'font': 'Noto Sans',
                 },
             ],
             'bigItem': [  # Item is bigger than resp
@@ -155,7 +155,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
                     'itemWidth': 0.7,
                     'responseColor': 'darkred',
                     'responseWidth': 0.3,
-                    'font': 'Open Sans',
+                    'font': 'Noto Sans',
                 },
                 {
                     'index': 0,
@@ -167,7 +167,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
                     'itemWidth': 0.7,
                     'responseColor': 'darkslateblue',
                     'responseWidth': 0.3,
-                    'font': 'Open Sans',
+                    'font': 'Noto Sans',
                 },
             ],
         }
@@ -183,7 +183,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
                     'itemWidth': 0.4,
                     'responseColor': 'darkred',
                     'responseWidth': 0.8,
-                    'font': 'Open Sans',
+                    'font': 'Noto Sans',
                 },
                 {
                     'index': 0,
@@ -195,7 +195,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
                     'itemWidth': 0.4,
                     'responseColor': 'darkslateblue',
                     'responseWidth': 0.8,
-                    'font': 'Open Sans',
+                    'font': 'Noto Sans',
                 },
             ],
             'bigItemOverflow': [  # Item is bigger than resp, both together flow over form edge
@@ -209,7 +209,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
                     'itemWidth': 0.8,
                     'responseColor': 'darkred',
                     'responseWidth': 0.4,
-                    'font': 'Open Sans',
+                    'font': 'Noto Sans',
                 },
                 {
                     'index': 0,
@@ -221,7 +221,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
                     'itemWidth': 0.8,
                     'responseColor': 'darkslateblue',
                     'responseWidth': 0.4,
-                    'font': 'Open Sans',
+                    'font': 'Noto Sans',
                 },
             ],
         }
@@ -262,7 +262,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
                 'itemWidth': 0.7,
                 'responseColor': 'darkred',
                 'responseWidth': 0.3,
-                'font': 'Open Sans',
+                'font': 'Noto Sans',
             })
         # Create form
         survey = Form(self.win, units="height", size=(1, 1), fillColor="white", items=items)
@@ -281,7 +281,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
             'itemWidth': 0.7,
             'responseColor': 'darkred',
             'responseWidth': 0.3,
-            'font': 'Open Sans',
+            'font': 'Noto Sans',
         }]
         # Typical points on slider to test
         exemplars = [
@@ -360,7 +360,7 @@ class Test_Form(_TestColorMixin, _TestBoilerplateMixin):
 
     def test_font(self):
         exemplars = [
-            {"file": "form_font_demographics.xlsx", "font": "Open Sans",
+            {"file": "form_font_demographics.xlsx", "font": "Noto Sans",
              "screenshot": "form_font_demographics.png"},
         ]
         tykes = [

psychopy/tests/test_visual/test_gamma.py

@@ -54,7 +54,7 @@ def test_monitorGetGamma():
     mon.setGamma(gammaVal)
     #create window using that monitor
     win = visual.Window([100,100], monitor=mon, autoLog=False)
-    assert numpy.alltrue(win.gamma==gammaVal)
+    assert numpy.all(win.gamma==gammaVal)
     win.close()
 
 
@@ -69,7 +69,7 @@ def test_monitorGetGammaGrid():
     mon = monitors.Monitor('test')
     mon.setGammaGrid(newGrid)
     win = visual.Window([100,100], monitor=mon, autoLog=False)
-    assert numpy.alltrue(win.gamma==numpy.array([2.0, 2.0, 2.0]))
+    assert numpy.all(win.gamma==numpy.array([2.0, 2.0, 2.0]))
     win.close()
 
 
@@ -87,7 +87,7 @@ def test_monitorGetGammaAndGrid():
     mon.setGamma([3,3,3])
     #create window using that monitor
     win = visual.Window([100,100], monitor=mon, autoLog=False)
-    assert numpy.alltrue(win.gamma==numpy.array([2.0, 2.0, 2.0]))
+    assert numpy.all(win.gamma==numpy.array([2.0, 2.0, 2.0]))
     win.close()
 
 

psychopy/tests/test_visual/test_image.py

@@ -1,12 +1,12 @@
 from pathlib import Path
 
 from psychopy import visual, colors, core
-from .test_basevisual import _TestUnitsMixin
+from .test_basevisual import _TestUnitsMixin, _TestSerializationMixin
 from psychopy.tests.test_experiment.test_component_compile_python import _TestBoilerplateMixin
 from psychopy.tests import utils
 import pytest
 
-class TestImage(_TestUnitsMixin, _TestBoilerplateMixin):
+class TestImage(_TestUnitsMixin, _TestBoilerplateMixin, _TestSerializationMixin):
     """
     Test that images render as expected. Note: In BaseVisual tests, image colors will look different than
     seems intuitive as foreColor will be set to `"blue"`.

psychopy/tests/test_visual/test_progress.py

@@ -1,11 +1,11 @@
 from psychopy import visual
-from .test_basevisual import _TestColorMixin, _TestUnitsMixin
+from .test_basevisual import _TestColorMixin, _TestUnitsMixin, _TestSerializationMixin
 from psychopy.tests.test_experiment.test_component_compile_python import _TestBoilerplateMixin
 from psychopy.tests import utils
 from pathlib import Path
 
 
-class TestProgress(_TestColorMixin, _TestUnitsMixin, _TestBoilerplateMixin):
+class TestProgress(_TestColorMixin, _TestUnitsMixin, _TestBoilerplateMixin, _TestSerializationMixin):
 
     @classmethod
     def setup_class(cls):

psychopy/tests/test_visual/test_roi.py

@@ -1,11 +1,14 @@
 import numpy as np
+import pytest
 
-from .test_basevisual import _TestUnitsMixin
+from psychopy.tests import utils
+
+from .test_basevisual import _TestUnitsMixin, _TestSerializationMixin
 from psychopy.tests.test_experiment.test_component_compile_python import _TestBoilerplateMixin
 from psychopy import visual, core
 
 
-class TestROI(_TestUnitsMixin, _TestBoilerplateMixin):
+class TestROI(_TestUnitsMixin, _TestBoilerplateMixin, _TestSerializationMixin):
 
     def setup_method(self):
         self.win = visual.Window([128,128], pos=[50,50], units="pix", allowGUI=False, autoLog=False)
@@ -57,6 +60,9 @@ class TestROI(_TestUnitsMixin, _TestBoilerplateMixin):
         assert not self.obj.isLookedIn, f"ROI returning True for isLookedIn when not looked at."
 
     def test_look_at_away(self):
+        # skip speed tests under vm
+        if utils.RUNNING_IN_VM:
+            pytest.skip()
         # Define some look times to simulate
         looks = np.array([
             [0.1, 0.2],

psychopy/tests/test_visual/test_shape.py

@@ -1,11 +1,11 @@
 import pytest
 from psychopy import visual
-from .test_basevisual import _TestColorMixin, _TestUnitsMixin
+from .test_basevisual import _TestColorMixin, _TestUnitsMixin, _TestSerializationMixin
 from psychopy.tests.test_experiment.test_component_compile_python import _TestBoilerplateMixin
 
 
 
-class TestShape(_TestColorMixin, _TestUnitsMixin, _TestBoilerplateMixin):
+class TestShape(_TestColorMixin, _TestUnitsMixin, _TestBoilerplateMixin, _TestSerializationMixin):
 
     @classmethod
     def setup_class(self):

psychopy/tests/test_visual/test_slider.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 
 from psychopy.tests import utils
-from psychopy.tests.test_visual.test_basevisual import _TestColorMixin
+from psychopy.tests.test_visual.test_basevisual import _TestColorMixin, _TestSerializationMixin
 from psychopy.tests.test_experiment.test_component_compile_python import _TestBoilerplateMixin
 from psychopy.visual.window import Window
 from psychopy.visual.slider import Slider
@@ -15,7 +15,7 @@ from numpy import array_equal
 import random
 
 
-class Test_Slider(_TestColorMixin, _TestBoilerplateMixin):
+class Test_Slider(_TestColorMixin, _TestBoilerplateMixin, _TestSerializationMixin):
     def setup_class(self):
 
         # Make a Window

psychopy/tests/test_visual/test_target.py

@@ -1,7 +1,7 @@
 from psychopy import visual, layout
-from .test_basevisual import _TestColorMixin, _TestUnitsMixin
+from .test_basevisual import _TestColorMixin, _TestUnitsMixin, _TestSerializationMixin
 
-class TestTarget(_TestUnitsMixin):
+class TestTarget(_TestUnitsMixin, _TestSerializationMixin):
     # Pixel which is the border color
     borderPoint = (0, 55)
     borderUsed = True

psychopy/tests/test_visual/test_textbox.py

@@ -3,8 +3,9 @@ from pathlib import Path
 import numpy as np
 
 from psychopy import layout
+from psychopy.alerts import addAlertHandler
 from psychopy.alerts._errorHandler import _BaseErrorHandler
-from psychopy.tests.test_visual.test_basevisual import _TestColorMixin, _TestUnitsMixin
+from psychopy.tests.test_visual.test_basevisual import _TestColorMixin, _TestUnitsMixin, _TestSerializationMixin
 from psychopy.tests.test_experiment.test_component_compile_python import _TestBoilerplateMixin
 from psychopy.visual import Window
 from psychopy.visual import TextBox2
@@ -17,10 +18,11 @@ from psychopy.tests import utils
 
 
 @pytest.mark.textbox
-class Test_textbox(_TestColorMixin, _TestUnitsMixin, _TestBoilerplateMixin):
+class Test_textbox(_TestColorMixin, _TestUnitsMixin, _TestBoilerplateMixin, _TestSerializationMixin):
     def setup_method(self):
         self.win = Window((128, 128), pos=(50, 50), monitor="testMonitor", allowGUI=False, autoLog=False)
         self.error = _BaseErrorHandler()
+        addAlertHandler(self.error)
         self.textbox = TextBox2(self.win,
                                 "A PsychoPy zealot knows a smidge of wx, but JavaScript is the question.",
                                 placeholder="Placeholder text",
@@ -331,7 +333,7 @@ class Test_textbox(_TestColorMixin, _TestUnitsMixin, _TestBoilerplateMixin):
             # },  # https://discourse.psychopy.org/t/textbox2-crashes-when-korean-input-exceed-certain-length/22717/6
             {
                 "text": "i need a word which will go off the page, antidisestablishmentarianism is a very long word",
-                "font": "Open Sans",
+                "font": "Noto Sans",
                 "screenshot": "textbox_typing_longWord.png"
             },  # Check that lines wrap correctly when there's a very long word, rather than as described in https://github.com/psychopy/psychopy/issues/3892
         ]
@@ -468,10 +470,6 @@ class Test_textbox(_TestColorMixin, _TestUnitsMixin, _TestBoilerplateMixin):
             utils.compareScreenshot(filename, self.win, crit=8)
 
         self.obj.speechPoint = None
-            
-    def test_alerts(self):
-        noFontTextbox = TextBox2(self.win, "", font="Raleway Dots", bold=True)
-        assert (self.error.alerts[0].code == 4325)
 
     def test_letter_spacing(self):
         cases = (0.6, 0.8, 1, None, 1.2, 1.4, 1.6, 1.8, 2.0)
@@ -493,7 +491,7 @@ def test_font_manager():
         # Create a font manager
         mgr = FontManager()
         # Check that it finds fonts which should be pre-packaged with PsychoPy in the resources folder
-        assert bool(mgr.getFontNamesSimilar("Open Sans"))
+        assert bool(mgr.getFontNamesSimilar("Noto Sans"))
         # Check that it doesn't find fonts which aren't installed as default
         assert not bool(mgr.getFontNamesSimilar("Dancing Script"))
         # Check that it can install fonts from Google

psychopy/tests/test_visual/test_winScalePos.py

@@ -28,13 +28,14 @@ class Test_Win_Scale_Pos_Ori:
 
         Non-zero viewOri would not currently pass with a nonzero viewPos
         """
-        with pytest.raises(ValueError):
-            # units must be define for viewPos!
-            _, = visual.Window(size=(200, 200), viewPos=(1, 1), viewOri=1)
+        # units if none defaults to user prefs, this condition is never met
+        # with pytest.raises(ValueError):
+        #     # units must be define for viewPos!
+        #     _ = visual.Window(size=(200, 200), viewPos=(1, 1), units=None)
         with pytest.raises(NotImplementedError):
             # simultaneous viewPos and viewOri prohibited at present
-            _, = visual.Window(size=(200, 200), units='pix',
-                               viewPos=(1, 1), viewOri=1)
+            _ = visual.Window(size=(200, 200), units='pix',
+                              viewPos=(1, 1), viewOri=1)
 
         for ori in [0, 45]:
             self.win.viewOri = ori

psychopy/tests/test_visual/test_window.py

@@ -1,12 +1,29 @@
+import importlib
 from copy import copy
 from pathlib import Path
 
 from psychopy import visual, colors
 from psychopy.tests import utils
 from psychopy.tests.test_visual.test_basevisual import _TestColorMixin
+from psychopy.tools.stimulustools import serialize
 from psychopy import colors
 
 class TestWindow:
+    def test_serialization(self):
+        # make window
+        win = visual.Window()
+        # serialize window
+        params = serialize(win, includeClass=True)
+        # get class
+        mod = importlib.import_module(params.pop('__module__'))
+        cls = getattr(mod, params.pop('__class__'))
+        # check class is Window
+        assert isinstance(win, cls)
+        # recreate win from params
+        dupe = cls(**params)
+        # delete duplicate
+        dupe.close()
+
     def test_background_image_fit(self):
         _baseCases = [
             # no fitting

psychopy/tests/utils.py

@@ -7,6 +7,7 @@ import numpy as np
 import io
 from psychopy import logging, colors
 from psychopy.tools import systemtools
+from psychopy.preferences import prefs
 
 try:
     from PIL import Image
@@ -23,7 +24,7 @@ RUNNING_IN_VM = systemtools.isVM_CI() is not None
 TESTS_PATH = abspath(dirname(__file__))
 TESTS_DATA_PATH = pjoin(TESTS_PATH, 'data')
 TESTS_FAILS_PATH = pjoin(TESTS_PATH, 'fails', sys.platform)
-TESTS_FONT = pjoin(TESTS_DATA_PATH, 'DejaVuSerif.ttf')
+TESTS_FONT = pjoin(prefs.paths['assets'], "fonts", 'DejaVuSerif.ttf')
 
 # Make sure all paths exist
 if not isdir(TESTS_FAILS_PATH):
@@ -69,6 +70,55 @@ def getFailFilenames(fileName, tag=""):
     return localFileName, exemplarFileName
 
 
+def checkSyntax(exp, targets=("PsychoPy", "PsychoJS")):
+    """
+    Check that a given Experiment object writes valid syntax.
+
+    Parameters
+    ----------
+    exp : psychopy.experiment
+        Experiment to check syntax for
+    targets : list[str] or tuple[str]
+        Languages to check syntax in ("PsychoPy" and/or "PsychoJS")
+
+    Raises
+    ------
+    SyntaxError
+        Will raise a SyntaxError if there's invalid syntax, and will store the broken script in 
+        tests/fails
+    """
+    # only test Python if Component is supposed to work locally
+    if "PsychoPy" in targets:
+        # temp file to save scripts to
+        file = Path(TESTS_FAILS_PATH) / f"test_{exp.name}_syntax_errors_script.py"
+        # write script
+        script = exp.writeScript(target="PsychoPy")
+        # compile (will error if there's syntax errors)
+        try:
+            compile(script, str(file), "exec")
+        except SyntaxError as err:
+            # save script to fails folder
+            file.write_text(script, encoding="utf-8")
+            # raise error
+            raise err
+    
+    # only test JS if Component is supposed to work online
+    if "PsychoJS" in targets:
+        # temp file to save scripts to
+        file = Path(TESTS_FAILS_PATH) / f"test_{exp.name}_syntax_errors_script.js"
+        # write script
+        script = exp.writeScript(target="PsychoJS")
+        # parse in esprima and raise any errors
+        import esprima
+        try:
+            esprima.parseModule(script)
+        except esprima.Error as err:
+            # save script to fails folder
+            file.write_text(script, encoding="utf-8")
+            # raise error
+            raise SyntaxError(err.message)
+
+
 def compareScreenshot(fileName, win, tag="", crit=5.0):
     """Compare the current back buffer of the given window with the file
 

psychopy/tools/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """Container for all miscellaneous functions and classes

psychopy/tools/arraytools.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """Functions and classes related to array handling
@@ -222,7 +222,7 @@ def val2array(value, withNone=True, withScalar=True, length=2):
             raise ValueError('Invalid parameter. None is not accepted as '
                              'value.')
     value = numpy.array(value, float)
-    if numpy.product(value.shape) == 1:
+    if numpy.prod(value.shape) == 1:
         if withScalar:
             # e.g. 5 becomes array([5.0, 5.0, 5.0]) for length=3
             return numpy.repeat(value, length)

psychopy/tools/attributetools.py

@@ -2,18 +2,58 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """Functions and classes related to attribute handling
 """
 
 import numpy
+import inspect
 from psychopy import logging
 from functools import partialmethod
 from psychopy.tools.stringtools import CaseSwitcher
 
 
+class UndefinedType:
+    """
+    Represents a value which has not been defined - useful for distinguishing between something not 
+    being set and something being set to None.
+    """
+
+    instance = None
+
+    def __new__(cls):
+        """
+        There should only ever be one instance of UndefinedType
+        """
+        if cls.instance is None:
+            cls.instance = super(cls, cls).__new__(cls)
+        
+        return cls.instance
+    
+    def __eq__(self, other):
+        """
+        Comparing undefined by ``==`` should be the same as by ``is``
+        """
+        return self is other
+    
+    def __bool__(self):
+        """
+        When used as a boolean, undefined is always ``False``
+        """
+        return False
+
+    def __repr__(self):
+        """
+        Display as simply ``undefined`` when printed.
+        """
+        return "undefined"
+
+
+undefined = UndefinedType()
+
+
 class attributeSetter:
     """Makes functions appear as attributes. Takes care of autologging.
     """
@@ -44,6 +84,17 @@ class attributeSetter:
         #        origin[1], origin[3].__repr__())))  # long
         '''
         return newValue
+    
+    def serialize(self):
+        """
+        If an attributeSetter is received by serializer as an attribute, return the default value or 
+        None
+        """
+        defaults = inspect.getfullargspec(self.func).defaults
+        if defaults:
+            return defaults[0]
+        else:
+            return None
 
     def __repr__(self):
         return repr(self.__getattribute__)

psychopy/tools/audiotools.py

@@ -28,7 +28,7 @@ __all__ = [
 ]
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import os
@@ -98,6 +98,9 @@ sampleRateQualityLevels = {
     4: (SAMPLE_RATE_96kHz, 'High-Def (96kHz)'),
     5: (SAMPLE_RATE_192kHz, 'Ultra High-Def (192kHz)')
 }
+sampleRateLabels = {
+    r[1]: r[0] for r in sampleRateQualityLevels.values()
+}
 
 # supported formats for loading and saving audio samples to file
 try:

psychopy/tools/colorspacetools.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """Tools related to working with various color spaces.
@@ -372,9 +372,11 @@ def cielch2rgb(lch,
 
     # convert values to L*a*b*
     lab = numpy.empty(lch.shape, dtype=lch.dtype)
-    lab[:, 0] = lch[:, 0]
-    lab[:, 1] = lch[:, 1] * numpy.math.cos(numpy.math.radians(lch[:, 2]))
-    lab[:, 2] = lch[:, 1] * numpy.math.sin(numpy.math.radians(lch[:, 2]))
+    lab[:, 0] = lch[:, 0]  # L* is the same
+    h_rad = numpy.radians(lch[:, 2])  
+    lab[:, 1] = lab[:, 2] = lch[:, 1]
+    lab[:, 1] *= numpy.cos(h_rad)
+    lab[:, 2] *= numpy.sin(h_rad)
 
     # convert to RGB using the CIE L*a*b* function
     rgb_out = cielab2rgb(lab,

psychopy/tools/coordinatetools.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """Functions and classes related to coordinate system conversion

psychopy/tools/fileerrortools.py

@@ -2,13 +2,14 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """Functions and classes related to file and directory error handling
 """
 import os
 import glob
+from pathlib import Path
 
 from psychopy import logging
 
@@ -32,14 +33,25 @@ def handleFileCollision(fileName, fileCollisionMethod):
                "fileCollisionMethod to overwrite.")
         raise IOError(msg % fileName)
     elif fileCollisionMethod == 'rename':
-        rootName, extension = os.path.splitext(fileName)
-        matchingFiles = glob.glob("%s*%s" % (rootName, extension))
-
-        # Build the renamed string.
-        if not matchingFiles:
-            fileName = "%s%s" % (rootName, extension)
-        else:
-            fileName = "%s_%d%s" % (rootName, len(matchingFiles), extension)
+        # convert to a Path object
+        fileObj = Path(fileName)
+        # use a glob star if we don't have an ext
+        if not fileObj.suffix:
+            fileObj = fileObj.parent / (fileObj.stem + ".*")
+        # get original file name
+        rootName = fileObj.stem
+        # get total number of sibling files to use as maximum for iteration
+        nSiblings = len(list(fileObj.parent.glob("*")))
+        # iteratively add numbers to the end until filename isn't taken
+        i = 0
+        while list(fileObj.parent.glob(fileObj.name)) and i < nSiblings:
+            i += 1
+            fileObj = fileObj.parent / (f"{rootName}_{i}" + fileObj.suffix)
+        # remove glob star from suffix if needed
+        if fileObj.suffix == ".*":
+            fileObj = fileObj.parent / fileObj.stem
+        # convert back to a string
+        fileName = str(fileObj)
 
         # Check to make sure the new fileName hasn't been taken too.
         if os.path.exists(fileName):

psychopy/tools/filetools.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """Functions and classes related to file and directory handling
@@ -246,7 +246,7 @@ def openOutputFile(fileName=None, append=False, fileCollisionMethod='rename',
         encoding = None
 
     if os.path.exists(fileName) and mode in ['w', 'wb']:
-        logging.warning('Data file %s will be overwritten!' % fileName)
+        logging.info('Data file %s will be overwritten' % fileName)
 
     # The file will always be opened in binary writing mode,
     # see https://docs.python.org/2/library/codecs.html#codecs.open