diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-28 20:17:19 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-28 20:17:19 (GMT) |
| commit | ff9e50fd047399873059328d992db0bfe32bfe10 (patch) | |
| tree | e639a528f0ff5b37ca31393af3605660d59afe93 | |
| parent | 17222160e7957935c00b5cf845888493b6350b58 (diff) | |
| download | cpython-ff9e50fd047399873059328d992db0bfe32bfe10.zip cpython-ff9e50fd047399873059328d992db0bfe32bfe10.tar.gz cpython-ff9e50fd047399873059328d992db0bfe32bfe10.tar.bz2 | |
Oops, fix Py_MIN/Py_MAX case
| -rw-r--r-- | Objects/unicodeobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 69f0b8f..b53c210 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -622,7 +622,7 @@ PyUnicode_CopyCharacters(PyObject *to, Py_ssize_t to_start, if (PyUnicode_READY(to)) return -1; - how_many = PY_MIN(PyUnicode_GET_LENGTH(from), how_many); + how_many = Py_MIN(PyUnicode_GET_LENGTH(from), how_many); if (to_start + how_many > PyUnicode_GET_LENGTH(to)) { PyErr_Format(PyExc_ValueError, "Cannot write %zi characters at %zi " @@ -9472,7 +9472,7 @@ PyUnicode_Concat(PyObject *left, PyObject *right) goto onError; maxchar = PyUnicode_MAX_CHAR_VALUE(u); - maxchar = PY_MAX(maxchar, PyUnicode_MAX_CHAR_VALUE(v)); + maxchar = Py_MAX(maxchar, PyUnicode_MAX_CHAR_VALUE(v)); /* Concat the two Unicode strings */ w = PyUnicode_New( |