Clear exceptions if PyFile_Dup() fails -- we have a way to handle "non-real" file objects.

mdboom · mdboom · commit cd6c8c932ea3 · 2013-01-11T10:29:13.000-05:00
diff --git a/src/_png.cpp b/src/_png.cpp
@@ -149,6 +149,7 @@ Py::Object _png_module::write_png(const Py::Tuple& args)
     }
     else
     {
+        PyErr_Clear();
         PyObject* write_method = PyObject_GetAttrString(
                 py_file, "write");
         if (!(write_method && PyCallable_Check(write_method)))
@@ -326,6 +327,7 @@ _png_module::_read_png(const Py::Object& py_fileobj, const bool float_result,
     }
     else
     {
+        PyErr_Clear();
         PyObject* read_method = PyObject_GetAttrString(py_file, "read");
         if (!(read_method && PyCallable_Check(read_method)))
         {

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ Py::Object _png_module::write_png(const Py::Tuple& args)`
`149`	`149`	`}`
`150`	`150`	`else`
`151`	`151`	`{`
	`152`	`+ PyErr_Clear();`
`152`	`153`	`PyObject* write_method = PyObject_GetAttrString(`
`153`	`154`	`py_file, "write");`
`154`	`155`	`if (!(write_method && PyCallable_Check(write_method)))`
`@@ -326,6 +327,7 @@ _png_module::_read_png(const Py::Object& py_fileobj, const bool float_result,`
`326`	`327`	`}`
`327`	`328`	`else`
`328`	`329`	`{`
	`330`	`+ PyErr_Clear();`
`329`	`331`	`PyObject* read_method = PyObject_GetAttrString(py_file, "read");`
`330`	`332`	`if (!(read_method && PyCallable_Check(read_method)))`
`331`	`333`	`{`