removed indexing

Author: bastibe

soundfile.py

@@ -728,46 +728,6 @@ def __getattr__(self, name):
     def __len__(self):
         return self._info.frames
 
-    def __getitem__(self, frame):
-        # access the file as if it where a Numpy array. The data is
-        # returned as numpy array.
-        from warnings import warn
-        warn('indexing has been deprecated and will be removed in the future',
-             Warning)
-        second_frame = None
-        if isinstance(frame, tuple):
-            if len(frame) > 2:
-                raise AttributeError(
-                    "SoundFile can only be accessed in one or two dimensions")
-            frame, second_frame = frame
-        start, stop = self._get_slice_bounds(frame)
-        curr = self.seek(0, SEEK_CUR)
-        self.seek(start, SEEK_SET)
-        data = self.read(stop - start)
-        self.seek(curr, SEEK_SET)
-        if second_frame:
-            return data[(slice(None), second_frame)]
-        else:
-            return data
-
-    def __setitem__(self, frame, data):
-        # access the file as if it where a one-dimensional Numpy
-        # array. Data must be in the form (frames x channels).
-        # Both open slice bounds and negative values are allowed.
-        from warnings import warn
-        warn('indexing has been deprecated and will be removed in the future',
-             Warning)
-        start, stop = self._get_slice_bounds(frame)
-        if stop - start != len(data):
-            raise IndexError(
-                "Could not fit data of length %i into slice of length %i" %
-                (len(data), stop - start))
-        curr = self.seek(0, SEEK_CUR)
-        self.seek(start, SEEK_SET)
-        self.write(data)
-        self.seek(curr, SEEK_SET)
-        return data
-
     def seekable(self):
         """Return True if the file supports seeking."""
         return self._info.seekable == _snd.SF_TRUE

tests/test_pysoundfile.py

@@ -470,7 +470,7 @@ def test_non_clipping_float_to_float(file_inmemory):
 
 
 def test_file_content(sf_stereo_r):
-    assert np.all(data_stereo == sf_stereo_r[:])
+    assert np.all(data_stereo == sf_stereo_r.read())
 
 
 def test_file_attributes_in_read_mode(sf_stereo_r):
@@ -577,11 +577,6 @@ def test_read_should_read_data_and_advance_read_pointer(sf_stereo_r):
     assert sf_stereo_r.seek(0, sf.SEEK_CUR) == 2
 
 
-def test_read_by_indexing_should_read_but_not_advance_read_pointer(
-        sf_stereo_r):
-    assert np.all(sf_stereo_r[:2] == data_stereo[:2])
-    assert sf_stereo_r.seek(0, sf.SEEK_CUR) == 0
-
 
 def test_read_n_frames_should_return_n_frames(sf_stereo_r):
     assert len(sf_stereo_r.read(2)) == 2
@@ -661,18 +656,6 @@ def test_wplus_read_written_data(sf_stereo_wplus):
     assert np.all(data == data_stereo)
 
 
-def test_wplus_writing_using_indexing_should_write_but_not_advance_write_pointer(
-        sf_stereo_wplus):
-    data = np.ones((5, 2))
-    # grow file to make room for indexing
-    sf_stereo_wplus.write(np.zeros((5, 2)))
-    position = sf_stereo_wplus.seek(0, sf.SEEK_CUR)
-    sf_stereo_wplus[:len(data)] = data
-    written_data = sf_stereo_wplus[:len(data)]
-    assert np.all(data == written_data)
-    assert position == sf_stereo_wplus.seek(0, sf.SEEK_CUR)
-
-
 def test_rplus_append_data(sf_stereo_rplus):
     sf_stereo_rplus.seek(0, sf.SEEK_END)
     sf_stereo_rplus.write(data_stereo / 2)