[Python-3000-checkins] r56783 - python/branches/py3k-struni/Modules/dbmmodule.c

[guido.van.rossum]

Author: guido.van.rossum
Date: Tue Aug  7 02:13:33 2007
New Revision: 56783

Modified:
   python/branches/py3k-struni/Modules/dbmmodule.c
Log:
Quick fixes for assert failures in dbm wrapper code.


Modified: python/branches/py3k-struni/Modules/dbmmodule.c
==============================================================================
--- python/branches/py3k-struni/Modules/dbmmodule.c	(original)
+++ python/branches/py3k-struni/Modules/dbmmodule.c	Tue Aug  7 02:13:33 2007
@@ -103,8 +103,7 @@
         check_dbmobject_open(dp);
 	drec = dbm_fetch(dp->di_dbm, krec);
 	if ( drec.dptr == 0 ) {
-		PyErr_SetString(PyExc_KeyError,
-				PyString_AS_STRING((PyStringObject *)key));
+		PyErr_SetObject(PyExc_KeyError, key);
 		return NULL;
 	}
 	if ( dbm_error(dp->di_dbm) ) {
@@ -135,8 +134,7 @@
 	if (w == NULL) {
 		if ( dbm_delete(dp->di_dbm, krec) < 0 ) {
 			dbm_clearerr(dp->di_dbm);
-			PyErr_SetString(PyExc_KeyError,
-				      PyString_AS_STRING((PyStringObject *)v));
+			PyErr_SetString(PyExc_KeyError, v);
 			return -1;
 		}
 	} else {