diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-11-20 09:13:40 +0200 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-11-20 09:13:40 +0200 |
| commit | a98c4a984b34f887076f4171b1e3303e164cbddf (patch) | |
| tree | 78f6f0fbbc6728e24d5478aadb7bfe1d871b244f /Objects/moduleobject.c | |
| parent | f6f15918087f2fae652634303a79f9cc6bc421ce (diff) | |
| parent | 06515833fef7b8b5c7968edf72367d94ff7eb1e0 (diff) | |
| download | cpython-git-a98c4a984b34f887076f4171b1e3303e164cbddf.tar.gz | |
Replaced outdated macros _PyUnicode_AsString and _PyUnicode_AsStringAndSize
with PyUnicode_AsUTF8 and PyUnicode_AsUTF8AndSize.
Diffstat (limited to 'Objects/moduleobject.c')
| -rw-r--r-- | Objects/moduleobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index b6a2d6fe9c..79be51a806 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -483,7 +483,7 @@ PyModule_GetName(PyObject *m) if (name == NULL) return NULL; Py_DECREF(name); /* module dict has still a reference */ - return _PyUnicode_AsString(name); + return PyUnicode_AsUTF8(name); } PyObject* @@ -516,7 +516,7 @@ PyModule_GetFilename(PyObject *m) fileobj = PyModule_GetFilenameObject(m); if (fileobj == NULL) return NULL; - utf8 = _PyUnicode_AsString(fileobj); + utf8 = PyUnicode_AsUTF8(fileobj); Py_DECREF(fileobj); /* module dict has still a reference */ return utf8; } @@ -569,7 +569,7 @@ _PyModule_ClearDict(PyObject *d) if (PyUnicode_READ_CHAR(key, 0) == '_' && PyUnicode_READ_CHAR(key, 1) != '_') { if (Py_VerboseFlag > 1) { - const char *s = _PyUnicode_AsString(key); + const char *s = PyUnicode_AsUTF8(key); if (s != NULL) PySys_WriteStderr("# clear[1] %s\n", s); else @@ -589,7 +589,7 @@ _PyModule_ClearDict(PyObject *d) !_PyUnicode_EqualToASCIIString(key, "__builtins__")) { if (Py_VerboseFlag > 1) { - const char *s = _PyUnicode_AsString(key); + const char *s = PyUnicode_AsUTF8(key); if (s != NULL) PySys_WriteStderr("# clear[2] %s\n", s); else |