Mercurial > cpython-lru_cache-weakref

comparison Python/errors.c @ 54126:d64d47ee54a1 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #3527: Removed Py_WIN_WIDE_FILENAMES which is not used any more.
author Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
date Sun, 17 May 2009 02:52:09 +0000
parents 54b2cd21ab46
children 921e569d1215
comparison
equal deleted inserted replaced
54124:a53596094444 54126:d64d47ee54a1
377 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name); 377 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
378 Py_XDECREF(name); 378 Py_XDECREF(name);
379 return result; 379 return result;
380 } 380 }
381 381
382 #ifdef Py_WIN_WIDE_FILENAMES 382 #ifdef MS_WINDOWS
383 PyObject * 383 PyObject *
384 PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, Py_UNICODE *filename) 384 PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, Py_UNICODE *filename)
385 { 385 {
386 PyObject *name = filename ? 386 PyObject *name = filename ?
387 PyUnicode_FromUnicode(filename, wcslen(filename)) : 387 PyUnicode_FromUnicode(filename, wcslen(filename)) :
388 NULL; 388 NULL;
389 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name); 389 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
390 Py_XDECREF(name); 390 Py_XDECREF(name);
391 return result; 391 return result;
392 } 392 }
393 #endif /* Py_WIN_WIDE_FILENAMES */ 393 #endif /* MS_WINDOWS */
394 394
395 PyObject * 395 PyObject *
396 PyErr_SetFromErrno(PyObject *exc) 396 PyErr_SetFromErrno(PyObject *exc)
397 { 397 {
398 return PyErr_SetFromErrnoWithFilenameObject(exc, NULL); 398 return PyErr_SetFromErrnoWithFilenameObject(exc, NULL);
458 name); 458 name);
459 Py_XDECREF(name); 459 Py_XDECREF(name);
460 return ret; 460 return ret;
461 } 461 }
462 462
463 #ifdef Py_WIN_WIDE_FILENAMES
464 PyObject *PyErr_SetExcFromWindowsErrWithUnicodeFilename( 463 PyObject *PyErr_SetExcFromWindowsErrWithUnicodeFilename(
465 PyObject *exc, 464 PyObject *exc,
466 int ierr, 465 int ierr,
467 const Py_UNICODE *filename) 466 const Py_UNICODE *filename)
468 { 467 {
473 ierr, 472 ierr,
474 name); 473 name);
475 Py_XDECREF(name); 474 Py_XDECREF(name);
476 return ret; 475 return ret;
477 } 476 }
478 #endif /* Py_WIN_WIDE_FILENAMES */
479 477
480 PyObject *PyErr_SetExcFromWindowsErr(PyObject *exc, int ierr) 478 PyObject *PyErr_SetExcFromWindowsErr(PyObject *exc, int ierr)
481 { 479 {
482 return PyErr_SetExcFromWindowsErrWithFilename(exc, ierr, NULL); 480 return PyErr_SetExcFromWindowsErrWithFilename(exc, ierr, NULL);
483 } 481 }
497 ierr, name); 495 ierr, name);
498 Py_XDECREF(name); 496 Py_XDECREF(name);
499 return result; 497 return result;
500 } 498 }
501 499
502 #ifdef Py_WIN_WIDE_FILENAMES
503 PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename( 500 PyObject *PyErr_SetFromWindowsErrWithUnicodeFilename(
504 int ierr, 501 int ierr,
505 const Py_UNICODE *filename) 502 const Py_UNICODE *filename)
506 { 503 {
507 PyObject *name = filename ? 504 PyObject *name = filename ?
511 PyExc_WindowsError, 508 PyExc_WindowsError,
512 ierr, name); 509 ierr, name);
513 Py_XDECREF(name); 510 Py_XDECREF(name);
514 return result; 511 return result;
515 } 512 }
516 #endif /* Py_WIN_WIDE_FILENAMES */
517 #endif /* MS_WINDOWS */ 513 #endif /* MS_WINDOWS */
518 514
519 void 515 void
520 _PyErr_BadInternalCall(char *filename, int lineno) 516 _PyErr_BadInternalCall(char *filename, int lineno)
521 { 517 {