summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-07-25 18:19:20 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-07-25 18:19:20 (GMT)
commitc2542e986d0070840e8e8833268b9d5c9f297f7c (patch)
treeb58274c918859e2fcb5c9b5a34c528a7041e99cd
parent5ffd9e9cc99d949e7e526c87be0c0fb2eea0225e (diff)
downloadcpython-c2542e986d0070840e8e8833268b9d5c9f297f7c.zip
cpython-c2542e986d0070840e8e8833268b9d5c9f297f7c.tar.gz
cpython-c2542e986d0070840e8e8833268b9d5c9f297f7c.tar.bz2
Remove the sunaudio module.
-rw-r--r--Doc/library/undoc.rst6
-rw-r--r--Lib/sunaudio.py48
-rw-r--r--Lib/test/test_sundry.py1
-rw-r--r--Misc/NEWS2
4 files changed, 2 insertions, 55 deletions
diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst
index b349c99..987f95e 100644
--- a/Doc/library/undoc.rst
+++ b/Doc/library/undoc.rst
@@ -26,9 +26,3 @@ documented beyond this mention. There's little need to document these.
:mod:`posixpath`
--- Implementation of :mod:`os.path` on POSIX.
-
-Multimedia
-==========
-
-:mod:`sunaudio`
- --- Interpret Sun audio headers (may become obsolete or a tool/demo).
diff --git a/Lib/sunaudio.py b/Lib/sunaudio.py
deleted file mode 100644
index 6c1bba1..0000000
--- a/Lib/sunaudio.py
+++ /dev/null
@@ -1,48 +0,0 @@
-"""Interpret sun audio headers."""
-
-MAGIC = b'.snd'
-
-class error(Exception):
- pass
-
-
-def get_long_be(s):
- """Convert a 4-byte value to integer."""
- return (s[0]<<24) | (s[1]<<16) | (s[2]<<8) | s[3]
-
-
-def gethdr(fp):
- """Read a sound header from an open file."""
- if fp.read(4) != MAGIC:
- raise error('gethdr: bad magic word')
- hdr_size = get_long_be(fp.read(4))
- data_size = get_long_be(fp.read(4))
- encoding = get_long_be(fp.read(4))
- sample_rate = get_long_be(fp.read(4))
- channels = get_long_be(fp.read(4))
- excess = hdr_size - 24
- if excess < 0:
- raise error('gethdr: bad hdr_size')
- if excess > 0:
- info = fp.read(excess)
- else:
- info = b''
- return (data_size, encoding, sample_rate, channels, info)
-
-
-def printhdr(file):
- """Read and print the sound header of a named file."""
- f = open(file, 'rb')
- try:
- hdr = gethdr(f)
- finally:
- f.close()
- data_size, encoding, sample_rate, channels, info = hdr
- while info.endswith(b'\0'):
- info = info[:-1]
- print('File name: ', file)
- print('Data size: ', data_size)
- print('Encoding: ', encoding)
- print('Sample rate:', sample_rate)
- print('Channels: ', channels)
- print('Info: ', repr(info))
diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py
index 18101e7..a99d2c0 100644
--- a/Lib/test/test_sundry.py
+++ b/Lib/test/test_sundry.py
@@ -64,7 +64,6 @@ class TestUntestedModules(unittest.TestCase):
import sched
import sndhdr
import sunau
- import sunaudio
import symbol
import tabnanny
import timeit
diff --git a/Misc/NEWS b/Misc/NEWS
index fa8061f..54a0baa 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -34,6 +34,8 @@ Core and Builtins
Library
-------
+- Removed the sunaudio module. Use sunau instead.
+
- Removed "ast" function aliases from the parser module.
- Issue #3313: Fixed a crash when a failed dlopen() call does not set