Mercurial > cpython-lru_cache-weakref

comparison Python/Python-ast.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 145449109a31
comparison
equal deleted inserted replaced
47526:246a802637ad 47527:52294af4b663
493 PyObject *fnames, *result; 493 PyObject *fnames, *result;
494 int i; 494 int i;
495 fnames = PyTuple_New(num_fields); 495 fnames = PyTuple_New(num_fields);
496 if (!fnames) return NULL; 496 if (!fnames) return NULL;
497 for (i = 0; i < num_fields; i++) { 497 for (i = 0; i < num_fields; i++) {
498 PyObject *field = PyBytes_FromString(fields[i]); 498 PyObject *field = PyString_FromString(fields[i]);
499 if (!field) { 499 if (!field) {
500 Py_DECREF(fnames); 500 Py_DECREF(fnames);
501 return NULL; 501 return NULL;
502 } 502 }
503 PyTuple_SET_ITEM(fnames, i, field); 503 PyTuple_SET_ITEM(fnames, i, field);
512 { 512 {
513 int i, result; 513 int i, result;
514 PyObject *s, *l = PyTuple_New(num_fields); 514 PyObject *s, *l = PyTuple_New(num_fields);
515 if (!l) return 0; 515 if (!l) return 0;
516 for(i = 0; i < num_fields; i++) { 516 for(i = 0; i < num_fields; i++) {
517 s = PyBytes_FromString(attrs[i]); 517 s = PyString_FromString(attrs[i]);
518 if (!s) { 518 if (!s) {
519 Py_DECREF(l); 519 Py_DECREF(l);
520 return 0; 520 return 0;
521 } 521 }
522 PyTuple_SET_ITEM(l, i, s); 522 PyTuple_SET_ITEM(l, i, s);
586 int i; 586 int i;
587 if (!PyInt_Check(obj) && !PyLong_Check(obj)) { 587 if (!PyInt_Check(obj) && !PyLong_Check(obj)) {
588 PyObject *s = PyObject_Repr(obj); 588 PyObject *s = PyObject_Repr(obj);
589 if (s == NULL) return 1; 589 if (s == NULL) return 1;
590 PyErr_Format(PyExc_ValueError, "invalid integer value: %.400s", 590 PyErr_Format(PyExc_ValueError, "invalid integer value: %.400s",
591 PyBytes_AS_STRING(s)); 591 PyString_AS_STRING(s));
592 Py_DECREF(s); 592 Py_DECREF(s);
593 return 1; 593 return 1;
594 } 594 }
595 595
596 i = (int)PyLong_AsLong(obj); 596 i = (int)PyLong_AsLong(obj);
604 { 604 {
605 if (!PyBool_Check(obj)) { 605 if (!PyBool_Check(obj)) {
606 PyObject *s = PyObject_Repr(obj); 606 PyObject *s = PyObject_Repr(obj);
607 if (s == NULL) return 1; 607 if (s == NULL) return 1;
608 PyErr_Format(PyExc_ValueError, "invalid boolean value: %.400s", 608 PyErr_Format(PyExc_ValueError, "invalid boolean value: %.400s",
609 PyBytes_AS_STRING(s)); 609 PyString_AS_STRING(s));
610 Py_DECREF(s); 610 Py_DECREF(s);
611 return 1; 611 return 1;
612 } 612 }
613 613
614 *out = (obj == Py_True); 614 *out = (obj == Py_True);
3284 return 0; 3284 return 0;
3285 } 3285 }
3286 3286
3287 tmp = PyObject_Repr(obj); 3287 tmp = PyObject_Repr(obj);
3288 if (tmp == NULL) goto failed; 3288 if (tmp == NULL) goto failed;
3289 PyErr_Format(PyExc_TypeError, "expected some sort of mod, but got %.400s", PyBytes_AS_STRING(tmp)); 3289 PyErr_Format(PyExc_TypeError, "expected some sort of mod, but got %.400s", PyString_AS_STRING(tmp));
3290 failed: 3290 failed:
3291 Py_XDECREF(tmp); 3291 Py_XDECREF(tmp);
3292 return 1; 3292 return 1;
3293 } 3293 }
3294 3294
4412 return 0; 4412 return 0;
4413 } 4413 }
4414 4414
4415 tmp = PyObject_Repr(obj); 4415 tmp = PyObject_Repr(obj);
4416 if (tmp == NULL) goto failed; 4416 if (tmp == NULL) goto failed;
4417 PyErr_Format(PyExc_TypeError, "expected some sort of stmt, but got %.400s", PyBytes_AS_STRING(tmp)); 4417 PyErr_Format(PyExc_TypeError, "expected some sort of stmt, but got %.400s", PyString_AS_STRING(tmp));
4418 failed: 4418 failed:
4419 Py_XDECREF(tmp); 4419 Py_XDECREF(tmp);
4420 return 1; 4420 return 1;
4421 } 4421 }
4422 4422
5259 return 0; 5259 return 0;
5260 } 5260 }
5261 5261
5262 tmp = PyObject_Repr(obj); 5262 tmp = PyObject_Repr(obj);
5263 if (tmp == NULL) goto failed; 5263 if (tmp == NULL) goto failed;
5264 PyErr_Format(PyExc_TypeError, "expected some sort of expr, but got %.400s", PyBytes_AS_STRING(tmp)); 5264 PyErr_Format(PyExc_TypeError, "expected some sort of expr, but got %.400s", PyString_AS_STRING(tmp));
5265 failed: 5265 failed:
5266 Py_XDECREF(tmp); 5266 Py_XDECREF(tmp);
5267 return 1; 5267 return 1;
5268 } 5268 }
5269 5269
5297 return 0; 5297 return 0;
5298 } 5298 }
5299 5299
5300 tmp = PyObject_Repr(obj); 5300 tmp = PyObject_Repr(obj);
5301 if (tmp == NULL) goto failed; 5301 if (tmp == NULL) goto failed;
5302 PyErr_Format(PyExc_TypeError, "expected some sort of expr_context, but got %.400s", PyBytes_AS_STRING(tmp)); 5302 PyErr_Format(PyExc_TypeError, "expected some sort of expr_context, but got %.400s", PyString_AS_STRING(tmp));
5303 failed: 5303 failed:
5304 Py_XDECREF(tmp); 5304 Py_XDECREF(tmp);
5305 return 1; 5305 return 1;
5306 } 5306 }
5307 5307
5415 return 0; 5415 return 0;
5416 } 5416 }
5417 5417
5418 tmp = PyObject_Repr(obj); 5418 tmp = PyObject_Repr(obj);
5419 if (tmp == NULL) goto failed; 5419 if (tmp == NULL) goto failed;
5420 PyErr_Format(PyExc_TypeError, "expected some sort of slice, but got %.400s", PyBytes_AS_STRING(tmp)); 5420 PyErr_Format(PyExc_TypeError, "expected some sort of slice, but got %.400s", PyString_AS_STRING(tmp));
5421 failed: 5421 failed:
5422 Py_XDECREF(tmp); 5422 Py_XDECREF(tmp);
5423 return 1; 5423 return 1;
5424 } 5424 }
5425 5425
5437 return 0; 5437 return 0;
5438 } 5438 }
5439 5439
5440 tmp = PyObject_Repr(obj); 5440 tmp = PyObject_Repr(obj);
5441 if (tmp == NULL) goto failed; 5441 if (tmp == NULL) goto failed;
5442 PyErr_Format(PyExc_TypeError, "expected some sort of boolop, but got %.400s", PyBytes_AS_STRING(tmp)); 5442 PyErr_Format(PyExc_TypeError, "expected some sort of boolop, but got %.400s", PyString_AS_STRING(tmp));
5443 failed: 5443 failed:
5444 Py_XDECREF(tmp); 5444 Py_XDECREF(tmp);
5445 return 1; 5445 return 1;
5446 } 5446 }
5447 5447
5499 return 0; 5499 return 0;
5500 } 5500 }
5501 5501
5502 tmp = PyObject_Repr(obj); 5502 tmp = PyObject_Repr(obj);
5503 if (tmp == NULL) goto failed; 5503 if (tmp == NULL) goto failed;
5504 PyErr_Format(PyExc_TypeError, "expected some sort of operator, but got %.400s", PyBytes_AS_STRING(tmp)); 5504 PyErr_Format(PyExc_TypeError, "expected some sort of operator, but got %.400s", PyString_AS_STRING(tmp));
5505 failed: 5505 failed:
5506 Py_XDECREF(tmp); 5506 Py_XDECREF(tmp);
5507 return 1; 5507 return 1;
5508 } 5508 }
5509 5509
5529 return 0; 5529 return 0;
5530 } 5530 }
5531 5531
5532 tmp = PyObject_Repr(obj); 5532 tmp = PyObject_Repr(obj);
5533 if (tmp == NULL) goto failed; 5533 if (tmp == NULL) goto failed;
5534 PyErr_Format(PyExc_TypeError, "expected some sort of unaryop, but got %.400s", PyBytes_AS_STRING(tmp)); 5534 PyErr_Format(PyExc_TypeError, "expected some sort of unaryop, but got %.400s", PyString_AS_STRING(tmp));
5535 failed: 5535 failed:
5536 Py_XDECREF(tmp); 5536 Py_XDECREF(tmp);
5537 return 1; 5537 return 1;
5538 } 5538 }
5539 5539
5583 return 0; 5583 return 0;
5584 } 5584 }
5585 5585
5586 tmp = PyObject_Repr(obj); 5586 tmp = PyObject_Repr(obj);
5587 if (tmp == NULL) goto failed; 5587 if (tmp == NULL) goto failed;
5588 PyErr_Format(PyExc_TypeError, "expected some sort of cmpop, but got %.400s", PyBytes_AS_STRING(tmp)); 5588 PyErr_Format(PyExc_TypeError, "expected some sort of cmpop, but got %.400s", PyString_AS_STRING(tmp));
5589 failed: 5589 failed:
5590 Py_XDECREF(tmp); 5590 Py_XDECREF(tmp);
5591 return 1; 5591 return 1;
5592 } 5592 }
5593 5593
5749 return 0; 5749 return 0;
5750 } 5750 }
5751 5751
5752 tmp = PyObject_Repr(obj); 5752 tmp = PyObject_Repr(obj);
5753 if (tmp == NULL) goto failed; 5753 if (tmp == NULL) goto failed;
5754 PyErr_Format(PyExc_TypeError, "expected some sort of excepthandler, but got %.400s", PyBytes_AS_STRING(tmp)); 5754 PyErr_Format(PyExc_TypeError, "expected some sort of excepthandler, but got %.400s", PyString_AS_STRING(tmp));
5755 failed: 5755 failed:
5756 Py_XDECREF(tmp); 5756 Py_XDECREF(tmp);
5757 return 1; 5757 return 1;
5758 } 5758 }
5759 5759