sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

py3: Remove duplicated PyUnicode_Check() after the py3 compat macros were removed

Browse Source 
This came about because in py2 we had to check for strings and unicode.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>

Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Mon Jun 24 18:48:53 UTC 2019 on sn-devel-184
This commit is contained in:
Andrew Bartlett 2019-06-15 23:14:49 +12:00 committed by Noel Power
parent f32779b198
commit 4f32983ea8
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ldb/pyldb.c
View File

@ -1134,7 +1134,7 @@ static const char **PyList_AsStrList(TALLOC_CTX *mem_ctx, PyObject *list,
const char *str = NULL; const char *str = NULL;
Py_ssize_t size; Py_ssize_t size;
PyObject *item = PyList_GetItem(list, i); PyObject *item = PyList_GetItem(list, i);
if (!(PyUnicode_Check(item) || PyUnicode_Check(item))) { if (!PyUnicode_Check(item)) {
PyErr_Format(PyExc_TypeError, "%s should be strings", paramname); PyErr_Format(PyExc_TypeError, "%s should be strings", paramname);
talloc_free(ret); talloc_free(ret);
return NULL; return NULL;

2
lib/ldb/pyldb_util.c
View File

@ -62,7 +62,7 @@ bool pyldb_Object_AsDn(TALLOC_CTX *mem_ctx, PyObject *object,
struct ldb_dn *odn; struct ldb_dn *odn;
PyTypeObject *PyLdb_Dn_Type; PyTypeObject *PyLdb_Dn_Type;
if (ldb_ctx != NULL && (PyUnicode_Check(object) || PyUnicode_Check(object))) { if (ldb_ctx != NULL && (PyUnicode_Check(object))) {
odn = ldb_dn_new(mem_ctx, ldb_ctx, PyUnicode_AsUTF8(object)); odn = ldb_dn_new(mem_ctx, ldb_ctx, PyUnicode_AsUTF8(object));
*dn = odn; *dn = odn;
return true; return true;

2
lib/tevent/pytevent.c
View File

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

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; const char *value;
Py_ssize_t size; Py_ssize_t size;
PyObject *item = PyList_GetItem(list, i); PyObject *item = PyList_GetItem(list, i);
if (!(PyUnicode_Check(item) || PyUnicode_Check(item))) { if (!PyUnicode_Check(item)) {
PyErr_Format(PyExc_TypeError, "%s should be strings", paramname); PyErr_Format(PyExc_TypeError, "%s should be strings", paramname);
return NULL; 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); ZERO_STRUCTP(syntax_id);
if (PyUnicode_Check(object) || PyUnicode_Check(object)) { if (PyUnicode_Check(object)) {
return PyString_AsGUID(object, &syntax_id->uuid); return PyString_AsGUID(object, &syntax_id->uuid);
} else if (PyTuple_Check(object)) { } else if (PyTuple_Check(object)) {
PyObject *item = NULL; 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); item = PyTuple_GetItem(object, 0);
if (!(PyUnicode_Check(item) || PyUnicode_Check(item))) { if (!PyUnicode_Check(item)) {
PyErr_SetString(PyExc_ValueError, "Expected GUID as first element in tuple"); PyErr_SetString(PyExc_ValueError, "Expected GUID as first element in tuple");
return false; 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) static PyObject *py_lp_ctx_getitem(PyObject *self, PyObject *name)
{ {
struct loadparm_service *service; struct loadparm_service *service;
if (!(PyUnicode_Check(name) || PyUnicode_Check(name))) { if (!PyUnicode_Check(name)) {
PyErr_SetString(PyExc_TypeError, "Only string subscripts are supported"); PyErr_SetString(PyExc_TypeError, "Only string subscripts are supported");
return NULL; 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; PyTypeObject *lp_type;
bool is_lpobj; bool is_lpobj;
if (PyUnicode_Check(py_obj) || PyUnicode_Check(py_obj)) { if (PyUnicode_Check(py_obj)) {
lp_ctx = loadparm_init_global(false); lp_ctx = loadparm_init_global(false);
if (lp_ctx == NULL) { if (lp_ctx == NULL) {
return NULL; return NULL;