More clearly specify what modules should be removed in Python 2.6 along with

what deprecated modules currently lack a DeprecationWarning.

pep-0004.txt

@@ -78,6 +78,11 @@ Obsolete modules
         rand, reconvert, regex, regsub, statcache, tb, tzparse,
         util, whatsound, whrandom, zmod
 
+    The following modules currently lack a DeprecationWarning:
+
+        posixfile, rfc822, mimetools, MimeWriter, mimify,
+        multifile, md5, sha
+
 
 Deprecated modules
 

pep-0361.txt

@@ -59,6 +59,10 @@ Completed features for 2.6
 
         None
 
+    Deprecated modules in the standard library:
+
+        - sets
+
     Python 3.0 compatability:
 
         None
@@ -100,6 +104,26 @@ Possible features for 2.6
           PJE's withdrawal from 2.5 for inclusion in 2.6:
           http://mail.python.org/pipermail/python-dev/2006-April/064145.html
 
+    Modules to be removed according to PEP 4:
+
+        - gopherlib
+        - rgbimg
+        - buildtools [if DeprecationWarning raised in 2.5]
+        - cfmfile [if DeprecationWarning raised in 2.5]
+        - macfs [if DeprecationWarning raised in 2.5]
+
+    Module to gain a DeprecationWarning (as specified for Python 2.6
+    or through negligence):
+
+        - posixfile
+        - rfc822
+        - mimetools
+        - MimeWriter
+        - mimify
+        - multifile
+        - md5
+        - sha
+
     - warnings module implemented in C
       * Convert Parser/*.c to use warnings module rather than printf
 
@@ -124,7 +148,7 @@ Possible features for 2.6
       * function attributes that start with func_* (should use __*__)
       * softspace removal for print() function
       * the L suffix for long literals
-      * removal of the sets and exceptions module
+      * removal of modules because of PEP 4/3100/3108
       * renaming of __nonzero__ to __bool__
       * multiple inheritance with classic classes? (MRO might change)
       * properties and classic classes? (instance attrs shadow property)

pep-3100.txt

@@ -217,7 +217,6 @@ To be removed:
           ``mpz``,
           ``multifile``,
           ``posixfile``, 
-          ``pre``,
           ``regsub``,
           ``rfc822``,
           ``rgbimage``,