Mercurial > cpython-lru_cache-weakref

comparison Python/errors.c @ 47527:52294af4b663 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
This reverts r63675 based on the discussion in this thread: http://mail.python.org/pipermail/python-dev/2008-June/079988.html Python 2.6 should stick with PyString_* in its codebase. The PyBytes_* names in the spirit of 3.0 are available via a #define only. See the email thread.
author Gregory P. Smith <greg@mad-scientist.com>
date Mon, 09 Jun 2008 04:58:54 +0000
parents 4fe192d48960
children 0fbddc04aee1
comparison
equal deleted inserted replaced
47526:246a802637ad 47527:52294af4b663
64 } 64 }
65 65
66 void 66 void
67 PyErr_SetString(PyObject *exception, const char *string) 67 PyErr_SetString(PyObject *exception, const char *string)
68 { 68 {
69 PyObject *value = PyBytes_FromString(string); 69 PyObject *value = PyString_FromString(string);
70 PyErr_SetObject(exception, value); 70 PyErr_SetObject(exception, value);
71 Py_XDECREF(value); 71 Py_XDECREF(value);
72 } 72 }
73 73
74 74
349 349
350 350
351 PyObject * 351 PyObject *
352 PyErr_SetFromErrnoWithFilename(PyObject *exc, char *filename) 352 PyErr_SetFromErrnoWithFilename(PyObject *exc, char *filename)
353 { 353 {
354 PyObject *name = filename ? PyBytes_FromString(filename) : NULL; 354 PyObject *name = filename ? PyString_FromString(filename) : NULL;
355 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name); 355 PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
356 Py_XDECREF(name); 356 Py_XDECREF(name);
357 return result; 357 return result;
358 } 358 }
359 359
428 PyObject *PyErr_SetExcFromWindowsErrWithFilename( 428 PyObject *PyErr_SetExcFromWindowsErrWithFilename(
429 PyObject *exc, 429 PyObject *exc,
430 int ierr, 430 int ierr,
431 const char *filename) 431 const char *filename)
432 { 432 {
433 PyObject *name = filename ? PyBytes_FromString(filename) : NULL; 433 PyObject *name = filename ? PyString_FromString(filename) : NULL;
434 PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc, 434 PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc,
435 ierr, 435 ierr,
436 name); 436 name);
437 Py_XDECREF(name); 437 Py_XDECREF(name);
438 return ret; 438 return ret;
467 } 467 }
468 PyObject *PyErr_SetFromWindowsErrWithFilename( 468 PyObject *PyErr_SetFromWindowsErrWithFilename(
469 int ierr, 469 int ierr,
470 const char *filename) 470 const char *filename)
471 { 471 {
472 PyObject *name = filename ? PyBytes_FromString(filename) : NULL; 472 PyObject *name = filename ? PyString_FromString(filename) : NULL;
473 PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject( 473 PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject(
474 PyExc_WindowsError, 474 PyExc_WindowsError,
475 ierr, name); 475 ierr, name);
476 Py_XDECREF(name); 476 Py_XDECREF(name);
477 return result; 477 return result;
525 va_start(vargs, format); 525 va_start(vargs, format);
526 #else 526 #else
527 va_start(vargs); 527 va_start(vargs);
528 #endif 528 #endif
529 529
530 string = PyBytes_FromFormatV(format, vargs); 530 string = PyString_FromFormatV(format, vargs);
531 PyErr_SetObject(exception, string); 531 PyErr_SetObject(exception, string);
532 Py_XDECREF(string); 532 Py_XDECREF(string);
533 va_end(vargs); 533 va_end(vargs);
534 return NULL; 534 return NULL;
535 } 535 }
557 dict = mydict = PyDict_New(); 557 dict = mydict = PyDict_New();
558 if (dict == NULL) 558 if (dict == NULL)
559 goto failure; 559 goto failure;
560 } 560 }
561 if (PyDict_GetItemString(dict, "__module__") == NULL) { 561 if (PyDict_GetItemString(dict, "__module__") == NULL) {
562 modulename = PyBytes_FromStringAndSize(name, 562 modulename = PyString_FromStringAndSize(name,
563 (Py_ssize_t)(dot-name)); 563 (Py_ssize_t)(dot-name));
564 if (modulename == NULL) 564 if (modulename == NULL)
565 goto failure; 565 goto failure;
566 if (PyDict_SetItemString(dict, "__module__", modulename) != 0) 566 if (PyDict_SetItemString(dict, "__module__", modulename) != 0)
567 goto failure; 567 goto failure;
609 609
610 moduleName = PyObject_GetAttrString(t, "__module__"); 610 moduleName = PyObject_GetAttrString(t, "__module__");
611 if (moduleName == NULL) 611 if (moduleName == NULL)
612 PyFile_WriteString("<unknown>", f); 612 PyFile_WriteString("<unknown>", f);
613 else { 613 else {
614 char* modstr = PyBytes_AsString(moduleName); 614 char* modstr = PyString_AsString(moduleName);
615 if (modstr && 615 if (modstr &&
616 strcmp(modstr, "exceptions") != 0) 616 strcmp(modstr, "exceptions") != 0)
617 { 617 {
618 PyFile_WriteString(modstr, f); 618 PyFile_WriteString(modstr, f);
619 PyFile_WriteString(".", f); 619 PyFile_WriteString(".", f);
663 if (PyObject_SetAttrString(v, "lineno", tmp)) 663 if (PyObject_SetAttrString(v, "lineno", tmp))
664 PyErr_Clear(); 664 PyErr_Clear();
665 Py_DECREF(tmp); 665 Py_DECREF(tmp);
666 } 666 }
667 if (filename != NULL) { 667 if (filename != NULL) {
668 tmp = PyBytes_FromString(filename); 668 tmp = PyString_FromString(filename);
669 if (tmp == NULL) 669 if (tmp == NULL)
670 PyErr_Clear(); 670 PyErr_Clear();
671 else { 671 else {
672 if (PyObject_SetAttrString(v, "filename", tmp)) 672 if (PyObject_SetAttrString(v, "filename", tmp))
673 PyErr_Clear(); 673 PyErr_Clear();
740 fclose(fp); 740 fclose(fp);
741 if (i == lineno) { 741 if (i == lineno) {
742 char *p = linebuf; 742 char *p = linebuf;
743 while (*p == ' ' || *p == '\t' || *p == '\014') 743 while (*p == ' ' || *p == '\t' || *p == '\014')
744 p++; 744 p++;
745 return PyBytes_FromString(p); 745 return PyString_FromString(p);
746 } 746 }
747 return NULL; 747 return NULL;
748 } 748 }
749 749
750 #ifdef __cplusplus 750 #ifdef __cplusplus