Note that readframes() returns data in linear format, even if the original

is encoded in u-LAW format.  Based on suggestion from Anthony Baxter
<anthony_baxter@users.sourceforge.net>.

This closes bug #122273.

1 files changed, 15 insertions, 8 deletions

diff --git a/Doc/tools/listmodules b/Doc/tools/listmodules
index 7751a9e..03e7b5d 100755
--- a/Doc/tools/listmodules
+++ b/Doc/tools/listmodules
@@ -8,18 +8,24 @@
 
 """%(program)s - list modules in the Python standard library
 
--a, --annotate	  Annotate the module names with the subdirectory they live in
+-a, --annotate	  Annotate the module names with the subdirectory they
+                  live in
 -c, --categorize  Group the modules by subdirectory
 -i <file>,
---ignore-from <file>  Ignore the modules listed in <file>.  <file> may contain
-		  a list of module names or a module index file as produced
-                  when formatting the Python documentation (.idx flavor).
 
-If neither -a nor -c are given, the modules are listed in alphabetical order.
+--ignore-from <file>	Ignore the modules listed in <file>.  <file> may
+                  contain a list of module names or a module index file
+                  as produced when formatting the Python documentation
+                  (.idx or .html flavor).
+
+If neither -a nor -c are given, the modules are listed in alphabetical
+order.
 
 Note that -a and -c are mutually exclusive.
 
-Limitation:  Modules loadable as shared objects are not listed.
+Limitation: Modules loadable as shared objects may not be listed,
+though this script attempts to locate such modules.
+
 """
 
 __version__ = '$Revision$'
@@ -32,7 +38,8 @@ import string
 import sys
 
 
-REMOVE_DIRS = ["dos-8x3", "lib-old", "lib-stdwin", "test"]
+REMOVE_DIRS = ["dos-8x3", "encodings", "distutils",
+               "lib-old", "lib-stdwin", "test"]
 
 
 def main():
@@ -86,7 +93,7 @@ def main():
             if not ignore(name):
                 modules_by_name[name] = "<built-in>"
                 l.append(name)
-    rx = re.compile("Lib/plat-[a-z0-9]*/", re.IGNORECASE)
+    rx = re.compile("Lib/plat-[a-zA-Z0-9]*/")
     fp = os.popen("find Lib -name \*.py -print", "r")
     while 1:
         line = fp.readline()