pyglet 1.5.28__zip → 1.5.30__zip

{pyglet-1.5.28 → pyglet-1.5.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyglet
-Version: 1.5.28
+Version: 1.5.30
 Summary: Cross-platform windowing and multimedia library
 Home-page: http://pyglet.readthedocs.org/en/latest/
 Download-URL: http://pypi.python.org/pypi/pyglet

{pyglet-1.5.28 → pyglet-1.5.30}/RELEASE_NOTES

@@ -1,3 +1,18 @@
+pyglet 1.5.30
+
+Bugfixes
+--------
+- libs.win32.com: fix COMPointer/COMInterfaceMeta for compatibility up to Python 3.13+
+
+
+pyglet 1.5.29
+
+Bugfixes
+--------
+- image: Fix name error on Windows when using WIC decoder (#1106)
+- media: Backport thread join exception catch from 2.0 (9db3971) (#1105)
+
+
 pyglet 1.5.28
 
 Features

{pyglet-1.5.28 → pyglet-1.5.30}/pyglet/__init__.py

@@ -18,7 +18,7 @@ _is_pyglet_doc_run = hasattr(sys, "is_pyglet_doc_run") and sys.is_pyglet_doc_run
 #:
 #: Valid only if pyglet was installed from a source or binary distribution
 #: (i.e. not cloned from Git).
-version = '1.5.28'
+version = '1.5.30'
 
 
 if sys.version_info < (3, 6):

{pyglet-1.5.28 → pyglet-1.5.30}/pyglet/gl/wgl.py

@@ -33,7 +33,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 # ----------------------------------------------------------------------------
 
-"""Wrapper for C:\cygwin\home\Alex\pyglet\tools\wgl.h
+r"""Wrapper for C:\cygwin\home\Alex\pyglet\tools\wgl.h
 
 Generated by tools/gengl.py.
 Do not modify this file.

{pyglet-1.5.28 → pyglet-1.5.30}/pyglet/image/codecs/wic.py

@@ -398,11 +398,6 @@ class IWICImagingFactory(com.pIUnknown):
 
 _factory = IWICImagingFactory()
 
-try:
-    ole32.CoInitializeEx(None, COINIT_MULTITHREADED)
-except OSError as err:
-    warnings.warn(str(err))
-
 ole32.CoCreateInstance(CLSID_WICImagingFactory,
                        None,
                        CLSCTX_INPROC_SERVER,

{pyglet-1.5.28 → pyglet-1.5.30}/pyglet/libs/win32/com.py

@@ -197,25 +197,21 @@ class COMInterfaceMeta(type):
        cache so it can recognize the type arguments.
     """
 
-    def __new__(mcs, name, bases, dct):
-        methods = dct.pop("_methods_", None)
-        cls = type.__new__(mcs, name, bases, dct)
-
-        if methods is not None:
-            cls._methods_ = methods
-
-        if not bases:
-            _ptr_bases = (cls, COMPointer)
-        else:
-            _ptr_bases = (cls, ctypes.POINTER(bases[0]))
-
-        # Class type is dynamically created inside __new__ based on metaclass inheritence; update ctypes cache manually.
-        from ctypes import _pointer_type_cache
-        _pointer_type_cache[cls] = type(COMPointer)("POINTER({})".format(cls.__name__),
-                                                    _ptr_bases,
-                                                    {"__interface__": cls})
-
-        return cls
+    def __init__(self, name, bases, dct, /, create_pointer_type=True) -> None:
+        super().__init__(name, bases, dct)
+
+        if create_pointer_type:
+            if not bases:
+                _ptr_bases = (self, COMPointer)
+            else:
+                _ptr_bases = (self, ctypes.POINTER(bases[0]))
+
+            # Class type is dynamically created inside __new__ based on metaclass inheritence; update ctypes cache manually.
+            from ctypes import _pointer_type_cache
+            _pointer_type_cache[self] = COMPointerMeta("POINTER({})".format(self.__name__),
+                                                       _ptr_bases,
+                                                       {"__interface__": self},
+                                                       create_pointer_type=False)
 
     def __get_subclassed_methodcount(self):
         """Returns the amount of COM methods in all subclasses to determine offset of methods.
@@ -236,8 +232,18 @@ class COMInterfaceMeta(type):
 class COMPointerMeta(type(ctypes.c_void_p), COMInterfaceMeta):
     """Required to prevent metaclass conflicts with inheritance."""
 
+    # The `create_pointer_type` arg is needed in Python version 3.13 due to changes in the
+    # PyCSimpleType (metatype of c_void_p) initialization process, which caused issues on earlier
+    # versions due to requiring a move from some initialization login to
+    # `COMInterfaceMeta.__init__`. Specifically, this argument needs to reach
+    # `COMInterfaceMeta.__init__`, but does cause an error when passed through `__new__`, as `COMInterfaceMeta.__new__`
+    # is not run prior to 3.13 and has no chance to consume it.
+    # For this reason, it is caught and discarded by this method.
+    def __new__(cls, name, bases, dct, /, create_pointer_type=True):
+        return super().__new__(cls, name, bases, dct)
+
 
-class COMPointer(ctypes.c_void_p, metaclass=COMPointerMeta):
+class COMPointer(ctypes.c_void_p, metaclass=COMPointerMeta, create_pointer_type=False):
     """COM Pointer base, could use c_void_p but need to override from_param ."""
 
     @classmethod
@@ -258,7 +264,6 @@ class COMPointer(ctypes.c_void_p, metaclass=COMPointerMeta):
             except KeyError:
                 raise TypeError("Interface {} doesn't have a pointer in this class.".format(cls.__name__))
 
-
 def _missing_impl(interface_name, method_name):
     """Functions that are not implemented use this to prevent errors when called."""
 

{pyglet-1.5.28 → pyglet-1.5.30}/pyglet/media/mediathreads.py

@@ -91,7 +91,11 @@ class MediaThread:
         with self._condition:
             self._stopped = True
             self._condition.notify()
-        self._thread.join()
+        try:
+            self._thread.join()
+        except RuntimeError:
+            # Ignore on unclean shutdown
+            pass
 
     def sleep(self, timeout):
         """Wait for some amount of time, or until notified.

{pyglet-1.5.28 → pyglet-1.5.30}/pyglet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyglet
-Version: 1.5.28
+Version: 1.5.30
 Summary: Cross-platform windowing and multimedia library
 Home-page: http://pyglet.readthedocs.org/en/latest/
 Download-URL: http://pypi.python.org/pypi/pyglet

{pyglet-1.5.28 → pyglet-1.5.30}/pyglet.egg-info/SOURCES.txt

@@ -9,7 +9,6 @@ NOTICE
 README.md
 RELEASE_NOTES
 make.py
-pyproject.toml
 pytest.ini
 setup.py
 .github/workflows/unittests.yml
@@ -269,8 +268,6 @@ 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/net/client.py
-examples/net/server.py
 examples/opengl/opengl.py
 examples/opengl/opengl_context.py
 examples/opengl/opengl_scissor.py
@@ -632,82 +629,7 @@ 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
-tests/interactive/screenshots/session/tests.interactive.image.test_image.test_bmp_loading[rgb_1bpp.bmp].001.png
-tests/interactive/screenshots/session/tests.interactive.image.test_image.test_bmp_loading[rgb_24bpp.bmp].001.png
-tests/interactive/screenshots/session/tests.interactive.image.test_image.test_bmp_loading[rgb_32bpp.bmp].001.png
-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
-tests/interactive/screenshots/session/tests.interactive.image.test_image.test_gdkpixbuf2_loading[rgb.png].001.png
-tests/interactive/screenshots/session/tests.interactive.image.test_image.test_gdkpixbuf2_loading[rgba.png].001.png
-tests/interactive/screenshots/session/tests.interactive.image.test_image.test_pil_loading[l.png].001.png
-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/text/__init__.py
 tests/interactive/text/test_content_valign.py
 tests/interactive/text/test_html.py

pyglet-1.5.28/examples/net/client.py

@@ -1,16 +0,0 @@
-import pyglet
-
-
-client = pyglet.net.Client(address='localhost', port=1234)
-
-@client.event
-def on_receive(message):
-    print(f"Received: {message}")
-
-
-@client.event
-def on_disconnect(message):
-    print(f"Received: {message}")
-
-
-client.send(b'ping')

pyglet-1.5.28/examples/net/server.py

@@ -1,16 +0,0 @@
-import pyglet
-
-
-server = pyglet.net.Server(address='0.0.0.0', port=1234)
-
-
-connections = []
-
-
-@server.event
-def on_connection(connection):
-    print(f"New clinet connected: {connection}")
-    connections.append(connection)
-
-
-pyglet.app.run()

pyglet-1.5.28/pyproject.toml

@@ -1,20 +0,0 @@
-[build-system]
-requires = ["flit_core >=2,<4", "wheel"]
-build-backend = ["flit_core.buildapi", "flit_core.wheel"]
-
-[tool.flit.metadata]
-module = "pyglet"
-author = "Alex Holkner"
-author-email = "alex.holkner@gmail.com"
-home-page = "http://pyglet.org/"
-description-file = "README.md"
-requires-python=">=3.6"
-license='BSD'
-
-[tool.flit.metadata.requires-extra]
-test = ["pytest"]
-doc = ["sphinx"]
-
-[tool.flit.sdist]
-include = ["pyglet"]
-#exclude = ["doc/*.html"]