CVE-2017-18207 Fix up code for Python2

Author: rickprice

Lib/aifc.py

@@ -135,6 +135,7 @@
 """
 
 import struct
+import warnings
 import __builtin__
 
 __all__ = ["Error","open","openfp"]
@@ -316,16 +317,16 @@ def initfp(self, file):
             except EOFError:
                 break
             chunkname = chunk.getname()
-            if chunkname == 'COMM':
+            if chunkname == b'COMM':
                 self._read_comm_chunk(chunk)
                 self._comm_chunk_read = 1
-            elif chunkname == 'SSND':
+            elif chunkname == b'SSND':
                 self._ssnd_chunk = chunk
                 dummy = chunk.read(8)
                 self._ssnd_seek_needed = 0
-            elif chunkname == 'FVER':
+            elif chunkname == b'FVER':
                 self._version = _read_ulong(chunk)
-            elif chunkname == 'MARK':
+            elif chunkname == b'MARK':
                 self._readmark(chunk)
             chunk.skip()
         if not self._comm_chunk_read or not self._ssnd_chunk:
@@ -466,16 +467,17 @@ def _read_comm_chunk(self, chunk):
         self._sampwidth = (_read_short(chunk) + 7) // 8
         self._framerate = int(_read_float(chunk))
         if self._sampwidth <= 0:
-            raise Error('bad sample width')
+            raise Error, 'bad sample width'
         if self._nchannels <= 0:
-            raise Error('bad # of channels')
+            raise Error, 'bad # of channels'
+
         self._framesize = self._nchannels * self._sampwidth
         if self._aifc:
             #DEBUG: SGI's soundeditor produces a bad size :-(
             kludge = 0
             if chunk.chunksize == 18:
                 kludge = 1
-                print 'Warning: bad COMM chunk size'
+                warnings.warn("bad COMM chunk size")
                 chunk.chunksize = 23
             #DEBUG end
             self._comptype = chunk.read(4)
@@ -539,11 +541,13 @@ def _readmark(self, chunk):
                     # a position 0 and name ''
                     self._markers.append((id, pos, name))
         except EOFError:
-            print 'Warning: MARK chunk contains only',
-            print len(self._markers),
-            if len(self._markers) == 1: print 'marker',
-            else: print 'markers',
-            print 'instead of', nmarkers
+            warning_message = 'MARK chunk contains only ' + str(len(self._markers))
+            if len(self._markers) == 1: 
+                warning_message += ' marker '
+            else: 
+                warning_message += ' markers '
+            warning_message += 'instead of ' + str(nmarkers)
+            warnings.warn(warning_message)
 
 class Aifc_write:
     # Variables used in this class:

Lib/test/test_aifc.py

@@ -7,6 +7,7 @@
 import sys
 import struct
 import aifc
+from test.test_support import check_warnings
 
 
 class AifcTest(audiotests.AudioWriteTests,
@@ -237,7 +238,7 @@ def test_read_wrong_number_of_channels(self):
                                        0x4000 | 12, 11025<<18, 0)
             b += b'NONE' + struct.pack('B', 14) + b'not compressed' + b'\x00'
             b += b'SSND' + struct.pack('>L', 8) + b'\x00' * 8
-            with self.assertRaisesRegex(aifc.Error, 'bad # of channels'):
+            with self.assertRaisesRegexp(aifc.Error, 'bad # of channels'):
                 aifc.open(io.BytesIO(b))
 
     def test_read_wrong_sample_width(self):
@@ -247,7 +248,7 @@ def test_read_wrong_sample_width(self):
                                        0x4000 | 12, 11025<<18, 0)
             b += b'NONE' + struct.pack('B', 14) + b'not compressed' + b'\x00'
             b += b'SSND' + struct.pack('>L', 8) + b'\x00' * 8
-            with self.assertRaisesRegex(aifc.Error, 'bad sample width'):
+            with self.assertRaisesRegexp(aifc.Error, 'bad sample width'):
                 aifc.open(io.BytesIO(b))
 
     def test_read_wrong_marks(self):
@@ -256,21 +257,18 @@ def test_read_wrong_marks(self):
                                    0x4000 | 12, 11025<<18, 0)
         b += b'SSND' + struct.pack('>L', 8) + b'\x00' * 8
         b += b'MARK' + struct.pack('>LhB', 3, 1, 1)
-        with self.assertWarns(UserWarning) as cm:
+        with check_warnings(('MARK chunk contains only 0 markers instead of 1', UserWarning)):
             f = aifc.open(io.BytesIO(b))
-        self.assertEqual(s.getvalue(), 'Warning: MARK chunk contains '
-                                       'only 0 markers instead of 1\n')
-        self.assertEqual(f.getmarkers(), None)
+            self.assertEqual(f.getmarkers(), None)
 
     def test_read_comm_kludge_compname_even(self):
         b = b'FORM' + struct.pack('>L', 4) + b'AIFC'
         b += b'COMM' + struct.pack('>LhlhhLL', 18, 1, 0, 8,
                                    0x4000 | 12, 11025<<18, 0)
         b += b'NONE' + struct.pack('B', 4) + b'even' + b'\x00'
         b += b'SSND' + struct.pack('>L', 8) + b'\x00' * 8
-        with self.assertWarns(UserWarning) as cm:
+        with check_warnings(('bad COMM chunk size', UserWarning)):
             f = aifc.open(io.BytesIO(b))
-        self.assertEqual(s.getvalue(), 'Warning: bad COMM chunk size\n')
         self.assertEqual(f.getcompname(), 'even')
 
     def test_read_comm_kludge_compname_odd(self):
@@ -279,9 +277,8 @@ def test_read_comm_kludge_compname_odd(self):
                                    0x4000 | 12, 11025<<18, 0)
         b += b'NONE' + struct.pack('B', 3) + b'odd'
         b += b'SSND' + struct.pack('>L', 8) + b'\x00' * 8
-        with self.assertWarns(UserWarning) as cm:
+        with check_warnings(('bad COMM chunk size', UserWarning)):
             f = aifc.open(io.BytesIO(b))
-        self.assertEqual(s.getvalue(), 'Warning: bad COMM chunk size\n')
         self.assertEqual(f.getcompname(), 'odd')
 
     def test_write_params_raises(self):

Lib/test/test_sunau.py

@@ -1,7 +1,6 @@
 from test.test_support import TESTFN, run_unittest
 import unittest
 from test import audiotests
-from audioop import byteswap
 import io
 import struct
 import sys

Lib/test/test_wave.py

@@ -2,7 +2,6 @@
 import unittest
 from test import audiotests
 from test import support
-from audioop import byteswap
 import io
 import struct
 import sys

Lib/wave.py

@@ -269,12 +269,12 @@ def _read_fmt_chunk(self, chunk):
         try:
             wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack_from('<HHLLH', chunk.read(14))
         except struct.error:
-            raise EOFError from None
+            raise EOFError
         if wFormatTag == WAVE_FORMAT_PCM:
             try:
                 sampwidth = struct.unpack_from('<H', chunk.read(2))[0]
             except struct.error:
-                raise EOFError from None
+                raise EOFError
             self._sampwidth = (sampwidth + 7) // 8
             if not self._sampwidth:
                 raise Error('bad sample width')