[Python-3000-checkins] r65231 - in python/branches/py3k: Doc/library/undoc.rst Lib/sunaudio.py Lib/test/test_sundry.py Misc/NEWS

[brett.cannon]

Author: brett.cannon
Date: Fri Jul 25 20:19:20 2008
New Revision: 65231

Log:
Remove the sunaudio module.

Removed:
python/branches/py3k/Lib/sunaudio.py
Modified:
python/branches/py3k/Doc/library/undoc.rst
python/branches/py3k/Lib/test/test_sundry.py
python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Doc/library/undoc.rst
==============================================================================
--- python/branches/py3k/Doc/library/undoc.rst (original)
+++ python/branches/py3k/Doc/library/undoc.rst Fri Jul 25 20:19:20 2008
@@ -26,9 +26,3 @@
:mod:`posixpath`
--- Implementation of :mod:`os.path` on POSIX.

-
-Multimedia
-==========
-
-:mod:`sunaudio`
- --- Interpret Sun audio headers (may become obsolete or a tool/demo).

Deleted: python/branches/py3k/Lib/sunaudio.py
==============================================================================
--- python/branches/py3k/Lib/sunaudio.py Fri Jul 25 20:19:20 2008
+++ (empty file)
@@ -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))

Modified: python/branches/py3k/Lib/test/test_sundry.py
==============================================================================
--- python/branches/py3k/Lib/test/test_sundry.py (original)
+++ python/branches/py3k/Lib/test/test_sundry.py Fri Jul 25 20:19:20 2008
@@ -64,7 +64,6 @@
import sched
import sndhdr
import sunau
- import sunaudio
import symbol
import tabnanny
import timeit

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Fri Jul 25 20:19:20 2008
@@ -34,6 +34,8 @@
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