diff -r a156f602debc Modules/_hashopenssl.c
--- a/Modules/_hashopenssl.c	Tue Apr 28 12:42:20 2009 -0700
+++ b/Modules/_hashopenssl.c	Wed Apr 29 09:36:56 2009 -0700
@@ -287,12 +287,6 @@
      (getter)EVP_get_block_size, NULL,
      NULL,
      NULL},
-    /* the old md5 and sha modules support 'digest_size' as in PEP 247.
-     * the old sha module also supported 'digestsize'.  ugh. */
-    {"digestsize",
-     (getter)EVP_get_digest_size, NULL,
-     NULL,
-     NULL},
     {NULL}  /* Sentinel */
 };
 
diff -r a156f602debc Modules/pwdmodule.c
--- a/Modules/pwdmodule.c	Tue Apr 28 12:42:20 2009 -0700
+++ b/Modules/pwdmodule.c	Wed Apr 29 09:36:56 2009 -0700
@@ -203,13 +203,12 @@
 	if (m == NULL)
     		return NULL;
 
-	if (!initialized)
+	if (!initialized) {
 		PyStructSequence_InitType(&StructPwdType, 
 					  &struct_pwd_type_desc);
+		initialized = 1;
+	}
 	Py_INCREF((PyObject *) &StructPwdType);
 	PyModule_AddObject(m, "struct_passwd", (PyObject *) &StructPwdType);
-	/* And for b/w compatibility (this was defined by mistake): */
-	PyModule_AddObject(m, "struct_pwent", (PyObject *) &StructPwdType);
-	initialized = 1;
 	return m;
 }
diff -r a156f602debc Modules/sha256module.c
--- a/Modules/sha256module.c	Tue Apr 28 12:42:20 2009 -0700
+++ b/Modules/sha256module.c	Wed Apr 29 09:36:56 2009 -0700
@@ -533,9 +533,6 @@
 
 static PyMemberDef SHA_members[] = {
     {"digest_size", T_INT, offsetof(SHAobject, digestsize), READONLY, NULL},
-    /* the old md5 and sha modules support 'digest_size' as in PEP 247.
-     * the old sha module also supported 'digestsize'.  ugh. */
-    {"digestsize", T_INT, offsetof(SHAobject, digestsize), READONLY, NULL},
     {NULL}  /* Sentinel */
 };
 
diff -r a156f602debc Modules/sha512module.c
--- a/Modules/sha512module.c	Tue Apr 28 12:42:20 2009 -0700
+++ b/Modules/sha512module.c	Wed Apr 29 09:36:56 2009 -0700
@@ -599,9 +599,6 @@
 
 static PyMemberDef SHA_members[] = {
     {"digest_size", T_INT, offsetof(SHAobject, digestsize), READONLY, NULL},
-    /* the old md5 and sha modules support 'digest_size' as in PEP 247.
-     * the old sha module also supported 'digestsize'.  ugh. */
-    {"digestsize", T_INT, offsetof(SHAobject, digestsize), READONLY, NULL},
     {NULL}  /* Sentinel */
 };