Permalink
Browse files

Merge pull request #1744 from uozias/master

BF: Add importing pyglet.media.sources for pyglet 1.3
  • Loading branch information...
peircej committed Feb 24, 2018
2 parents a2b46d7 + c9c2a45 commit 5bdf5ba772d9579494c77b6d6bfda270c6b0f42d
Showing with 11 additions and 0 deletions.
  1. +11 −0 psychopy/visual/window.py
@@ -55,6 +55,17 @@
# AttributeError if using avbin5 from pyglet 1.2?
haveAvbin = False
# for pyglet 1.3
if not haveAvbin:
try:
from pyglet.media.sources import avbin
haveAvbin = True
except ImportError:
haveAvbin = False
except AttributeError:
haveAvbin = False
except Exception:
haveAvbin = False
import psychopy # so we can get the __path__
from psychopy import core, platform_specific, logging, prefs, monitors

0 comments on commit 5bdf5ba

Please sign in to comment.