Mercurial > cpython-lru_cache-weakref

comparison Python/errors.c @ 80944:bb94f6222fef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #16719: Get rid of WindowsError. Use OSError instead Patch by Serhiy Storchaka.
author Andrew Svetlov <andrew.svetlov@gmail.com>
date Wed, 19 Dec 2012 14:33:35 +0200
parents a281604a5c9a
children 3a50025f1900
comparison
equal deleted inserted replaced
80943:e5958a4e52ef 80944:bb94f6222fef
586 return PyErr_SetExcFromWindowsErrWithFilename(exc, ierr, NULL); 586 return PyErr_SetExcFromWindowsErrWithFilename(exc, ierr, NULL);
587 } 587 }
588 588
589 PyObject *PyErr_SetFromWindowsErr(int ierr) 589 PyObject *PyErr_SetFromWindowsErr(int ierr)
590 { 590 {
591 return PyErr_SetExcFromWindowsErrWithFilename(PyExc_WindowsError, 591 return PyErr_SetExcFromWindowsErrWithFilename(PyExc_OSError,
592 ierr, NULL); 592 ierr, NULL);
593 } 593 }
594 PyObject *PyErr_SetFromWindowsErrWithFilename( 594 PyObject *PyErr_SetFromWindowsErrWithFilename(
595 int ierr, 595 int ierr,
596 const char *filename) 596 const char *filename)
597 { 597 {
598 PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL; 598 PyObject *name = filename ? PyUnicode_DecodeFSDefault(filename) : NULL;
599 PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject( 599 PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject(
600 PyExc_WindowsError, 600 PyExc_OSError,
601 ierr, name); 601 ierr, name);
602 Py_XDECREF(name); 602 Py_XDECREF(name);
603 return result; 603 return result;
604 } 604 }
605 605
609 { 609 {
610 PyObject *name = filename ? 610 PyObject *name = filename ?
611 PyUnicode_FromUnicode(filename, wcslen(filename)) : 611 PyUnicode_FromUnicode(filename, wcslen(filename)) :
612 NULL; 612 NULL;
613 PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject( 613 PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject(
614 PyExc_WindowsError, 614 PyExc_OSError,
615 ierr, name); 615 ierr, name);
616 Py_XDECREF(name); 616 Py_XDECREF(name);
617 return result; 617 return result;
618 } 618 }
619 #endif /* MS_WINDOWS */ 619 #endif /* MS_WINDOWS */