pyglet 1.2.0__zip → 1.2.0rc2__zip

{pyglet-1.2.0 → pyglet-1.2.0rc2}/MANIFEST.in

@@ -24,3 +24,4 @@ recursive-exclude tests *.log
 prune **/.svn
 recursive-exclude * *.pyc
 recursive-exclude * *.pyo
+prune pyglet.egg-info

{pyglet-1.2.0 → pyglet-1.2.0rc2}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 1.1
 Name: pyglet
-Version: 1.2.0
+Version: 1.2.0rc2
 Summary: Cross-platform windowing and multimedia library
-Home-page: http://pyglet.readthedocs.org/en/pyglet-1.2-maintenance/
+Home-page: http://www.pyglet.org/
 Author: Alex Holkner
 Author-email: Alex.Holkner@gmail.com
 License: BSD

{pyglet-1.2.0 → pyglet-1.2.0rc2}/pyglet/__init__.py

@@ -57,7 +57,7 @@ _is_epydoc = hasattr(sys, 'is_epydoc') and sys.is_epydoc
 #:    >>> parse_version(pyglet.version) >= parse_version('1.1')
 #:    True
 #:
-version = '1.2.0'
+version = '1.2rc1'
 
 # Pyglet platform treats *BSD systems as Linux
 compat_platform = sys.platform

{pyglet-1.2.0 → pyglet-1.2.0rc2}/pyglet/font/fontconfig.py

@@ -42,7 +42,7 @@ from collections import OrderedDict
 from ctypes import *
 
 import pyglet.lib
-from pyglet.compat import asbytes, asstr
+from pyglet.compat import asbytes
 from pyglet.font.base import FontException
 
 # fontconfig library definitions
@@ -216,10 +216,10 @@ class FontConfigPattern(object):
         if not value:
             return
 
-        if isinstance(value, unicode):
-            value  = value.encode('utf8')
+        if isinstance(name, unicode):
+            name = name.encode('utf8')
 
-        self._fontconfig.FcPatternAddString(self._pattern, name, asbytes(value))
+        self._fontconfig.FcPatternAddString(self._pattern, name, value)
 
     def _set_double(self, name, value):
         assert self._pattern
@@ -257,7 +257,7 @@ class FontConfigPattern(object):
         value = self._get_value(name)
 
         if value and value.type == FcTypeString:
-            return asstr(value.u.s)
+            return value.u.s
         else:
             return None
 
@@ -381,4 +381,4 @@ def get_fontconfig():
     global _fontconfig_instance
     if not _fontconfig_instance:
         _fontconfig_instance = FontConfig()
-    return _fontconfig_instance
+    return _fontconfig_instance

{pyglet-1.2.0 → pyglet-1.2.0rc2}/pyglet/font/freetype.py

@@ -36,7 +36,6 @@ __docformat__ = 'restructuredtext'
 __version__ = '$Id$'
 
 import ctypes
-from pyglet.compat import asbytes
 from pyglet.font import base
 from pyglet import image
 from pyglet.font.fontconfig import get_fontconfig
@@ -294,7 +293,7 @@ class FreeTypeFont(base.Font):
     def _load_font_face_from_file(file_name):
         font_face = FT_Face()
         ft_library = ft_get_library()
-        error = FT_New_Face(ft_library, asbytes(file_name), 0, byref(font_face))
+        error = FT_New_Face(ft_library, file_name, 0, byref(font_face))
         FreeTypeError.check_and_raise_on_error('Could not load font from "%s"' % file_name, error)
         return font_face
 

{pyglet-1.2.0 → pyglet-1.2.0rc2}/pyglet/font/win32query.py

@@ -287,14 +287,6 @@ FONTENUMPROC = ctypes.WINFUNCTYPE(
   wintypes.LPARAM
 )
 
-# When running 64 bit windows, some types are not 32 bit, so Python/ctypes guesses wrong
-gdi32.EnumFontFamiliesExA.argtypes = [
-        wintypes.HDC,
-        ctypes.POINTER(LOGFONT),
-        FONTENUMPROC,
-        wintypes.LPARAM,
-        wintypes.DWORD]
-
 
 def _enum_font_names(logfont, textmetricex, fonttype, param):
   """callback function to be executed during EnumFontFamiliesEx

{pyglet-1.2.0 → pyglet-1.2.0rc2}/pyglet/media/drivers/pulse/__init__.py

@@ -401,7 +401,6 @@ class PulseAudioPlayer(AbstractAudioPlayer):
 
         context.lock()
         pa.pa_stream_disconnect(self.stream)
-        pa.pa_stream_set_state_callback(self.stream, None, None)
         context.unlock()
         pa.pa_stream_unref(self.stream)
         self.stream = None

{pyglet-1.2.0 → pyglet-1.2.0rc2}/pyglet.egg-info/SOURCES.txt

@@ -72,11 +72,6 @@ pyglet/info.py
 pyglet/lib.py
 pyglet/resource.py
 pyglet/sprite.py
-pyglet.egg-info/PKG-INFO
-pyglet.egg-info/SOURCES.txt
-pyglet.egg-info/dependency_links.txt
-pyglet.egg-info/top_level.txt
-pyglet.egg-info/zip-safe
 pyglet/app/__init__.py
 pyglet/app/base.py
 pyglet/app/carbon.py
@@ -329,11 +324,20 @@ tests/media/PLAYER_EOS_NEXT.py
 tests/media/PLAYER_PAUSE.py
 tests/media/PLAYER_PAUSE_QUEUE.py
 tests/media/PLAYER_PLAY_QUEUE.py
+tests/media/PLAYER_PLAY_QUEUE.py.orig
 tests/media/PLAYER_QUEUE_PLAY.py
 tests/media/PLAYER_STATIC_STATIC.py
 tests/media/__init__.py
 tests/regression/__init__.py
 tests/regression/images/DELETEME
+tests/regression/images/image.PYPNG_LA_LOAD.png.orig
+tests/regression/images/image.PYPNG_LA_SAVE.png.orig
+tests/regression/images/image.PYPNG_L_LOAD.png.orig
+tests/regression/images/image.PYPNG_L_SAVE.png.orig
+tests/regression/images/image.PYPNG_RGBA_LOAD.png.orig
+tests/regression/images/image.PYPNG_RGBA_SAVE.png.orig
+tests/regression/images/image.PYPNG_RGB_LOAD.png.orig
+tests/regression/images/image.PYPNG_RGB_SAVE.png.orig
 tests/resource/RES_LOAD.py
 tests/resource/RES_LOAD_IMAGE.py
 tests/resource/__init__.py

pyglet-1.2.0rc2/setup.py

@@ -0,0 +1,247 @@
+#!/usr/bin/env python
+
+'''
+'''
+
+__docformat__ = 'restructuredtext'
+__version__ = '$Id$'
+
+import os
+import shutil
+import sys
+from setuptools import setup, find_packages
+
+# Bump pyglet/__init__.py version as well.
+VERSION = '1.2.0rc2'
+
+long_description = '''pyglet provides an object-oriented programming
+interface for developing games and other visually-rich applications
+for Windows, Mac OS X and Linux.'''
+
+def create_package_list(base_package):
+    return [base_package + '.' + pkg for pkg in find_packages(base_package)]
+
+
+setup_info = dict(
+    # Metadata
+    name='pyglet',
+    version=VERSION,
+    author='Alex Holkner',
+    author_email='Alex.Holkner@gmail.com',
+    url='http://www.pyglet.org/',
+    download_url='http://pypi.python.org/pypi/pyglet',
+    description='Cross-platform windowing and multimedia library',
+    long_description=long_description,
+    license='BSD',
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: MacOS X',
+        'Environment :: Win32 (MS Windows)',
+        'Environment :: X11 Applications',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: MacOS :: MacOS X',
+        'Operating System :: Microsoft :: Windows', # XP
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Topic :: Games/Entertainment',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
+
+    # Package info
+    packages=create_package_list('pyglet'),
+
+    # Add _ prefix to the names of temporary build dirs
+    options={
+        'build': {'build_base': '_build'},
+        #        'sdist': {'dist_dir': '_dist'},
+    },
+    zip_safe=True,
+)
+
+
+if 'bdist_mpkg' in sys.argv:
+    from setuptools import setup
+    _have_setuptools = True
+
+    from bdist_mpkg_pyglet import plists, pkg, cmd_bdist_mpkg, tools
+
+    # Check for ctypes if installing into Python 2.4
+    def ctypes_requirement(pkgname, prefix):
+        prefix = os.path.join(prefix, 'ctypes')
+        title = '%s requires ctypes 1.0 or later to install with Python 2.4' \
+           % pkgname
+        kw = dict(
+            LabelKey='ctypes',
+            TitleKey=title,
+            MessageKey=title,
+        )
+
+        return plists.path_requirement(prefix, **kw)
+
+    # Subclass bdist_mpkg
+    class pyglet_bdist_mpkg(cmd_bdist_mpkg.bdist_mpkg):
+        # Don't include platform or python version in mpkg name (aesthetics)
+        def finalize_package_data(self):
+            cmd_bdist_mpkg.bdist_mpkg.finalize_package_data(self)
+            self.metapackagename = '-'.join([self.get_name(),
+                                             self.get_version()]) + '.mpkg'
+            self.pseudoinstall_root = self.get_pseudoinstall_root()
+            self.packagesdir = os.path.join(
+                self.get_metapackage(),
+                self.component_directory
+            )
+
+        def get_metapackage_info(self):
+            info = dict(cmd_bdist_mpkg.bdist_mpkg.get_metapackage_info(self))
+            info.update(dict(
+                # Set background image alignment
+                IFPkgFlagBackgroundScaling='none',
+                IFPkgFlagBackgroundAlignment='topleft',
+                # Remove specific Python version requirement from metapackage,
+                # is per-package now.
+                IFRequirementDicts=[],
+            ))
+            return info
+
+        # Override how packages are made.  purelib forces creation of a
+        # separate package for each required python version, all symlinked to
+        # the same Archive.bom.
+        def make_scheme_package(self, scheme):
+            assert scheme == 'purelib'
+
+            # Make AVbin package
+            pkgname = 'AVbin'
+            pkgfile = pkgname + '.pkg'
+            self.packages.append((pkgfile, self.get_scheme_status(scheme)))
+            pkgdir = os.path.join(self.packagesdir, pkgfile)
+            self.mkpath(pkgdir)
+            version = self.get_scheme_version(scheme)
+            info = dict(self.get_scheme_info(scheme))
+            description = 'AVbin audio and video support (recommended)'
+            files = list(tools.walk_files('build/avbin'))
+            common = 'build/avbin'
+            prefix = '/usr/local/lib'
+            pkg.make_package(self,
+                pkgname, version,
+                files, common, prefix,
+                pkgdir,
+                info, description)
+
+            # pyglet packages
+            files, common, prefix = self.get_scheme_root(scheme)
+
+            def add_package(python_dir, package_dir,
+                            pyver, pkgname, description):
+                scheme_prefix = package_dir
+                pkgfile = pkgname + '.pkg'
+                self.packages.append((pkgfile, self.get_scheme_status(scheme)))
+                pkgdir = os.path.join(self.packagesdir, pkgfile)
+                self.mkpath(pkgdir)
+                version = self.get_scheme_version(scheme)
+
+                requirements = [
+                    plists.python_requirement(self.get_name(),
+                        prefix=python_dir,
+                        version=pyver)]
+                if pyver == '2.4':
+                    requirements.append(ctypes_requirement(self.get_name(),
+                        prefix=scheme_prefix))
+
+                info = dict(self.get_scheme_info(scheme))
+                info.update(dict(
+                    IFRequirementDicts=requirements,
+                    ))
+
+                pkg.make_package(self,
+                    pkgname, version,
+                    files, common, scheme_prefix,
+                    pkgdir,
+                    info,
+                    description,
+                )
+
+                # Move the archive up to the metapackage and symlink to it
+                pkgfile = os.path.join(pkgdir, 'Contents/Archive.pax.gz')
+                shutil.move(pkgfile,
+                            os.path.join(pkgdir, '../../Archive.pax.gz'))
+                os.symlink('../../../Archive.pax.gz', pkgfile)
+
+                pkgfile = os.path.join(pkgdir, 'Contents/Archive.bom')
+                shutil.move(pkgfile,
+                            os.path.join(pkgdir, '../../Archive.bom'))
+                os.symlink('../../../Archive.bom', pkgfile)
+
+                self.scheme_hook(scheme, pkgname, version, files, common,
+                    prefix, pkgdir)
+
+            add_package(
+                '/System/Library/Frameworks/Python.framework/Versions/2.5',
+                '/Library/Python/2.5/site-packages',
+                '2.5', 'pyglet-syspy2.5',
+                'pyglet for Python 2.5 in /System/Library')
+            add_package(
+                '/System/Library/Frameworks/Python.framework/Versions/2.6',
+                '/Library/Python/2.6/site-packages',
+                '2.6', 'pyglet-syspy2.6',
+                'pyglet for Python 2.6 in /System/Library')
+            add_package(
+                '/Library/Frameworks/Python.framework/Versions/2.4',
+                '/Library/Frameworks/Python.framework/Versions/2.4' \
+                    '/lib/python2.4/site-packages',
+                '2.4', 'pyglet-py2.4',
+                'pyglet for Python 2.4 in /Library')
+            add_package(
+                '/Library/Frameworks/Python.framework/Versions/2.5',
+                '/Library/Frameworks/Python.framework/Versions/2.5' \
+                    '/lib/python2.5/site-packages',
+                '2.5', 'pyglet-py2.5',
+                'pyglet for Python 2.5 in /Library')
+            add_package(
+                '/Library/Frameworks/Python.framework/Versions/2.6',
+                '/Library/Frameworks/Python.framework/Versions/2.6' \
+                    '/lib/python2.6/site-packages',
+                '2.6', 'pyglet-py2.6',
+                'pyglet for Python 2.6 in /Library')
+            add_package(
+                '/opt/local/',
+                '/opt/local/lib/python2.4/site-packages',
+                '2.4', 'pyglet-macports-py2.4',
+                'pyglet for MacPorts Python 2.4 in /opt/local')
+            add_package(
+                '/opt/local/',
+                '/opt/local/lib/python2.5/site-packages',
+                '2.5', 'pyglet-macports-py2.5',
+                'pyglet for MacPorts Python 2.5 in /opt/local')
+            add_package(
+                '/opt/local/',
+                '/opt/local/Library/Frameworks/Python.framework/Versions/2.6' \
+                    '/lib/python2.6/site-packages',
+                '2.6', 'pyglet-macports-py2.6',
+                'pyglet for MacPorts Python 2.6 in /opt/local')
+
+        # Don't build to an absolute path, assume within site-packages (makes
+        # it easier to symlink the same archive for all packages)
+        def get_scheme_install_prefix(self, scheme):
+            return scheme
+
+        # Don't byte compile (waste of space, try to do it in postflight TODO).
+        def byte_compile(self):
+            pass
+
+    setuptools_info.update(dict(
+        cmdclass={'bdist_mpkg': pyglet_bdist_mpkg,}
+    ))
+
+
+
+if sys.version_info >= (3,):
+    # Automatically run 2to3 when using Python 3
+    setup_info["use_2to3"] = True
+
+setup(**setup_info)

pyglet-1.2.0rc2/tests/media/PLAYER_PLAY_QUEUE.py.orig

@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+'''Test that audio playback works.
+
+You should hear white noise (static) for 0.5 seconds.  The test will exit
+immediately after.  
+
+You may want to turn down the volume of your speakers.
+'''
+
+import time
+import unittest
+
+from pyglet import media
+from pyglet.media import procedural
+
+class TEST_CASE(unittest.TestCase):
+    def test_method(self):
+        source = procedural.WhiteNoise(0.5)
+        player = media.Player()
+        player.queue(source)
+        player.play()
+
+        while player.source:
+            player.update_texture(1. / 30.)
+            time.sleep(1. / 30.)
+
+if __name__ == '__main__':
+    unittest.main()

{pyglet-1.2.0 → pyglet-1.2.0rc2}/tests/window/WINDOW_MULTISAMPLE.py

@@ -125,9 +125,9 @@ class WINDOW_MULTISAMPLE(unittest.TestCase):
             dt = clock.tick()
             self.angle += dt
             
+            self.win.dispatch_events()
             self.render()
             self.win.flip()
-            self.win.dispatch_events()
         self.win.close()
 
 if __name__ == '__main__':

pyglet-1.2.0/pyglet.egg-info/PKG-INFO

@@ -1,30 +0,0 @@
-Metadata-Version: 1.1
-Name: pyglet
-Version: 1.2.0
-Summary: Cross-platform windowing and multimedia library
-Home-page: http://pyglet.readthedocs.org/en/pyglet-1.2-maintenance/
-Author: Alex Holkner
-Author-email: Alex.Holkner@gmail.com
-License: BSD
-Download-URL: http://pypi.python.org/pypi/pyglet
-Description: pyglet provides an object-oriented programming
-        interface for developing games and other visually-rich applications
-        for Windows, Mac OS X and Linux.
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: MacOS X
-Classifier: Environment :: Win32 (MS Windows)
-Classifier: Environment :: X11 Applications
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Topic :: Games/Entertainment
-Classifier: Topic :: Software Development :: Libraries :: Python Modules

pyglet-1.2.0/pyglet.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

pyglet-1.2.0/pyglet.egg-info/top_level.txt

@@ -1 +0,0 @@
-pyglet

pyglet-1.2.0/pyglet.egg-info/zip-safe

@@ -1 +0,0 @@
-

pyglet-1.2.0/setup.py

@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-
-'''
-'''
-
-__docformat__ = 'restructuredtext'
-__version__ = '$Id$'
-
-import os
-import shutil
-import sys
-from setuptools import setup, find_packages
-
-# Bump pyglet/__init__.py version as well.
-VERSION = '1.2.0'
-
-long_description = '''pyglet provides an object-oriented programming
-interface for developing games and other visually-rich applications
-for Windows, Mac OS X and Linux.'''
-
-def create_package_list(base_package):
-    return ([base_package] +
-            [base_package + '.' + pkg for pkg in find_packages(base_package)])
-
-
-setup_info = dict(
-    # Metadata
-    name='pyglet',
-    version=VERSION,
-    author='Alex Holkner',
-    author_email='Alex.Holkner@gmail.com',
-    url='http://pyglet.readthedocs.org/en/pyglet-1.2-maintenance/',
-    download_url='http://pypi.python.org/pypi/pyglet',
-    description='Cross-platform windowing and multimedia library',
-    long_description=long_description,
-    license='BSD',
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: MacOS X',
-        'Environment :: Win32 (MS Windows)',
-        'Environment :: X11 Applications',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Operating System :: MacOS :: MacOS X',
-        'Operating System :: Microsoft :: Windows', # XP
-        'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Topic :: Games/Entertainment',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-    ],
-
-    # Package info
-    packages=create_package_list('pyglet'),
-
-    # Add _ prefix to the names of temporary build dirs
-    options={
-        'build': {'build_base': '_build'},
-        #        'sdist': {'dist_dir': '_dist'},
-    },
-    zip_safe=True,
-)
-
-
-if sys.version_info >= (3,):
-    # Automatically run 2to3 when using Python 3
-    setup_info["use_2to3"] = True
-
-setup(**setup_info)