Only set error string when dict lookup found no matching key (was setting

andrewmcnamara · andrewmcnamara · commit 92c7731cc1d3 · 2005-01-10T23:17:35.000Z
it for all failures, potentially masking other exceptions). git-svn-id: http://svn.python.org/projects/python/trunk@38261 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Modules/_csv.c b/Modules/_csv.c
@@ -127,9 +127,12 @@ get_dialect_from_registry(PyObject * name_obj)
         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;
 }
 
