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 /libgpo/pygpo.c | |
| 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 'libgpo/pygpo.c')
| -rw-r--r-- | libgpo/pygpo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c index 35d35d69cbe..b1f788d3a00 100644 --- a/libgpo/pygpo.c +++ b/libgpo/pygpo.c @@ -39,7 +39,7 @@ static PyObject* GPO_get_##ATTR(PyObject *self, void *closure) \ = pytalloc_get_ptr(self); \ \ if (gpo_ptr->ATTR) \ - return PyStr_FromString(gpo_ptr->ATTR); \ + return PyUnicode_FromString(gpo_ptr->ATTR); \ else \ return Py_None; \ } @@ -108,7 +108,7 @@ static PyObject *py_gpo_get_unix_path(PyObject *self, PyObject *args, goto out; } - ret = PyStr_FromString(unix_path); + ret = PyUnicode_FromString(unix_path); out: TALLOC_FREE(frame); @@ -537,7 +537,7 @@ MODULE_INIT_FUNC(gpo) } if (PyModule_AddObject(m, "version", - PyStr_FromString(SAMBA_VERSION_STRING)) ) { + PyUnicode_FromString(SAMBA_VERSION_STRING)) ) { goto err; } |