py3: Remove #define IsPy3Bytes PyBytes_Check

This allows us to end the use of Python 2/3 compatability macros.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Noel Power <npower@samba.org>

diff --git a/python/py3compat.h b/python/py3compat.h
index ea5366a84347d23a1b252926a58468aec3911848..516495e4e5ac32a309d372c5fbe94b418a245783 100644 (file)
--- a/python/py3compat.h
+++ b/python/py3compat.h
@@ -62,8 +62,6 @@
  * will work as expected in python2 & python3
  */
 
-#define IsPy3Bytes PyBytes_Check
-
 #define IsPy3BytesOrString(pystr) \
     (PyUnicode_Check(pystr) || PyBytes_Check(pystr))
 

diff --git a/source4/librpc/ndr/py_misc.c b/source4/librpc/ndr/py_misc.c
index 975235490ad8a306aa096708cb798f9db53c6277..81e762af3281ac5b559ee27482c4086886a99d13 100644 (file)
--- a/source4/librpc/ndr/py_misc.c
+++ b/source4/librpc/ndr/py_misc.c
@@ -102,7 +102,7 @@ static int py_GUID_init(PyObject *self, PyObject *args, PyObject *kwargs)
                        return -1;
                }
 
-               if (!IsPy3Bytes(str)) {
+               if (!PyBytes_Check(str)) {
                        guid_val.data =
                                discard_const_p(uint8_t,
                                                PyUnicode_AsUTF8AndSize(str, &_size));