bpo-1102: View.Fetch() now returns None when it's exhausted (GH-4459)

This commit is contained in:
Berker Peksag 2017-11-23 15:47:30 +03:00 committed by GitHub
parent 5ce1069a6f
commit bdb8315c21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 2 deletions

View file

@ -723,8 +723,12 @@ view_fetch(msiobj *view, PyObject*args)
int status;
MSIHANDLE result;
if ((status = MsiViewFetch(view->h, &result)) != ERROR_SUCCESS)
status = MsiViewFetch(view->h, &result);
if (status == ERROR_NO_MORE_ITEMS) {
Py_RETURN_NONE;
} else if (status != ERROR_SUCCESS) {
return msierror(status);
}
return record_new(result);
}