[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Thu Jan 9 08:28:04 MST 2014
The branch, master has been updated
via 0c2fbe5 samba:python - Py_RETURN_NONE remove compatibility code for releases < 2.4
from d1dacd6 s3: Avoid oplock break by storing timestamps with gpfs_set_times
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0c2fbe5a0c1a12751510840e285b7e45cc02ea22
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Jan 8 15:42:50 2014 +0100
samba:python - Py_RETURN_NONE remove compatibility code for releases < 2.4
http://www.python.org/doc//current/c-api/none.html
Reviewed-By: Jelmer Vernooij <jelmer at samba.org>
Autobuild-User(master): Matthias Dieter Wallnöfer <mdw at samba.org>
Autobuild-Date(master): Thu Jan 9 16:27:47 CET 2014 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
ctdb/lib/tdb/pytdb.c | 4 ----
lib/ldb/pyldb.c | 4 ----
lib/ldb/pyldb_util.c | 5 -----
lib/ntdb/pyntdb.c | 4 ----
lib/socket_wrapper/py_socket_wrapper.c | 4 ----
lib/tdb/pytdb.c | 4 ----
libcli/nbt/pynbt.c | 4 ----
python/pyglue.c | 4 ----
source3/passdb/py_passdb.c | 4 ----
source4/auth/pyauth.c | 4 ----
source4/libcli/pysmb.c | 4 ----
source4/librpc/ndr/py_auth.c | 4 ----
source4/librpc/ndr/py_misc.c | 4 ----
source4/librpc/ndr/py_security.c | 4 ----
source4/librpc/ndr/py_xattr.c | 4 ----
15 files changed, 0 insertions(+), 61 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/lib/tdb/pytdb.c b/ctdb/lib/tdb/pytdb.c
index ae0e6f8..98a6246 100644
--- a/ctdb/lib/tdb/pytdb.c
+++ b/ctdb/lib/tdb/pytdb.c
@@ -28,10 +28,6 @@
#include "replace.h"
#include "system/filesys.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
/* Include tdb headers */
#include <tdb.h>
diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index 4583132..4360b31 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -64,10 +64,6 @@ typedef inquiry lenfunc;
typedef intargfunc ssizeargfunc;
#endif
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
#define SIGN(a) (((a) == 0)?0:((a) < 0?-1:1))
diff --git a/lib/ldb/pyldb_util.c b/lib/ldb/pyldb_util.c
index e2442e2..4be9126 100644
--- a/lib/ldb/pyldb_util.c
+++ b/lib/ldb/pyldb_util.c
@@ -36,11 +36,6 @@ typedef inquiry lenfunc;
typedef intargfunc ssizeargfunc;
#endif
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
-
/**
* Find out PyTypeObject in ldb module for a given typename
*/
diff --git a/lib/ntdb/pyntdb.c b/lib/ntdb/pyntdb.c
index cbe7ae8..b2a1f0c 100644
--- a/lib/ntdb/pyntdb.c
+++ b/lib/ntdb/pyntdb.c
@@ -29,10 +29,6 @@
#include "replace.h"
#include "system/filesys.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
/* Include ntdb headers */
#include <ntdb.h>
diff --git a/lib/socket_wrapper/py_socket_wrapper.c b/lib/socket_wrapper/py_socket_wrapper.c
index f5742d3..411be59 100644
--- a/lib/socket_wrapper/py_socket_wrapper.c
+++ b/lib/socket_wrapper/py_socket_wrapper.c
@@ -52,10 +52,6 @@ typedef inquiry lenfunc;
typedef intargfunc ssizeargfunc;
#endif
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
#ifndef Py_TYPE /* Py_TYPE is only available on Python > 2.6 */
#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
#endif
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index cf77a25..bf0fed6 100644
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -28,10 +28,6 @@
#include "replace.h"
#include "system/filesys.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
/* Include tdb headers */
#include <tdb.h>
diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 8074fb6..7162880 100644
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -26,10 +26,6 @@
void initnetbios(void);
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
extern PyTypeObject nbt_node_Type;
typedef struct {
diff --git a/python/pyglue.c b/python/pyglue.c
index 02fb005..3fc6e38 100644
--- a/python/pyglue.c
+++ b/python/pyglue.c
@@ -25,10 +25,6 @@
void init_glue(void);
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static PyObject *py_generate_random_str(PyObject *self, PyObject *args)
{
int len;
diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c
index 3fd14cd..87dbb5d 100644
--- a/source3/passdb/py_passdb.c
+++ b/source3/passdb/py_passdb.c
@@ -33,10 +33,6 @@ typedef inquiry lenfunc;
typedef intargfunc ssizeargfunc;
#endif
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
#ifndef Py_TYPE /* Py_TYPE is only available on Python > 2.6 */
#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
#endif
diff --git a/source4/auth/pyauth.c b/source4/auth/pyauth.c
index 437e671..d79d417 100644
--- a/source4/auth/pyauth.c
+++ b/source4/auth/pyauth.c
@@ -43,10 +43,6 @@ typedef inquiry lenfunc;
typedef intargfunc ssizeargfunc;
#endif
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static PyObject *PyAuthSession_FromSession(struct auth_session_info *session)
{
return py_return_ndr_struct("samba.dcerpc.auth", "session_info", session, session);
diff --git a/source4/libcli/pysmb.c b/source4/libcli/pysmb.c
index fb981c7..456b01d 100644
--- a/source4/libcli/pysmb.c
+++ b/source4/libcli/pysmb.c
@@ -38,10 +38,6 @@
#include "libcli/security/security_descriptor.h"
#include "librpc/rpc/pyrpc_util.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
staticforward PyTypeObject PySMB;
void initsmb(void);
diff --git a/source4/librpc/ndr/py_auth.c b/source4/librpc/ndr/py_auth.c
index 8c9c16f..95c9a30 100644
--- a/source4/librpc/ndr/py_auth.c
+++ b/source4/librpc/ndr/py_auth.c
@@ -26,10 +26,6 @@
#include "auth/credentials/pycredentials.h"
#include "librpc/rpc/pyrpc_util.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static void PyType_AddGetSet(PyTypeObject *type, PyGetSetDef *getset)
{
PyObject *dict;
diff --git a/source4/librpc/ndr/py_misc.c b/source4/librpc/ndr/py_misc.c
index 4e6d62e..d8edff8 100644
--- a/source4/librpc/ndr/py_misc.c
+++ b/source4/librpc/ndr/py_misc.c
@@ -20,10 +20,6 @@
#include <Python.h>
#include "librpc/gen_ndr/misc.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static int py_GUID_cmp(PyObject *py_self, PyObject *py_other)
{
int ret;
diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c
index 7f79796..47d8c9a 100644
--- a/source4/librpc/ndr/py_security.c
+++ b/source4/librpc/ndr/py_security.c
@@ -20,10 +20,6 @@
#include <Python.h>
#include "libcli/security/security.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods)
{
PyObject *dict;
diff --git a/source4/librpc/ndr/py_xattr.c b/source4/librpc/ndr/py_xattr.c
index 5a61c73..fcf2e66 100644
--- a/source4/librpc/ndr/py_xattr.c
+++ b/source4/librpc/ndr/py_xattr.c
@@ -19,10 +19,6 @@
#include <Python.h>
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods)
{
PyObject *dict;
--
Samba Shared Repository
More information about the samba-cvs
mailing list