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 /lib/talloc | |
| 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 'lib/talloc')
| -rw-r--r-- | lib/talloc/pytalloc.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c index b305b608f47..12c7325fcac 100644 --- a/lib/talloc/pytalloc.c +++ b/lib/talloc/pytalloc.c @@ -24,12 +24,6 @@ static PyTypeObject TallocObject_Type; -#if PY_MAJOR_VERSION >= 3 -#define PyStr_FromFormat PyUnicode_FromFormat -#else -#define PyStr_FromFormat PyString_FromFormat -#endif - /* print a talloc tree report for a talloc python object */ static PyObject *pytalloc_report_full(PyObject *self, PyObject *args) { @@ -87,7 +81,7 @@ static PyObject *pytalloc_default_repr(PyObject *obj) pytalloc_Object *talloc_obj = (pytalloc_Object *)obj; PyTypeObject *type = (PyTypeObject*)PyObject_Type(obj); - return PyStr_FromFormat("<%s talloc object at %p>", + return PyUnicode_FromFormat("<%s talloc object at %p>", type->tp_name, talloc_obj->ptr); } @@ -167,7 +161,7 @@ static PyObject *pytalloc_base_default_repr(PyObject *obj) pytalloc_BaseObject *talloc_obj = (pytalloc_BaseObject *)obj; PyTypeObject *type = (PyTypeObject*)PyObject_Type(obj); - return PyStr_FromFormat("<%s talloc based object at %p>", + return PyUnicode_FromFormat("<%s talloc based object at %p>", type->tp_name, talloc_obj->ptr); } |