Merge pull request #4521 from takluyver/test-display-audio

Read wav files in binary mode

IPython/lib/display.py

@@ -67,7 +67,8 b' class Audio(DisplayObject):'
     Audio(data=b'RAW_WAV_DATA..)
 
     """
-        
+    _read_flags = 'rb'
+
     def __init__(self, data=None, filename=None, url=None, embed=None, rate=None, autoplay=False):
         if filename is None and url is None and data is None:
             raise ValueError("No image data found. Expecting filename, url, or data.")

IPython/lib/tests/test_display.py

@@ -14,13 +14,14 b''
 #-----------------------------------------------------------------------------
 from __future__ import print_function
 from tempfile import NamedTemporaryFile, mkdtemp
-from os.path import split
+from os.path import split, join as pjoin, dirname
 
 # Third-party imports
 import nose.tools as nt
 
 # Our own imports
 from IPython.lib import display
+from IPython.testing.decorators import skipif_not_numpy
 
 #-----------------------------------------------------------------------------
 # Classes and functions
@@ -155,3 +156,7 b' def test_error_on_file_to_FileLinks():'
     tf1 = NamedTemporaryFile(dir=td)
     nt.assert_raises(ValueError,display.FileLinks,tf1.name)
 
+@skipif_not_numpy
+def test_audio_from_file():
+    path = pjoin(dirname(__file__), 'test.wav')
+    display.Audio(filename=path)
  No newline at end of file

setupbase.py

@@ -151,6 +151,7 b' def find_package_data():'
     package_data = {
         'IPython.config.profile' : ['README*', '*/*.py'],
         'IPython.core.tests' : ['*.png', '*.jpg'],
+        'IPython.lib.tests' : ['*.wav'],
         'IPython.testing' : ['*.txt'],
         'IPython.testing.plugin' : ['*.txt'],
         'IPython.html' : ['templates/*'] + static_data,