pyglet 2.0.8__zip → 2.0.10__zip

{pyglet-2.0.8 → pyglet-2.0.10}/pyglet/window/cocoa/pyglet_textview.py

@@ -30,10 +30,17 @@ class PygletTextView_Implementation:
         self.empty_string.release()
 
     # Other functions still seem to work?
-    # @PygletTextView.method('v@')
-    # def keyDown_(self, nsevent):
-    #     array = NSArray.arrayWithObject_(nsevent)
-    #     self.interpretKeyEvents_(array)
+    @PygletTextView.method('v@')
+    def keyDown_(self, nsevent):
+        array = NSArray.arrayWithObject_(nsevent)
+        self.interpretKeyEvents_(array)
+
+        if not self.performKeyEquivalent_(nsevent):
+            self.nextResponder().keyDown_(nsevent)
+
+    @PygletTextView.method('v@')
+    def keyUp_(self, nsevent):
+        self.nextResponder().keyUp_(nsevent)
 
     @PygletTextView.method('v@')
     def insertText_(self, text):

{pyglet-2.0.8 → pyglet-2.0.10}/pyglet/window/key.py

@@ -213,7 +213,16 @@ MODESWITCH    = 0xff7e
 SCRIPTSWITCH  = 0xff7e
 FUNCTION      = 0xffd2
 
-# Text motion constants: these are allowed to clash with key constants
+# Text motion constants
+# These are allowed to clash with key constants since they are
+# abstractions of keyboard shortcuts. See the following for more
+# information:
+#
+# 1. doc/programming_guide/keyboard.rst
+# 2. doc/modules/window_key.rst
+#
+# To add new motions, consult the Adding New Motions section of
+# doc/programming_guide/keyboard.rst
 MOTION_UP                = UP
 MOTION_RIGHT             = RIGHT
 MOTION_DOWN              = DOWN

{pyglet-2.0.8 → pyglet-2.0.10}/pyglet/window/win32/__init__.py

@@ -653,6 +653,43 @@ class Win32Window(BaseWindow):
 
         return icon
 
+    def set_clipboard_text(self, text: str):
+        valid = _user32.OpenClipboard(self._view_hwnd)
+        if not valid:
+            return
+
+        _user32.EmptyClipboard()
+
+        size = (len(text) + 1) * sizeof(WCHAR)  # UTF-16
+
+        cb_data = _kernel32.GlobalAlloc(GMEM_MOVEABLE, size)
+        locked_data = _kernel32.GlobalLock(cb_data)
+        memmove(locked_data, text, size)  # Trying to encode in utf-16 causes garbled text. Accepts str fine?
+        _kernel32.GlobalUnlock(cb_data)
+
+        _user32.SetClipboardData(CF_UNICODETEXT, cb_data)
+
+        _user32.CloseClipboard()
+
+    def get_clipboard_text(self) -> str:
+        text = ''
+
+        valid = _user32.OpenClipboard(self._view_hwnd)
+        if not valid:
+            print("Could not open clipboard")
+            return ''
+
+        cb_obj = _user32.GetClipboardData(CF_UNICODETEXT)
+        if cb_obj:
+            locked_data = _kernel32.GlobalLock(cb_obj)
+            if locked_data:
+                text = ctypes.wstring_at(locked_data)
+
+                _kernel32.GlobalUnlock(cb_obj)
+
+        _user32.CloseClipboard()
+        return text
+
     # Private util
 
     def _client_to_window_size(self, width, height):

{pyglet-2.0.8 → pyglet-2.0.10}/pyglet/window/xlib/__init__.py

@@ -1,9 +1,13 @@
+import locale
 import unicodedata
 import urllib.parse
+
 from ctypes import *
 from functools import lru_cache
+from typing import Optional
 
 import pyglet
+
 from pyglet.window import WindowException, MouseCursorException
 from pyglet.window import MouseCursor, DefaultMouseCursor, ImageMouseCursor
 from pyglet.window import BaseWindow, _PlatformEventHandler, _ViewEventHandler
@@ -25,6 +29,7 @@ try:
 except ImportError:
     _have_xsync = False
 
+_debug = pyglet.options['debug_x11']
 
 class mwmhints_t(Structure):
     _fields_ = [
@@ -44,11 +49,11 @@ _can_detect_autorepeat = None
 
 XA_CARDINAL = 6  # Xatom.h:14
 XA_ATOM = 4
+XA_STRING = 31
 
 XDND_VERSION = 5
 
-# Do we have the November 2000 UTF8 extension?
-_have_utf8 = hasattr(xlib._lib, 'Xutf8TextListToTextProperty')
+_have_utf8 = locale.getlocale()[1] == 'UTF-8'
 
 # symbol,ctrl -> motion mapping
 _motion_map = {
@@ -140,6 +145,9 @@ class XlibWindow(BaseWindow):
         if _can_detect_autorepeat:
             self.pressed_keys = set()
 
+        # Store clipboard string to not query as much for pasting a lot.
+        self._clipboard_str: Optional[str] = None
+
     def _recreate(self, changes):
         # If flipping to/from fullscreen, need to recreate the window.  (This
         # is the case with both override_redirect method and
@@ -285,6 +293,12 @@ class XlibWindow(BaseWindow):
             # Atoms required for Xdnd
             self._create_xdnd_atoms(self._x_display)
 
+            # Clipboard related atoms
+            self._clipboard_atom = xlib.XInternAtom(self._x_display, asbytes('CLIPBOARD'), False)
+            self._utf8_atom = xlib.XInternAtom(self._x_display, asbytes('UTF8_STRING'), False)
+            self._target_atom = xlib.XInternAtom(self._x_display, asbytes('TARGETS'), False)
+            self._incr_atom = xlib.XInternAtom(self._x_display, asbytes('INCR'), False)
+
             # Support for drag and dropping files needs to be enabled.
             if self._file_drops:
                 # Some variables set because there are 4 different drop events that need shared data.
@@ -796,6 +810,73 @@ class XlibWindow(BaseWindow):
         xlib.XChangeProperty(self._x_display, self._window, atom, XA_CARDINAL,
                              32, xlib.PropModeReplace, buffer, len(data)//sizeof(c_ulong))
 
+    def set_clipboard_text(self, text: str):
+        xlib.XSetSelectionOwner(self._x_display,
+                                self._clipboard_atom,
+                                self._window,
+                                xlib.CurrentTime)
+
+        if xlib.XGetSelectionOwner(self._x_display, self._clipboard_atom) == self._window:
+            self._clipboard_str = text
+            str_bytes = text.encode('utf-8')
+            size = len(str_bytes)
+
+            xlib.XChangeProperty(self._x_display, self._window,
+                                 self._clipboard_atom, self._utf8_atom, 8, xlib.PropModeReplace,
+                                 (c_ubyte * size).from_buffer_copy(str_bytes), size)
+        else:
+            if _debug:
+                print("X11: Couldn't become owner of clipboard.")
+
+    def get_clipboard_text(self) -> str:
+        if self._clipboard_str is not None:
+            return self._clipboard_str
+
+        owner = xlib.XGetSelectionOwner(self._x_display, self._clipboard_atom)
+
+        if not owner:
+            return ''
+
+        text = ''
+        if owner == self._window:
+            data, size, actual_atom = self.get_single_property(self._window, self._clipboard_atom,
+                                                  self._utf8_atom)
+        else:
+            notification = xlib.XEvent()
+
+            # Convert to selection notification.
+            xlib.XConvertSelection(self._x_display,
+                                   self._clipboard_atom,
+                                   self._utf8_atom,
+                                   self._clipboard_atom,
+                                   self._window,
+                                   xlib.CurrentTime)
+
+            while not xlib.XCheckTypedWindowEvent(self._x_display, self._window, xlib.SelectionNotify, byref(notification)):
+                self.dispatch_platform_event(notification)
+
+            if not notification.xselection.property:
+                return ''
+
+            data, size, actual_atom = self.get_single_property(notification.xselection.requestor, notification.xselection.property,
+                                                  self._utf8_atom)
+
+        if actual_atom == self._incr_atom:
+            # Not implemented.
+            if _debug:
+                print("X11: Clipboard data is too large, not implemented.")
+
+        elif actual_atom == self._utf8_atom:
+            if data:
+                text_bytes = string_at(data, size)
+
+                text = text_bytes.decode('utf-8')
+
+        self._clipboard_str = text
+
+        xlib.XFree(data)
+        return text
+
     # Private utility
 
     def _set_wm_normal_hints(self):
@@ -1326,7 +1407,7 @@ class XlibWindow(BaseWindow):
             xlib.XFree(data)
 
     def get_single_property(self, window, atom_property, atom_type):
-        """ Returns the length and data of a window property. """
+        """ Returns the length, data, and actual atom of a window property. """
         actualAtom = xlib.Atom()
         actualFormat = c_int()
         itemCount = c_ulong()
@@ -1341,14 +1422,14 @@ class XlibWindow(BaseWindow):
                                 byref(bytesAfter),
                                 data)
 
-        return data, itemCount.value
+        return data, itemCount.value, actualAtom.value
 
     @XlibEventHandler(xlib.SelectionNotify)
     def _event_selection_notification(self, ev):
         if ev.xselection.property != 0 and ev.xselection.selection == self._xdnd_atoms['XdndSelection']:
             if self._xdnd_format:
                 # This will get the data
-                data, count = self.get_single_property(ev.xselection.requestor,
+                data, count, _ = self.get_single_property(ev.xselection.requestor,
                                                          ev.xselection.property,
                                                          ev.xselection.target)
 
@@ -1512,5 +1593,61 @@ class XlibWindow(BaseWindow):
         self._mapped = False
         self.dispatch_event('on_hide')
 
+    @XlibEventHandler(xlib.SelectionClear)
+    def _event_selection_clear(self, ev):
+        if ev.xselectionclear.selection == self._clipboard_atom:
+            # Another application cleared the clipboard.
+            self._clipboard_str = None
+
+    @XlibEventHandler(xlib.SelectionRequest)
+    def _event_selection_request(self, ev):
+        request = ev.xselectionrequest
+
+        if _debug:
+            rt = xlib.XGetAtomName(self._x_display, request.target)
+            rp = xlib.XGetAtomName(self._x_display, request.property)
+            print(f"X11 debug: request target {rt}")
+            print(f"X11 debug: request property {rp}")
+
+        out_event = xlib.XEvent()
+        out_event.xany.type = xlib.SelectionNotify
+        out_event.xselection.selection = request.selection
+        out_event.xselection.display = request.display
+        out_event.xselection.target = 0
+        out_event.xselection.property = 0
+        out_event.xselection.requestor = request.requestor
+        out_event.xselection.time = request.time
+
+        if (xlib.XGetSelectionOwner(self._x_display, self._clipboard_atom) == self._window and
+                ev.xselection.target == self._clipboard_atom):
+            if request.target == self._target_atom:
+                atoms_ar = (xlib.Atom * 1)(self._utf8_atom)
+                ptr = cast(pointer(atoms_ar), POINTER(c_ubyte))
+
+                xlib.XChangeProperty(self._x_display, request.requestor,
+                                     request.property, XA_ATOM, 32,
+                                     xlib.PropModeReplace,
+                                     ptr, sizeof(atoms_ar)//sizeof(c_ulong))
+                out_event.xselection.property = request.property
+                out_event.xselection.target = request.target
+
+            elif request.target == self._utf8_atom:
+                # We are being requested for a UTF-8 string.
+                text = self._clipboard_str.encode('utf-8')
+                size = len(self._clipboard_str)
+                xlib.XChangeProperty(self._x_display, request.requestor,
+                                     request.property, request.target, 8,
+                                     xlib.PropModeReplace,
+                                     (c_ubyte * size).from_buffer_copy(text), size)
+
+                out_event.xselection.property = request.property
+                out_event.xselection.target = request.target
+
+        # Send request event back to requestor with updated changes.
+        xlib.XSendEvent(self._x_display, request.requestor, 0, 0, byref(out_event))
+
+        # Seems to work find without it. May add later.
+        #xlib.XSync(self._x_display, False)
+
 
 __all__ = ["XlibEventHandler", "XlibWindow"]

{pyglet-2.0.8 → pyglet-2.0.10}/pyglet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyglet
-Version: 2.0.8
+Version: 2.0.10
 Summary: Cross-platform windowing and multimedia library
 Home-page: http://pyglet.readthedocs.org/en/latest/
 Download-URL: http://pypi.python.org/pypi/pyglet
@@ -167,12 +167,13 @@ for more information about running and writing tests.
 ## Contact
 
 pyglet is developed by many individual volunteers, and there is no central point of contact. If you have a question
-about developing with pyglet, or you wish to contribute, please join the [mailing list] or the [discord] server.
+about developing with pyglet, or you wish to contribute, please join the [mailing list], [discord] server, or [subreddit].
 
 For legal issues, please contact [Alex Holkner](mailto:Alex.Holkner@gmail.com).
 
 [discord]: https://discord.gg/QXyegWe
 [mailing list]: http://groups.google.com/group/pyglet-users
+[subreddit]: https://www.reddit.com/r/pyglet/
 [documentation]: https://pyglet.readthedocs.io
 [wiki]:  https://github.com/pyglet/pyglet/wiki
 [pypi]:  https://pypi.org/project/pyglet/

{pyglet-2.0.8 → pyglet-2.0.10}/pyglet.egg-info/SOURCES.txt

@@ -156,8 +156,10 @@ doc/programming_guide/img/window_xp_dialog.png
 doc/programming_guide/img/window_xp_overlay.png
 doc/programming_guide/img/window_xp_tool.png
 doc/programming_guide/img/window_xp_transparent.png
+examples/clipboard.py
 examples/file_dialog.py
 examples/hello_world.py
+examples/shapes.py
 examples/timer.py
 examples/events/events_key_state_handler.py
 examples/events/register_event_type.py
@@ -205,7 +207,6 @@ examples/game/version5/game/resources.py
 examples/game/version5/game/util.py
 examples/graphics/image_convert.py
 examples/graphics/image_display.py
-examples/graphics/shapes.py
 examples/gui/bar.png
 examples/gui/button_down.png
 examples/gui/button_hover.png
@@ -225,6 +226,14 @@ examples/media/noisy/README
 examples/media/noisy/ball.png
 examples/media/noisy/ball.wav
 examples/media/noisy/noisy.py
+examples/media/soundspace/README
+examples/media/soundspace/reader.py
+examples/media/soundspace/soundspace.py
+examples/media/soundspace/res/bass.wav
+examples/media/soundspace/res/drums.wav
+examples/media/soundspace/res/guitar.wav
+examples/media/soundspace/res/piano.wav
+examples/media/soundspace/res/space.txt
 examples/model/box.mtl
 examples/model/box.obj
 examples/model/fpscamera.py
@@ -232,6 +241,9 @@ examples/model/logo3d.mtl
 examples/model/logo3d.obj
 examples/model/model.py
 examples/model/pyglet.png
+examples/net/client.py
+examples/net/server.py
+examples/opengl/compute_shader.py
 examples/opengl/egl_context.py
 examples/opengl/opengl.py
 examples/opengl/opengl_context.py
@@ -264,7 +276,6 @@ examples/window/multiple_windows.py
 examples/window/overlay_window.py
 examples/window/transparent_window.py
 experimental/flaccodec.py
-experimental/geoshader_sprite.py
 experimental/hello_world.svg
 experimental/spritebenchmark.py
 experimental/svg_test.py
@@ -277,6 +288,7 @@ experimental/dist_field/renderfield.py
 experimental/wayland/gbm_egl_context.py
 pyglet/__init__.py
 pyglet/clock.py
+pyglet/customtypes.py
 pyglet/event.py
 pyglet/info.py
 pyglet/lib.py
@@ -302,6 +314,9 @@ pyglet/canvas/headless.py
 pyglet/canvas/win32.py
 pyglet/canvas/xlib.py
 pyglet/canvas/xlib_vidmoderestore.py
+pyglet/experimental/README.md
+pyglet/experimental/geoshader_sprite.py
+pyglet/experimental/net.py
 pyglet/extlibs/__init__.py
 pyglet/extlibs/png.py
 pyglet/font/__init__.py
@@ -597,6 +612,42 @@ tests/interactive/image/test_image.py
 tests/interactive/media/__init__.py
 tests/interactive/media/test_player.py
 tests/interactive/screenshots/committed/README
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_bmp_loading[rgb_16bpp.bmp].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_bmp_loading[rgb_1bpp.bmp].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_bmp_loading[rgb_24bpp.bmp].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_bmp_loading[rgb_32bpp.bmp].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_bmp_loading[rgb_4bpp.bmp].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_bmp_loading[rgb_8bpp.bmp].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_bmp_loading[rgba_32bpp.bmp].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_buffer_copy.001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_buffer_saving.001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_checkerboard.001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_dds_loading[rgb_dxt1.dds].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_dds_loading[rgba_dxt1.dds].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_dds_loading[rgba_dxt3.dds].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_dds_loading[rgba_dxt5.dds].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_depth_buffer_saving.001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_gdkpixbuf2_loading[8bpp.gif].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_gdkpixbuf2_loading[l.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_gdkpixbuf2_loading[la.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_gdkpixbuf2_loading[rgb.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_gdkpixbuf2_loading[rgba.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pil_loading[la.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pil_loading[rgb.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pil_loading[rgba.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pil_saving[l.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pil_saving[la.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pil_saving[rgb.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pil_saving[rgba.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pypng_loading[la.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pypng_loading[rgb.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pypng_loading[rgb_8bpp.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pypng_loading[rgb_8bpp_trans.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pypng_loading[rgba.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pypng_saving[l.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pypng_saving[la.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pypng_saving[rgb.png].001.png
+tests/interactive/screenshots/committed/tests.interactive.image.test_image.test_pypng_saving[rgba.png].001.png
 tests/interactive/screenshots/session/README
 tests/interactive/screenshots/session/tests.interactive.graphics.test_multitexture.test_multitexture.001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_bmp_loading[rgb_16bpp.bmp].001.png
@@ -606,11 +657,14 @@ tests/interactive/screenshots/session/tests.interactive.image.test_image.test_bm
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_bmp_loading[rgb_4bpp.bmp].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_bmp_loading[rgb_8bpp.bmp].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_bmp_loading[rgba_32bpp.bmp].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_buffer_copy.001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_buffer_saving.001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_checkerboard.001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_dds_loading[rgb_dxt1.dds].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_dds_loading[rgba_dxt1.dds].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_dds_loading[rgba_dxt3.dds].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_dds_loading[rgba_dxt5.dds].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_depth_buffer_saving.001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_gdkpixbuf2_loading[8bpp.gif].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_gdkpixbuf2_loading[l.png].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_gdkpixbuf2_loading[la.png].001.png
@@ -620,9 +674,21 @@ tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pi
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pil_loading[la.png].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pil_loading[rgb.png].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pil_loading[rgba.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pil_saving[l.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pil_saving[la.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pil_saving[rgb.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pil_saving[rgba.png].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pypng_loading[l.png].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pypng_loading[la.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pypng_loading[rgb.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pypng_loading[rgb_8bpp.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pypng_loading[rgb_8bpp_trans.png].001.png
 tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pypng_loading[rgba.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pypng_saving[l.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pypng_saving[la.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pypng_saving[rgb.png].001.png
+tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pypng_saving[rgba.png].001.png
+tests/interactive/shapes/test_shapes.py
 tests/interactive/text/__init__.py
 tests/interactive/text/test_caret_color.py
 tests/interactive/text/test_content_valign.py

{pyglet-2.0.8 → pyglet-2.0.10}/tests/integration/app/test_eventloop.py

@@ -23,7 +23,7 @@ def test_multiple_start_stop(performance):
     with performance.timer(30.):
         for _ in range(100):
             test_start_stop(performance)
-    
+
 
 def test_events():
     enter_mock = mock.MagicMock()
@@ -58,4 +58,3 @@ def test_sleep(performance):
         event_loop.run()
     assert not event_loop.is_running
     assert _sleep.returned.wait(1.)
-

{pyglet-2.0.8 → pyglet-2.0.10}/tests/integration/image/test_imagegrid.py

@@ -44,6 +44,9 @@ class ImageGridTestCase(unittest.TestCase):
     def setUp(self):
         self.w = Window(visible=False)
 
+    def tearDown(self) -> None:
+        self.w.close()
+
     def testSquare(self):
         # Test a 3x3 grid with no padding and 4x4 images
         rows = cols = 3

{pyglet-2.0.8 → pyglet-2.0.10}/tests/integration/image/test_texture3d.py

@@ -55,6 +55,9 @@ class TestTexture3D(unittest.TestCase):
     def setUp(self):
         self.w = Window(visible=False)
 
+    def tearDown(self) -> None:
+        self.w.close()
+
     def test2(self):
         # Test 2 images of 32x32
         images = [self.create_image(32, 32, i + 1) for i in range(2)]

{pyglet-2.0.8 → pyglet-2.0.10}/tests/integration/media/test_driver.py

@@ -15,18 +15,6 @@ from pyglet.media.synthesis import Silence
 from .mock_player import MockPlayer
 
 
-def _delete_driver():
-    # if hasattr(pyglet.media.drivers._audio_driver, 'delete'):
-    #     pyglet.media.drivers._audio_driver.delete()
-    pyglet.media.drivers._audio_driver = None
-
-def test_get_platform_driver():
-    driver = pyglet.media.drivers.get_audio_driver()
-    assert driver is not None
-    assert driver is not None, 'Cannot load audio driver for your platform'
-    _delete_driver()
-
-
 class MockPlayerWithMockTime(MockPlayer):
 
     @property
@@ -58,6 +46,13 @@ def get_drivers():
     drivers = []
     ids = []
 
+    try:
+        from pyglet.media.drivers import silent
+        drivers.append(silent)
+        ids.append('Silent')
+    except:
+        pass
+
     try:
         from pyglet.media.drivers import pulse
         drivers.append(pulse)
@@ -79,6 +74,14 @@ def get_drivers():
     except:
         pass
 
+    try:
+        from pyglet.media.drivers import xaudio2
+        drivers.append(xaudio2)
+        ids.append('XAudio2')
+    except:
+        pass
+
+
     return {'params': drivers, 'ids': ids}