Issue #18084: Use sys.byteorder in wave.py.

Original patch by Hideaki Takahashi.
This commit is contained in:
Serhiy Storchaka 2013-05-29 23:38:00 +03:00
parent 2e537f9edc
commit d739bda6b2
2 changed files with 4 additions and 8 deletions

View File

@ -82,13 +82,8 @@ WAVE_FORMAT_PCM = 0x0001
_array_fmts = None, 'b', 'h', None, 'l'
# Determine endian-ness
import struct
if struct.pack("h", 1) == b"\000\001":
big_endian = 1
else:
big_endian = 0
import sys
from chunk import Chunk
from collections import namedtuple
@ -235,7 +230,7 @@ class Wave_read:
self._data_seek_needed = 0
if nframes == 0:
return b''
if self._sampwidth > 1 and big_endian:
if self._sampwidth > 1 and sys.byteorder == 'big':
# unfortunately the fromfile() method does not take
# something that only looks like a file object, so
# we have to reach into the innards of the chunk object
@ -422,7 +417,7 @@ class Wave_write:
nframes = len(data) // (self._sampwidth * self._nchannels)
if self._convert:
data = self._convert(data)
if self._sampwidth > 1 and big_endian:
if self._sampwidth > 1 and sys.byteorder == 'big':
import array
data = array.array(_array_fmts[self._sampwidth], data)
data.byteswap()

View File

@ -1222,6 +1222,7 @@ Thenault Sylvain
Péter Szabó
Amir Szekely
Arfrever Frehtes Taifersar Arahesis
Hideaki Takahashi
Neil Tallim
Geoff Talvola
Musashi Tamura