[Python-checkins] python/dist/src/Modules _csv.c,1.22,1.23

[andrewmcnamara at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21350/Modules

Modified Files:
	_csv.c 
Log Message:
Only set error string when dict lookup found no matching key (was setting
it for all failures, potentially masking other exceptions).


Index: _csv.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_csv.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- _csv.c	10 Jan 2005 12:25:11 -0000	1.22
+++ _csv.c	10 Jan 2005 23:17:35 -0000	1.23
@@ -127,9 +127,12 @@
         PyObject *dialect_obj;
 
         dialect_obj = PyDict_GetItem(dialects, name_obj);
-        if (dialect_obj == NULL)
-            return PyErr_Format(error_obj, "unknown dialect");
-        Py_INCREF(dialect_obj);
+	if (dialect_obj == NULL) {
+		if (!PyErr_Occurred())
+			PyErr_Format(error_obj, "unknown dialect");
+	}
+	else
+		Py_INCREF(dialect_obj);
         return dialect_obj;
 }