diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-06-07 10:45:52 +0200 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2019-06-24 17:24:27 +0000 |
| commit | 34f9a089d8d3a8971b2f7ee45f6d8e823a52a193 (patch) | |
| tree | e82a39e5c36f4c9fc1ec7074f82ead6d9221315a /libcli | |
| parent | f498c819664e9df658651d39f616f5b4d62b4750 (diff) | |
| download | samba-34f9a089d8d3a8971b2f7ee45f6d8e823a52a193.tar.gz | |
py3: Remove PyStr_FromString() compatability macro
We no longer need Samba to be py2/py3 compatible so we choose to return to the standard
function names.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/nbt/pynbt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c index 4134c4344a6..bcc98b78722 100644 --- a/libcli/nbt/pynbt.c +++ b/libcli/nbt/pynbt.c @@ -190,7 +190,7 @@ static PyObject *py_nbt_name_query(PyObject *self, PyObject *args, PyObject *kwa ret = PyTuple_New(3); if (ret == NULL) return NULL; - PyTuple_SetItem(ret, 0, PyStr_FromString(io.out.reply_from)); + PyTuple_SetItem(ret, 0, PyUnicode_FromString(io.out.reply_from)); py_name = PyObject_FromNBTName(node->socket, &io.out.name); if (py_name == NULL) @@ -205,7 +205,7 @@ static PyObject *py_nbt_name_query(PyObject *self, PyObject *args, PyObject *kwa } for (i = 0; i < io.out.num_addrs; i++) { - PyList_SetItem(reply_addrs, i, PyStr_FromString(io.out.reply_addrs[i])); + PyList_SetItem(reply_addrs, i, PyUnicode_FromString(io.out.reply_addrs[i])); } PyTuple_SetItem(ret, 2, reply_addrs); @@ -248,7 +248,7 @@ static PyObject *py_nbt_name_status(PyObject *self, PyObject *args, PyObject *kw ret = PyTuple_New(3); if (ret == NULL) return NULL; - PyTuple_SetItem(ret, 0, PyStr_FromString(io.out.reply_from)); + PyTuple_SetItem(ret, 0, PyUnicode_FromString(io.out.reply_from)); py_name = PyObject_FromNBTName(node->socket, &io.out.name); if (py_name == NULL) @@ -312,7 +312,7 @@ static PyObject *py_nbt_name_register(PyObject *self, PyObject *args, PyObject * ret = PyTuple_New(4); if (ret == NULL) return NULL; - PyTuple_SetItem(ret, 0, PyStr_FromString(io.out.reply_from)); + PyTuple_SetItem(ret, 0, PyUnicode_FromString(io.out.reply_from)); py_name = PyObject_FromNBTName(node->socket, &io.out.name); if (py_name == NULL) @@ -320,7 +320,7 @@ static PyObject *py_nbt_name_register(PyObject *self, PyObject *args, PyObject * PyTuple_SetItem(ret, 1, py_name); - PyTuple_SetItem(ret, 2, PyStr_FromString(io.out.reply_addr)); + PyTuple_SetItem(ret, 2, PyUnicode_FromString(io.out.reply_addr)); PyTuple_SetItem(ret, 3, PyInt_FromLong(io.out.rcode)); @@ -368,7 +368,7 @@ static PyObject *py_nbt_name_refresh(PyObject *self, PyObject *args, PyObject *k ret = PyTuple_New(3); if (ret == NULL) return NULL; - PyTuple_SetItem(ret, 0, PyStr_FromString(io.out.reply_from)); + PyTuple_SetItem(ret, 0, PyUnicode_FromString(io.out.reply_from)); py_name = PyObject_FromNBTName(node->socket, &io.out.name); if (py_name == NULL) @@ -376,7 +376,7 @@ static PyObject *py_nbt_name_refresh(PyObject *self, PyObject *args, PyObject *k PyTuple_SetItem(ret, 1, py_name); - PyTuple_SetItem(ret, 2, PyStr_FromString(io.out.reply_addr)); + PyTuple_SetItem(ret, 2, PyUnicode_FromString(io.out.reply_addr)); PyTuple_SetItem(ret, 3, PyInt_FromLong(io.out.rcode)); |