From d739bda6b254314fdded5da993dafb82125fa25f Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 29 May 2013 23:38:00 +0300 Subject: [PATCH] Issue #18084: Use sys.byteorder in wave.py. Original patch by Hideaki Takahashi. --- Lib/wave.py | 11 +++-------- Misc/ACKS | 1 + 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Lib/wave.py b/Lib/wave.py index e3bf2af53c3..ea410c12d78 100644 --- a/Lib/wave.py +++ b/Lib/wave.py @@ -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() diff --git a/Misc/ACKS b/Misc/ACKS index 9ba99cd7c68..3ce5cd20561 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1222,6 +1222,7 @@ Thenault Sylvain Péter Szabó Amir Szekely Arfrever Frehtes Taifersar Arahesis +Hideaki Takahashi Neil Tallim Geoff Talvola Musashi Tamura