diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-06-07 11:16:25 +0200 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2019-06-24 17:24:27 +0000 |
| commit | f178daa854dc4ea9cb917d17cd4c8a876356e981 (patch) | |
| tree | 767708ea1d3e843f0ebf50822bfb63f634957b33 /libcli | |
| parent | d9d9463fd3c7eda14a3170e214d6a56c9efbbcec (diff) | |
| download | samba-f178daa854dc4ea9cb917d17cd4c8a876356e981.tar.gz | |
py3: Remove PyStr_AsString() 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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c index bcc98b78722..c440ec933c4 100644 --- a/libcli/nbt/pynbt.c +++ b/libcli/nbt/pynbt.c @@ -58,7 +58,7 @@ static PyObject *py_nbt_node_init(PyTypeObject *self, PyObject *args, PyObject * static bool PyObject_AsDestinationTuple(PyObject *obj, const char **dest_addr, uint16_t *dest_port) { if (PyUnicode_Check(obj) || PyUnicode_Check(obj)) { - *dest_addr = PyStr_AsString(obj); + *dest_addr = PyUnicode_AsUTF8(obj); *dest_port = NBT_NAME_SERVICE_PORT; return true; } @@ -74,7 +74,7 @@ static bool PyObject_AsDestinationTuple(PyObject *obj, const char **dest_addr, u return false; } - *dest_addr = PyStr_AsString(obj); + *dest_addr = PyUnicode_AsUTF8(obj); if (PyTuple_Size(obj) == 1) { *dest_port = NBT_NAME_SERVICE_PORT; @@ -96,7 +96,7 @@ static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *name_socke { if (PyTuple_Check(obj)) { if (PyTuple_Size(obj) == 2) { - name->name = PyStr_AsString(PyTuple_GetItem(obj, 0)); + name->name = PyUnicode_AsUTF8(PyTuple_GetItem(obj, 0)); if (name->name == NULL) { goto err; } @@ -107,11 +107,11 @@ static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *name_socke name->scope = NULL; return true; } else if (PyTuple_Size(obj) == 3) { - name->name = PyStr_AsString(PyTuple_GetItem(obj, 0)); + name->name = PyUnicode_AsUTF8(PyTuple_GetItem(obj, 0)); if (name->name == NULL) { goto err; } - name->scope = PyStr_AsString(PyTuple_GetItem(obj, 1)); + name->scope = PyUnicode_AsUTF8(PyTuple_GetItem(obj, 1)); if (name->scope == NULL) { goto err; } @@ -128,7 +128,7 @@ static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *name_socke if (PyUnicode_Check(obj) || PyUnicode_Check(obj)) { /* FIXME: Parse string to be able to interpret things like RHONWYN<02> ? */ - name->name = PyStr_AsString(obj); + name->name = PyUnicode_AsUTF8(obj); if (name->name == NULL) { goto err; } |