psychopy 2024.1.4__py3-none-any.whl → 2024.2.0__py3-none-any.whl

psychopy/event.py

@@ -33,6 +33,8 @@ except ImportError:
     havePyglet = False
 try:
     import glfw
+    if not glfw.init():
+        raise ImportError
     haveGLFW = True
 except ImportError:
     haveGLFW = False
@@ -52,15 +54,6 @@ if haveGLFW:
 else:
     useGLFW = False
 
-
-if havePyglet:
-    # get the default display
-    if pyglet.version < '1.4':
-        _default_display_ = pyglet.window.get_platform().get_default_display()
-    else:
-        _default_display_ = pyglet.canvas.get_display()
-
-
 import psychopy.core
 from psychopy.tools.monitorunittools import cm2pix, deg2pix, pix2cm, pix2deg
 from psychopy import logging
@@ -407,11 +400,14 @@ def getKeys(keyList=None, modifiers=False, timeStamped=False):
         for evts in evt.get(locals.KEYDOWN):
             # pygame has no keytimes
             keys.append((pygame.key.name(evts.key), 0))
-    elif havePyglet:
+
+    global _keyBuffer
+
+    if havePyglet:
         # for each (pyglet) window, dispatch its events before checking event
         # buffer
         windowSystem = 'pyglet'
-        for win in _default_display_.get_windows():
+        for win in pyglet.app.windows:
             try:
                 win.dispatch_events()  # pump events on pyglet windows
             except ValueError as e:  # pragma: no cover
@@ -420,16 +416,14 @@ def getKeys(keyList=None, modifiers=False, timeStamped=False):
                 # specific to certain systems and versions of Python.
                 logging.error(u'Failed to handle keypress')
 
-        global _keyBuffer
         if len(_keyBuffer) > 0:
             # then pyglet is running - just use this
             keys = _keyBuffer
             # _keyBuffer = []  # DO /NOT/ CLEAR THE KEY BUFFER ENTIRELY
 
-    elif haveGLFW:
+    if haveGLFW:
         windowSystem = 'glfw'
-        # 'poll_events' is called when a window is flipped, all the callbacks
-        # populate the buffer
+        glfw.poll_events()
         if len(_keyBuffer) > 0:
             keys = _keyBuffer
 
@@ -530,11 +524,6 @@ def waitKeys(maxWait=float('inf'), keyList=None, modifiers=False,
     got_keypress = False
 
     while not got_keypress and timer.getTime() < maxWait:
-        # Pump events on pyglet windows if they exist.
-        if havePyglet:
-            for win in _default_display_.get_windows():
-                win.dispatch_events()
-
         # Get keypresses and return if anything is pressed.
         keys = getKeys(keyList=keyList, modifiers=modifiers,
                        timeStamped=timeStamped)
@@ -563,8 +552,8 @@ class Mouse:
     Create your `visual.Window` before creating a Mouse.
 
     :Parameters:
-        visible : **True** or False
-            makes the mouse invisible if necessary
+        visible : bool or None
+            Show the mouse if True, hide it if False, leave it as is if None (default)
         newPos : **None** or [x,y]
             gives the mouse a particular starting position
             (pygame `Window` only)
@@ -574,7 +563,7 @@ class Mouse:
     """
 
     def __init__(self,
-                 visible=True,
+                 visible=None,
                  newPos=None,
                  win=None):
         super(Mouse, self).__init__()
@@ -609,7 +598,8 @@ class Mouse:
         global usePygame
         if havePygame and not pygame.display.get_init():
             usePygame = False
-        self.setVisible(visible)
+        if visible is not None:
+            self.setVisible(visible)
         if newPos is not None:
             self.setPos(newPos)
 
@@ -887,12 +877,14 @@ class Mouse:
         if usePygame:
             return mouse.get_pressed()
         else:
-            # False:  # havePyglet: # like in getKeys - pump the events
             # for each (pyglet) window, dispatch its events before checking
             # event buffer
+            if havePyglet:
+                for win in pyglet.app.windows:
+                    win.dispatch_events()  # pump events on pyglet windows
 
-            for win in _default_display_.get_windows():
-                win.dispatch_events()  # pump events on pyglet windows
+            if haveGLFW:
+                glfw.poll_events()
 
             # else:
             if not getTime:
@@ -996,8 +988,12 @@ def clearEvents(eventType=None):
     if not havePygame or not display.get_init():  # pyglet
         # For each window, dispatch its events before
         # checking event buffer.
-        for win in _default_display_.get_windows():
-            win.dispatch_events()  # pump events on pyglet windows
+        if havePyglet:
+            for win in pyglet.app.windows:
+                win.dispatch_events()  # pump events on pyglet windows
+
+        if haveGLFW:
+            glfw.poll_events()
 
         if eventType == 'mouse':
             pass
@@ -1223,6 +1219,11 @@ def _onGLFWKey(*args, **kwargs):
 
     # TODO - support for key emulation
     win_ptr, key, scancode, action, modifiers = args
+
+    # only send events for PRESS and REPEAT to match pyglet behavior
+    if action == glfw.RELEASE:
+        return
+
     global useText
     
     if key == glfw.KEY_UNKNOWN:

psychopy/experiment/_experiment.py

@@ -22,7 +22,7 @@ import xml.etree.ElementTree as xml
 from xml.dom import minidom
 from copy import deepcopy, copy
 from pathlib import Path
-from pkg_resources import parse_version
+from packaging.version import Version
 
 import psychopy
 from psychopy import data, __version__, logging
@@ -469,13 +469,13 @@ class Experiment:
         # copy self
         exp = deepcopy(self)
         # parse version
-        targetVersion = parse_version(targetVersion)
+        targetVersion = Version(targetVersion)
         # change experiment version
         exp.psychopyVersion = targetVersion
         # iterate through Routines
         for rtName, rt in copy(exp.routines).items():
             # if Routine was added after the target version, remove it
-            if hasattr(type(rt), "version") and parse_version(rt.version) > targetVersion:
+            if hasattr(type(rt), "version") and Version(rt.version) > targetVersion:
                 exp.routines.pop(rtName)
             # if Routine is a standalone, we're done
             if isinstance(rt, BaseStandaloneRoutine):
@@ -483,7 +483,7 @@ class Experiment:
             # iterate through Components
             for comp in copy(rt):
                 # if Component was added after target version, remove it
-                if hasattr(type(comp), "version") and parse_version(comp.version) > targetVersion:
+                if hasattr(type(comp), "version") and Version(comp.version) > targetVersion:
                     i = rt.index(comp)
                     rt.pop(i)
 
@@ -789,10 +789,10 @@ class Experiment:
             return
         self.psychopyVersion = root.get('version')
         # If running an experiment from a future version, send alert to change "Use Version"
-        if parse_version(psychopy.__version__) < parse_version(self.psychopyVersion):
+        if Version(psychopy.__version__) < Version(self.psychopyVersion):
             alert(code=4051, strFields={'version': self.psychopyVersion})
         # If versions are either side of 2021, send alert
-        if parse_version(psychopy.__version__) >= parse_version("2021.1.0") > parse_version(self.psychopyVersion):
+        if Version(psychopy.__version__) >= Version("2021.1.0") > Version(self.psychopyVersion):
             alert(code=4052, strFields={'version': self.psychopyVersion})
 
         # Parse document nodes

psychopy/experiment/components/__init__.py

@@ -395,10 +395,13 @@ def getInitVals(params, target="PsychoPy"):
         elif name in ('movie', 'latitude', 'longitude', 'elevation', 'azimuth', 'speechPoint'):
             inits[name].val = 'None'
             inits[name].valType = 'code'
+        elif name == 'allowedKeys':
+            inits[name].val = "[]"
+            inits[name].valType = 'code'
         else:
-            print("I don't know the appropriate default value for a '%s' "
-                  "parameter. Please email the mailing list about this error" %
-                  name)
+            # if not explicitly handled, default to None
+            inits[name].val = "None"
+            inits[name].valType = "code"
 
     return inits