From 4316135a441aa7504c9feac1e706e5934c770c8b Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Tue, 22 Jun 1999 21:23:23 +0000 Subject: [PATCH] Make the mode parameter to open() default in the same way as for wave.open(). --- Lib/aifc.py | 13 +++++++++---- Lib/sunau.py | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Lib/aifc.py b/Lib/aifc.py index c50bd79ff97..a4d9616c695 100644 --- a/Lib/aifc.py +++ b/Lib/aifc.py @@ -920,13 +920,18 @@ class Aifc_write: _write_long(self._file, pos) _write_string(self._file, name) -def open(f, mode): - if mode == 'r': +def open(f, mode=None): + if mode is None: + if hasattr(f, 'mode'): + mode = f.mode + else: + mode = 'rb' + if mode in ('r', 'rb'): return Aifc_read(f) - elif mode == 'w': + elif mode in ('w', 'wb'): return Aifc_write(f) else: - raise Error, "mode must be 'r' or 'w'" + raise Error, "mode must be 'r', 'rb', 'w', or 'wb'" openfp = open # B/W compatibility diff --git a/Lib/sunau.py b/Lib/sunau.py index b49a5dafae5..0ba7dc95376 100644 --- a/Lib/sunau.py +++ b/Lib/sunau.py @@ -456,12 +456,17 @@ class Au_write: self._datalength = self._datawritten self._file.seek(0, 2) -def open(f, mode): - if mode == 'r': +def open(f, mode=None): + if mode is None: + if hasattr(f, 'mode'): + mode = f.mode + else: + mode = 'rb' + if mode in ('r', 'rb'): return Au_read(f) - elif mode == 'w': + elif mode in ('w', 'wb'): return Au_write(f) else: - raise Error, "mode must be 'r' or 'w'" + raise Error, "mode must be 'r', 'rb', 'w', or 'wb'" openfp = open