Mercurial > cpython-lru_cache-weakref

comparison Python/errors.c @ 54129:77cfef596d33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 72698-72699 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72698 | hirokazu.yamamoto | 2009-05-17 11:52:09 +0900 | 1 line Issue #3527: Removed Py_WIN_WIDE_FILENAMES which is not used any more. ........ r72699 | hirokazu.yamamoto | 2009-05-17 11:58:36 +0900 | 1 line Added NEWS for r72698. ........
author Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
date Sun, 17 May 2009 04:21:53 +0000
parents f221fce3d6ba
children f197407bdba2 c1972eef3579
comparison
equal deleted inserted replaced
54125:83dd2b252a27 54129:77cfef596d33
459 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name); 459 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
460 Py_XDECREF(name); 460 Py_XDECREF(name);
461 return result; 461 return result;
462 } 462 }
463 463
464 #ifdef Py_WIN_WIDE_FILENAMES 464 #ifdef MS_WINDOWS
465 PyObject * 465 PyObject *
466 PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, const Py_UNICODE *filename) 466 PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, const Py_UNICODE *filename)
467 { 467 {
468 PyObject *name = filename ? 468 PyObject *name = filename ?
469 PyUnicode_FromUnicode(filename, wcslen(filename)) : 469 PyUnicode_FromUnicode(filename, wcslen(filename)) :
470 NULL; 470 NULL;
471 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name); 471 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
472 Py_XDECREF(name); 472 Py_XDECREF(name);
473 return result; 473 return result;
474 } 474 }
475 #endif /* Py_WIN_WIDE_FILENAMES */ 475 #endif /* MS_WINDOWS */
476 476
477 PyObject * 477 PyObject *
478 PyErr_SetFromErrno(PyObject *exc) 478 PyErr_SetFromErrno(PyObject *exc)
479 { 479 {
480 return PyErr_SetFromErrnoWithFilenameObject(exc, NULL); 480 return PyErr_SetFromErrnoWithFilenameObject(exc, NULL);
547 name); 547 name);
548 Py_XDECREF(name); 548 Py_XDECREF(name);
549 return ret; 549 return ret;
550 } 550 }
551 551
552 #ifdef Py_WIN_WIDE_FILENAMES
553 PyObject *PyErr_SetExcFromWindowsErrWithUnicodeFilename( 552 PyObject *PyErr_SetExcFromWindowsErrWithUnicodeFilename(
554 PyObject *exc, 553 PyObject *exc,
555 int ierr, 554 int ierr,
556 const Py_UNICODE *filename) 555 const Py_UNICODE *filename)
557 { 556 {
562 ierr, 561 ierr,
563 name); 562 name);
564 Py_XDECREF(name); 563 Py_XDECREF(name);
565 return ret; 564 return ret;
566 } 565 }
567 #endif /* Py_WIN_WIDE_FILENAMES */
568 566
569 PyObject *PyErr_SetExcFromWindowsErr(PyObject *exc, int ierr) 567 PyObject *PyErr_SetExcFromWindowsErr(PyObject *exc, int ierr)
570 { 568 {
571 return PyErr_SetExcFromWindowsErrWithFilename(exc, ierr, NULL); 569 return PyErr_SetExcFromWindowsErrWithFilename(exc, ierr, NULL);
572 } 570 }
586 ierr, name); 584 ierr, name);
587 Py_XDECREF(name); 585 Py_XDECREF(name);
588 return result; 586 return result;
589 } 587 }
590 588
591 #ifdef Py_WIN_WIDE_FILENAMES
592 PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename( 589 PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename(
593 int ierr, 590 int ierr,
594 const Py_UNICODE *filename) 591 const Py_UNICODE *filename)
595 { 592 {
596 PyObject *name = filename ? 593 PyObject *name = filename ?
600 PyExc_WindowsError, 597 PyExc_WindowsError,
601 ierr, name); 598 ierr, name);
602 Py_XDECREF(name); 599 Py_XDECREF(name);
603 return result; 600 return result;
604 } 601 }
605 #endif /* Py_WIN_WIDE_FILENAMES */
606 #endif /* MS_WINDOWS */ 602 #endif /* MS_WINDOWS */
607 603
608 void 604 void
609 _PyErr_BadInternalCall(const char *filename, int lineno) 605 _PyErr_BadInternalCall(const char *filename, int lineno)
610 { 606 {