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 /source4/param | |
| 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 'source4/param')
| -rw-r--r-- | source4/param/provision.c | 2 | ||||
| -rw-r--r-- | source4/param/pyparam.c | 2 | ||||
| -rw-r--r-- | source4/param/pyparam_util.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/param/provision.c b/source4/param/provision.c index 177fb93f18c..395516dc3ae 100644 --- a/source4/param/provision.c +++ b/source4/param/provision.c @@ -270,7 +270,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, } py_domaindn = PyObject_GetAttrString(py_result, "domaindn"); - result->domaindn = talloc_strdup(mem_ctx, PyStr_AsString(py_domaindn)); + result->domaindn = talloc_strdup(mem_ctx, PyUnicode_AsUTF8(py_domaindn)); /* FIXME paths */ py_lp_ctx = PyObject_GetAttrString(py_result, "lp"); diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c index fc5965e6245..78018fe0769 100644 --- a/source4/param/pyparam.c +++ b/source4/param/pyparam.c @@ -538,7 +538,7 @@ static PyObject *py_lp_ctx_getitem(PyObject *self, PyObject *name) PyErr_SetString(PyExc_TypeError, "Only string subscripts are supported"); return NULL; } - service = lpcfg_service(PyLoadparmContext_AsLoadparmContext(self), PyStr_AsString(name)); + service = lpcfg_service(PyLoadparmContext_AsLoadparmContext(self), PyUnicode_AsUTF8(name)); if (service == NULL) { PyErr_SetString(PyExc_KeyError, "No such section"); return NULL; diff --git a/source4/param/pyparam_util.c b/source4/param/pyparam_util.c index 7bde8c9c714..998d731f49e 100644 --- a/source4/param/pyparam_util.c +++ b/source4/param/pyparam_util.c @@ -39,9 +39,9 @@ _PUBLIC_ struct loadparm_context *lpcfg_from_py_object(TALLOC_CTX *mem_ctx, PyOb if (lp_ctx == NULL) { return NULL; } - if (!lpcfg_load(lp_ctx, PyStr_AsString(py_obj))) { + if (!lpcfg_load(lp_ctx, PyUnicode_AsUTF8(py_obj))) { PyErr_Format(PyExc_RuntimeError, "Unable to load %s", - PyStr_AsString(py_obj)); + PyUnicode_AsUTF8(py_obj)); return NULL; } return lp_ctx; |