sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

py3: Remove PyStr_Check() compatability macro

Browse Source 
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>
This commit is contained in:
Andrew Bartlett
2019-06-07 10:39:11 +02:00
committed by Noel Power
parent 559dd2d25a
commit f498c81966
9 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ldb/pyldb.c
View File

@ -85,7 +85,6 @@ static struct ldb_message_element *PyObject_AsMessageElement(
static PyTypeObject PyLdbBytesType;
#if PY_MAJOR_VERSION >= 3
#define PyStr_Check PyUnicode_Check
#define PyStr_FromString PyUnicode_FromString
#define PyStr_FromStringAndSize PyUnicode_FromStringAndSize
#define PyStr_FromFormat PyUnicode_FromFormat
@ -106,7 +105,6 @@ static PyObject *PyLdbBytes_FromStringAndSize(const char *msg, int size)
return result;
}
#else
#define PyStr_Check PyString_Check
#define PyStr_FromString PyString_FromString
#define PyStr_FromStringAndSize PyString_FromStringAndSize
#define PyStr_FromFormat PyString_FromFormat
@ -1157,7 +1155,7 @@ static const char **PyList_AsStrList(TALLOC_CTX *mem_ctx, PyObject *list,
const char *str = NULL;
Py_ssize_t size;
PyObject *item = PyList_GetItem(list, i);
if (!(PyStr_Check(item) || PyUnicode_Check(item))) {
if (!(PyUnicode_Check(item) || PyUnicode_Check(item))) {
PyErr_Format(PyExc_TypeError, "%s should be strings", paramname);
talloc_free(ret);
return NULL;

4
lib/ldb/pyldb_util.c
View File

@ -30,10 +30,8 @@
static PyObject *ldb_module = NULL;
#if PY_MAJOR_VERSION >= 3
#define PyStr_Check PyUnicode_Check
#define PyStr_AsUTF8 PyUnicode_AsUTF8
#else
#define PyStr_Check PyString_Check
#define PyStr_AsUTF8 PyString_AsString
#endif
@ -70,7 +68,7 @@ bool pyldb_Object_AsDn(TALLOC_CTX *mem_ctx, PyObject *object,
struct ldb_dn *odn;
PyTypeObject *PyLdb_Dn_Type;
if (ldb_ctx != NULL && (PyStr_Check(object) || PyUnicode_Check(object))) {
if (ldb_ctx != NULL && (PyUnicode_Check(object) || PyUnicode_Check(object))) {
odn = ldb_dn_new(mem_ctx, ldb_ctx, PyStr_AsUTF8(object));
*dn = odn;
return true;

4
lib/tevent/pytevent.c
View File

@ -27,12 +27,10 @@
#include <tevent.h>
#if PY_MAJOR_VERSION >= 3
#define PyStr_Check PyUnicode_Check
#define PyStr_FromString PyUnicode_FromString
#define PyStr_AsUTF8 PyUnicode_AsUTF8
#define PyInt_FromLong PyLong_FromLong
#else
#define PyStr_Check PyString_Check
#define PyStr_FromString PyString_FromString
#define PyStr_AsUTF8 PyString_AsString
#endif
@ -191,7 +189,7 @@ static PyObject *py_register_backend(PyObject *self, PyObject *args)
return NULL;
}
if (!(PyStr_Check(name) || PyUnicode_Check(name))) {
if (!(PyUnicode_Check(name) || PyUnicode_Check(name))) {
PyErr_SetNone(PyExc_TypeError);
Py_DECREF(name);
return NULL;

6
libcli/nbt/pynbt.c
View File

@ -57,7 +57,7 @@ static PyObject *py_nbt_node_init(PyTypeObject *self, PyObject *args, PyObject *
static bool PyObject_AsDestinationTuple(PyObject *obj, const char **dest_addr, uint16_t *dest_port)
{
if (PyStr_Check(obj) || PyUnicode_Check(obj)) {
if (PyUnicode_Check(obj) || PyUnicode_Check(obj)) {
*dest_addr = PyStr_AsString(obj);
*dest_port = NBT_NAME_SERVICE_PORT;
return true;
@ -69,7 +69,7 @@ static bool PyObject_AsDestinationTuple(PyObject *obj, const char **dest_addr, u
return false;
}
if (!(PyStr_Check(PyTuple_GetItem(obj, 0)) || PyUnicode_Check(PyTuple_GetItem(obj, 0)))) {
if (!(PyUnicode_Check(PyTuple_GetItem(obj, 0)) || PyUnicode_Check(PyTuple_GetItem(obj, 0)))) {
PyErr_SetString(PyExc_TypeError, "Destination tuple first element not string");
return false;
}
@ -126,7 +126,7 @@ static bool PyObject_AsNBTName(PyObject *obj, struct nbt_name_socket *name_socke
}
}
if (PyStr_Check(obj) || PyUnicode_Check(obj)) {
if (PyUnicode_Check(obj) || PyUnicode_Check(obj)) {
/* FIXME: Parse string to be able to interpret things like RHONWYN<02> ? */
name->name = PyStr_AsString(obj);
if (name->name == NULL) {

3
python/py3compat.h
View File

@ -54,7 +54,6 @@
/* Strings */
#define PyStr_Check PyUnicode_Check
#define PyStr_FromString PyUnicode_FromString
#define PyStr_FromStringAndSize PyUnicode_FromStringAndSize
#define PyStr_FromFormat PyUnicode_FromFormat
@ -77,7 +76,7 @@
#define IsPy3Bytes PyBytes_Check
#define IsPy3BytesOrString(pystr) \
(PyStr_Check(pystr) || PyBytes_Check(pystr))
(PyUnicode_Check(pystr) || PyBytes_Check(pystr))
/* Ints */

2
source4/auth/pyauth.c
View File

@ -301,7 +301,7 @@ static const char **PyList_AsStringList(TALLOC_CTX *mem_ctx, PyObject *list,
const char *value;
Py_ssize_t size;
PyObject *item = PyList_GetItem(list, i);
if (!(PyStr_Check(item) || PyUnicode_Check(item))) {
if (!(PyUnicode_Check(item) || PyUnicode_Check(item))) {
PyErr_Format(PyExc_TypeError, "%s should be strings", paramname);
return NULL;
}

4
source4/librpc/rpc/pyrpc.c
View File

@ -53,7 +53,7 @@ static bool ndr_syntax_from_py_object(PyObject *object, struct ndr_syntax_id *sy
{
ZERO_STRUCTP(syntax_id);
if (PyStr_Check(object) || PyUnicode_Check(object)) {
if (PyUnicode_Check(object) || PyUnicode_Check(object)) {
return PyString_AsGUID(object, &syntax_id->uuid);
} else if (PyTuple_Check(object)) {
PyObject *item = NULL;
@ -63,7 +63,7 @@ static bool ndr_syntax_from_py_object(PyObject *object, struct ndr_syntax_id *sy
}
item = PyTuple_GetItem(object, 0);
if (!(PyStr_Check(item) || PyUnicode_Check(item))) {
if (!(PyUnicode_Check(item) || PyUnicode_Check(item))) {
PyErr_SetString(PyExc_ValueError, "Expected GUID as first element in tuple");
return false;
}

2
source4/param/pyparam.c
View File

@ -534,7 +534,7 @@ static Py_ssize_t py_lp_ctx_len(PyObject *self)
static PyObject *py_lp_ctx_getitem(PyObject *self, PyObject *name)
{
struct loadparm_service *service;
if (!(PyStr_Check(name) || PyUnicode_Check(name))) {
if (!(PyUnicode_Check(name) || PyUnicode_Check(name))) {
PyErr_SetString(PyExc_TypeError, "Only string subscripts are supported");
return NULL;
}

2
source4/param/pyparam_util.c
View File

@ -34,7 +34,7 @@ _PUBLIC_ struct loadparm_context *lpcfg_from_py_object(TALLOC_CTX *mem_ctx, PyOb
PyTypeObject *lp_type;
bool is_lpobj;
if (PyStr_Check(py_obj) || PyUnicode_Check(py_obj)) {
if (PyUnicode_Check(py_obj) || PyUnicode_Check(py_obj)) {
lp_ctx = loadparm_init_global(false);
if (lp_ctx == NULL) {
return NULL;