Mercurial > cpython-lru_cache-weakref

comparison Python/Python-ast.c @ 47301:23ab586c427a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed PyString to PyBytes
author Christian Heimes <christian@cheimes.de>
date Mon, 26 May 2008 13:28:38 +0000
parents 61c92923cf7f
children 94f64f11fdd0
comparison
equal deleted inserted replaced
47300:96b34263e448 47301:23ab586c427a
607 int i; 607 int i;
608 if (!PyLong_Check(obj)) { 608 if (!PyLong_Check(obj)) {
609 PyObject *s = PyObject_Repr(obj); 609 PyObject *s = PyObject_Repr(obj);
610 if (s == NULL) return 1; 610 if (s == NULL) return 1;
611 PyErr_Format(PyExc_ValueError, "invalid integer value: %.400s", 611 PyErr_Format(PyExc_ValueError, "invalid integer value: %.400s",
612 PyString_AS_STRING(s)); 612 PyBytes_AS_STRING(s));
613 Py_DECREF(s); 613 Py_DECREF(s);
614 return 1; 614 return 1;
615 } 615 }
616 616
617 i = (int)PyLong_AsLong(obj); 617 i = (int)PyLong_AsLong(obj);
3483 return 0; 3483 return 0;
3484 } 3484 }
3485 3485
3486 tmp = PyObject_Repr(obj); 3486 tmp = PyObject_Repr(obj);
3487 if (tmp == NULL) goto failed; 3487 if (tmp == NULL) goto failed;
3488 PyErr_Format(PyExc_TypeError, "expected some sort of mod, but got %.400s", PyString_AS_STRING(tmp)); 3488 PyErr_Format(PyExc_TypeError, "expected some sort of mod, but got %.400s", PyBytes_AS_STRING(tmp));
3489 failed: 3489 failed:
3490 Py_XDECREF(tmp); 3490 Py_XDECREF(tmp);
3491 return 1; 3491 return 1;
3492 } 3492 }
3493 3493
4593 return 0; 4593 return 0;
4594 } 4594 }
4595 4595
4596 tmp = PyObject_Repr(obj); 4596 tmp = PyObject_Repr(obj);
4597 if (tmp == NULL) goto failed; 4597 if (tmp == NULL) goto failed;
4598 PyErr_Format(PyExc_TypeError, "expected some sort of stmt, but got %.400s", PyString_AS_STRING(tmp)); 4598 PyErr_Format(PyExc_TypeError, "expected some sort of stmt, but got %.400s", PyBytes_AS_STRING(tmp));
4599 failed: 4599 failed:
4600 Py_XDECREF(tmp); 4600 Py_XDECREF(tmp);
4601 return 1; 4601 return 1;
4602 } 4602 }
4603 4603
5614 return 0; 5614 return 0;
5615 } 5615 }
5616 5616
5617 tmp = PyObject_Repr(obj); 5617 tmp = PyObject_Repr(obj);
5618 if (tmp == NULL) goto failed; 5618 if (tmp == NULL) goto failed;
5619 PyErr_Format(PyExc_TypeError, "expected some sort of expr, but got %.400s", PyString_AS_STRING(tmp)); 5619 PyErr_Format(PyExc_TypeError, "expected some sort of expr, but got %.400s", PyBytes_AS_STRING(tmp));
5620 failed: 5620 failed:
5621 Py_XDECREF(tmp); 5621 Py_XDECREF(tmp);
5622 return 1; 5622 return 1;
5623 } 5623 }
5624 5624
5652 return 0; 5652 return 0;
5653 } 5653 }
5654 5654
5655 tmp = PyObject_Repr(obj); 5655 tmp = PyObject_Repr(obj);
5656 if (tmp == NULL) goto failed; 5656 if (tmp == NULL) goto failed;
5657 PyErr_Format(PyExc_TypeError, "expected some sort of expr_context, but got %.400s", PyString_AS_STRING(tmp)); 5657 PyErr_Format(PyExc_TypeError, "expected some sort of expr_context, but got %.400s", PyBytes_AS_STRING(tmp));
5658 failed: 5658 failed:
5659 Py_XDECREF(tmp); 5659 Py_XDECREF(tmp);
5660 return 1; 5660 return 1;
5661 } 5661 }
5662 5662
5764 return 0; 5764 return 0;
5765 } 5765 }
5766 5766
5767 tmp = PyObject_Repr(obj); 5767 tmp = PyObject_Repr(obj);
5768 if (tmp == NULL) goto failed; 5768 if (tmp == NULL) goto failed;
5769 PyErr_Format(PyExc_TypeError, "expected some sort of slice, but got %.400s", PyString_AS_STRING(tmp)); 5769 PyErr_Format(PyExc_TypeError, "expected some sort of slice, but got %.400s", PyBytes_AS_STRING(tmp));
5770 failed: 5770 failed:
5771 Py_XDECREF(tmp); 5771 Py_XDECREF(tmp);
5772 return 1; 5772 return 1;
5773 } 5773 }
5774 5774
5786 return 0; 5786 return 0;
5787 } 5787 }
5788 5788
5789 tmp = PyObject_Repr(obj); 5789 tmp = PyObject_Repr(obj);
5790 if (tmp == NULL) goto failed; 5790 if (tmp == NULL) goto failed;
5791 PyErr_Format(PyExc_TypeError, "expected some sort of boolop, but got %.400s", PyString_AS_STRING(tmp)); 5791 PyErr_Format(PyExc_TypeError, "expected some sort of boolop, but got %.400s", PyBytes_AS_STRING(tmp));
5792 failed: 5792 failed:
5793 Py_XDECREF(tmp); 5793 Py_XDECREF(tmp);
5794 return 1; 5794 return 1;
5795 } 5795 }
5796 5796
5848 return 0; 5848 return 0;
5849 } 5849 }
5850 5850
5851 tmp = PyObject_Repr(obj); 5851 tmp = PyObject_Repr(obj);
5852 if (tmp == NULL) goto failed; 5852 if (tmp == NULL) goto failed;
5853 PyErr_Format(PyExc_TypeError, "expected some sort of operator, but got %.400s", PyString_AS_STRING(tmp)); 5853 PyErr_Format(PyExc_TypeError, "expected some sort of operator, but got %.400s", PyBytes_AS_STRING(tmp));
5854 failed: 5854 failed:
5855 Py_XDECREF(tmp); 5855 Py_XDECREF(tmp);
5856 return 1; 5856 return 1;
5857 } 5857 }
5858 5858
5878 return 0; 5878 return 0;
5879 } 5879 }
5880 5880
5881 tmp = PyObject_Repr(obj); 5881 tmp = PyObject_Repr(obj);
5882 if (tmp == NULL) goto failed; 5882 if (tmp == NULL) goto failed;
5883 PyErr_Format(PyExc_TypeError, "expected some sort of unaryop, but got %.400s", PyString_AS_STRING(tmp)); 5883 PyErr_Format(PyExc_TypeError, "expected some sort of unaryop, but got %.400s", PyBytes_AS_STRING(tmp));
5884 failed: 5884 failed:
5885 Py_XDECREF(tmp); 5885 Py_XDECREF(tmp);
5886 return 1; 5886 return 1;
5887 } 5887 }
5888 5888
5932 return 0; 5932 return 0;
5933 } 5933 }
5934 5934
5935 tmp = PyObject_Repr(obj); 5935 tmp = PyObject_Repr(obj);
5936 if (tmp == NULL) goto failed; 5936 if (tmp == NULL) goto failed;
5937 PyErr_Format(PyExc_TypeError, "expected some sort of cmpop, but got %.400s", PyString_AS_STRING(tmp)); 5937 PyErr_Format(PyExc_TypeError, "expected some sort of cmpop, but got %.400s", PyBytes_AS_STRING(tmp));
5938 failed: 5938 failed:
5939 Py_XDECREF(tmp); 5939 Py_XDECREF(tmp);
5940 return 1; 5940 return 1;
5941 } 5941 }
5942 5942
6098 return 0; 6098 return 0;
6099 } 6099 }
6100 6100
6101 tmp = PyObject_Repr(obj); 6101 tmp = PyObject_Repr(obj);
6102 if (tmp == NULL) goto failed; 6102 if (tmp == NULL) goto failed;
6103 PyErr_Format(PyExc_TypeError, "expected some sort of excepthandler, but got %.400s", PyString_AS_STRING(tmp)); 6103 PyErr_Format(PyExc_TypeError, "expected some sort of excepthandler, but got %.400s", PyBytes_AS_STRING(tmp));
6104 failed: 6104 failed:
6105 Py_XDECREF(tmp); 6105 Py_XDECREF(tmp);
6106 return 1; 6106 return 1;
6107 } 6107 }
6108 6108