Require pyglet 2.x

Author: xantares

brainworkshop.py

@@ -934,8 +934,8 @@ def update_check():
     quit_with_error(_('Error: the resource folder\n%s') % res_path +
                     _(' does not exist or is not readable.  Exiting'), trace=False)
 
-if pyglet.version < '1.1':
-    quit_with_error(_('Error: pyglet 1.1 or greater is required.\n') +
+if pyglet.version < '2':
+    quit_with_error(_('Error: pyglet >=2 is required.\n') +
                     _('You probably have an older version of pyglet installed.\n') +
                     _('Please visit %s') % WEB_PYGLET_DOWNLOAD, trace=False)
 
@@ -946,48 +946,10 @@ def update_check():
 def test_music():
     try:
         import pyglet
-        if pyglet.version >= '1.4':
-            from pyglet.media import have_ffmpeg
-            pyglet.media.have_avbin = have_ffmpeg()
-            if not pyglet.media.have_avbin:
-                cfg.USE_MUSIC = False
-        else:
-            try:
-                from pyglet.media import avbin
-            except Exception as e:
-                debug_msg(e)
-                pyglet.lib.load_library('avbin')
-            if pyglet.version >= '1.2':  # temporary workaround for defect in pyglet svn 2445
-                pyglet.media.have_avbin = True
-
-            # On Windows with Data Execution Protection enabled (on by default on Vista),
-            # an exception will be raised when use of avbin is attempted:
-            #   WindowsError: exception: access violation writing [ADDRESS]
-            # The file doesn't need to be in a avbin-specific format,
-            # since pyglet will use avbin over riff whenever it's detected.
-            # Let's find an audio file and try to load it to see if avbin works.
-            opj = os.path.join
-            opj = os.path.join
-            def look_for_music(path):
-                files = [p for p in os.listdir(path) if not p.startswith('.') and not os.path.isdir(opj(path, p))]
-                for f in files:
-                    ext = f.lower()[-3:]
-                    if ext in ['wav', 'ogg', 'mp3', 'aac', 'mp2', 'ac3', 'm4a'] and not ext in ('wav'):
-                        return [opj(path, f)]
-                dirs  = [opj(path, p) for p in os.listdir(path) if not p.startswith('.') and os.path.isdir(opj(path, p))]
-                results = []
-                for d in dirs:
-                    results.extend(look_for_music(d))
-                    if results: return results
-                return results
-            music_file = look_for_music(res_path)
-            if music_file:
-                # The first time we load a file should trigger the exception
-                music_file = music_file[0]
-                loaded_music = pyglet.media.load(music_file, streaming=False)
-                del loaded_music
-            else:
-                cfg.USE_MUSIC = False
+        from pyglet.media import have_ffmpeg
+        pyglet.media.have_avbin = have_ffmpeg()
+        if not pyglet.media.have_avbin:
+            cfg.USE_MUSIC = False
 
     except ImportError as e:
         debug_msg(e)
@@ -4801,22 +4763,17 @@ def pulsate(dt):
 # Initialize brain sprite
 brain_icon = pyglet.sprite.Sprite(pyglet.image.load(random.choice(resourcepaths['misc']['brain'])))
 pos = (field.center_x - brain_icon.width//2,
-       field.center_y - brain_icon.height//2)
-pyglet2x = pyglet.version >= "2"
-if pyglet2x:
-    # add z component
-    pos += (0,)
+       field.center_y - brain_icon.height//2,
+       0)
 brain_icon.position = pos
 
 if cfg.BLACK_BACKGROUND:
     brain_graphic = pyglet.sprite.Sprite(pyglet.image.load(random.choice(resourcepaths['misc']['splash-black'])))
 else:
     brain_graphic = pyglet.sprite.Sprite(pyglet.image.load(random.choice(resourcepaths['misc']['splash'])))
 pos = (field.center_x - brain_graphic.width//2,
-       field.center_y - brain_graphic.height//2 + 40)
-if pyglet2x:
-    # add z component
-    pos += (0,)
+       field.center_y - brain_graphic.height//2 + 40,
+       0)
 brain_graphic.position = pos
 def scale_brain(dt):
     brain_graphic.scale = dt