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/tdb | |
| 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/tdb')
| -rw-r--r-- | lib/tdb/pytdb.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c index ce671a92b9a..74e80f95ec5 100644 --- a/lib/tdb/pytdb.c +++ b/lib/tdb/pytdb.c @@ -32,13 +32,10 @@ #include <tdb.h> #if PY_MAJOR_VERSION >= 3 -#define PyStr_FromFormat PyUnicode_FromFormat #define PyInt_FromLong PyLong_FromLong #define PyInt_Check PyLong_Check #define PyInt_AsLong PyLong_AsLong #define Py_TPFLAGS_HAVE_ITER 0 -#else -#define PyStr_FromFormat PyString_FromFormat #endif /* discard signature of 'func' in favour of 'target_sig' */ @@ -654,7 +651,7 @@ static PyObject *tdb_object_repr(PyTdbObject *self) if (tdb_get_flags(self->ctx) & TDB_INTERNAL) { return PyUnicode_FromString("Tdb(<internal>)"); } else { - return PyStr_FromFormat("Tdb('%s')", tdb_name(self->ctx)); + return PyUnicode_FromFormat("Tdb('%s')", tdb_name(self->ctx)); } } |