diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-06-07 11:08:55 +0200 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2019-06-24 17:24:27 +0000 |
| commit | 75d87b29f11a1dacb37ccc1b10f8d034063ef5ba (patch) | |
| tree | 36d0c1dd0964908ba82351e5ca0e6163a9208672 /source4/librpc | |
| parent | 3fa00d435045e6faeb92f5379684f118b131c92c (diff) | |
| download | samba-75d87b29f11a1dacb37ccc1b10f8d034063ef5ba.tar.gz | |
py3: Remove PyStr_FromFormat() 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/librpc')
| -rw-r--r-- | source4/librpc/ndr/py_lsa.c | 2 | ||||
| -rw-r--r-- | source4/librpc/ndr/py_misc.c | 6 | ||||
| -rw-r--r-- | source4/librpc/ndr/py_security.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source4/librpc/ndr/py_lsa.c b/source4/librpc/ndr/py_lsa.c index fe01de36fea..a59dcbf970c 100644 --- a/source4/librpc/ndr/py_lsa.c +++ b/source4/librpc/ndr/py_lsa.c @@ -41,7 +41,7 @@ static PyObject *py_lsa_String_repr(PyObject *py_self) const char *empty = "lsaString(None)"; ret = PyUnicode_FromString(empty); } else { - ret = PyStr_FromFormat("lsaString('%s')", self->string); + ret = PyUnicode_FromFormat("lsaString('%s')", self->string); } return ret; } diff --git a/source4/librpc/ndr/py_misc.c b/source4/librpc/ndr/py_misc.c index 5e6af484f26..d3c91a46d6b 100644 --- a/source4/librpc/ndr/py_misc.c +++ b/source4/librpc/ndr/py_misc.c @@ -78,7 +78,7 @@ static PyObject *py_GUID_repr(PyObject *py_self) { struct GUID *self = pytalloc_get_ptr(py_self); char *str = GUID_string(NULL, self); - PyObject *ret = PyStr_FromFormat("GUID('%s')", str); + PyObject *ret = PyUnicode_FromFormat("GUID('%s')", str); talloc_free(str); return ret; } @@ -162,7 +162,7 @@ static PyObject *py_policy_handle_repr(PyObject *py_self) { struct policy_handle *self = pytalloc_get_ptr(py_self); char *uuid_str = GUID_string(NULL, &self->uuid); - PyObject *ret = PyStr_FromFormat("policy_handle(%d, '%s')", self->handle_type, uuid_str); + PyObject *ret = PyUnicode_FromFormat("policy_handle(%d, '%s')", self->handle_type, uuid_str); talloc_free(uuid_str); return ret; } @@ -171,7 +171,7 @@ static PyObject *py_policy_handle_str(PyObject *py_self) { struct policy_handle *self = pytalloc_get_ptr(py_self); char *uuid_str = GUID_string(NULL, &self->uuid); - PyObject *ret = PyStr_FromFormat("%d, %s", self->handle_type, uuid_str); + PyObject *ret = PyUnicode_FromFormat("%d, %s", self->handle_type, uuid_str); talloc_free(uuid_str); return ret; } diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c index b9dd29310e6..b8d7c877694 100644 --- a/source4/librpc/ndr/py_security.c +++ b/source4/librpc/ndr/py_security.c @@ -124,7 +124,7 @@ static PyObject *py_dom_sid_repr(PyObject *py_self) { struct dom_sid *self = pytalloc_get_ptr(py_self); struct dom_sid_buf buf; - PyObject *ret = PyStr_FromFormat( + PyObject *ret = PyUnicode_FromFormat( "dom_sid('%s')", dom_sid_str_buf(self, &buf)); return ret; } |