diff options
| author | Georg Brandl <georg@python.org> | 2011-09-28 19:49:49 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-09-28 19:49:49 (GMT) |
| commit | 4cb0de246cacc2c4259f7b05529abbcf7ba8e2ff (patch) | |
| tree | 35049b7aa75b2295b38e0150ecbe509b12c1830f /Modules/zipimport.c | |
| parent | 5ce1b0dbc0fbad355086882ebb54f1aebc6b7163 (diff) | |
| download | cpython-4cb0de246cacc2c4259f7b05529abbcf7ba8e2ff.zip cpython-4cb0de246cacc2c4259f7b05529abbcf7ba8e2ff.tar.gz cpython-4cb0de246cacc2c4259f7b05529abbcf7ba8e2ff.tar.bz2 | |
Rename new macros to conform to naming rules (function macros have "Py" prefix, not "PY").
Diffstat (limited to 'Modules/zipimport.c')
| -rw-r--r-- | Modules/zipimport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/zipimport.c b/Modules/zipimport.c index 6bf8359..2293e66 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -88,7 +88,7 @@ zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds) "archive path too long"); goto error; } - if (!PyUnicode_AsUCS4(pathobj, buf, PY_ARRAY_LENGTH(buf), 1)) + if (!PyUnicode_AsUCS4(pathobj, buf, Py_ARRAY_LENGTH(buf), 1)) goto error; #ifdef ALTSEP @@ -473,7 +473,7 @@ zipimporter_get_data(PyObject *obj, PyObject *args) PyErr_SetString(ZipImportError, "path too long"); return NULL; } - if (!PyUnicode_AsUCS4(pathobj, buf, PY_ARRAY_LENGTH(buf), 1)) + if (!PyUnicode_AsUCS4(pathobj, buf, Py_ARRAY_LENGTH(buf), 1)) return NULL; path = buf; #ifdef ALTSEP @@ -484,7 +484,7 @@ zipimporter_get_data(PyObject *obj, PyObject *args) #endif len = PyUnicode_GET_LENGTH(self->archive); if ((size_t)len < Py_UCS4_strlen(path)) { - if (!PyUnicode_AsUCS4(self->archive, archive, PY_ARRAY_LENGTH(archive), 1)) + if (!PyUnicode_AsUCS4(self->archive, archive, Py_ARRAY_LENGTH(archive), 1)) return NULL; if (Py_UCS4_strncmp(path, archive, len) == 0 && path[len] == SEP) { @@ -771,7 +771,7 @@ read_directory(PyObject *archive) "Zip path name is too long"); return NULL; } - if (!PyUnicode_AsUCS4(archive, path, PY_ARRAY_LENGTH(path), 1)) + if (!PyUnicode_AsUCS4(archive, path, Py_ARRAY_LENGTH(path), 1)) return NULL; fp = _Py_fopen(archive, "rb"); |