[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Tue Feb 9 10:04:48 MST 2010
The branch, master has been updated
via 45cbf49... check_python.m4 - Raise the minimum python version up to 2.4
via 04cf9b8... pidl - Remove "Py_RETURN_NONE" compatibility code
via e34637b... s4:Remove "Py_RETURN_NONE" compatibility code
from a0ac6a8... s3-docs: Fix make manpages3.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 45cbf49477b963bd39a57bac0682f36acbc9f6b3
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date: Tue Feb 9 17:48:44 2010 +0100
check_python.m4 - Raise the minimum python version up to 2.4
This is needed since we at the s4 side have some code which requires this. I
think everybody should be fine since we got no complaints on the mailing list
about this change.
Patch template: Jelmer Vernooij <jelmer at samba.org>
commit 04cf9b81eb37898f8251daf302341f1b639ab827
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date: Thu Feb 4 11:25:06 2010 +0100
pidl - Remove "Py_RETURN_NONE" compatibility code
This was needed only by Python 2.3 which we no longer support.
commit e34637b2a69b5af6f6ac997d5e0d4b786f3c9935
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date: Thu Feb 4 11:17:40 2010 +0100
s4:Remove "Py_RETURN_NONE" compatibility code
This was needed only by Python 2.3 which we no longer support.
-----------------------------------------------------------------------
Summary of changes:
m4/check_python.m4 | 5 +++++
pidl/lib/Parse/Pidl/Samba4/Python.pm | 4 ----
source4/auth/credentials/pycredentials.c | 4 ----
source4/auth/gensec/pygensec.c | 4 ----
source4/lib/com/pycom.c | 4 ----
source4/lib/messaging/pymessaging.c | 4 ----
source4/lib/registry/pyregistry.c | 4 ----
source4/librpc/rpc/pyrpc.c | 4 ----
source4/ntvfs/posix/python/pyxattr_native.c | 4 ----
source4/ntvfs/posix/python/pyxattr_tdb.c | 4 ----
source4/param/pyparam.c | 4 ----
source4/scripting/python/pyglue.c | 4 ----
source4/web_server/wsgi.c | 4 ----
13 files changed, 5 insertions(+), 48 deletions(-)
Changeset truncated at 500 lines:
diff --git a/m4/check_python.m4 b/m4/check_python.m4
index 15f04af..8ca0ead 100644
--- a/m4/check_python.m4
+++ b/m4/check_python.m4
@@ -76,6 +76,11 @@ AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
if test x$PYTHON != x
then
+ if `$PYTHON -c "import sys; sys.exit(sys.version_info.__getslice__(0, 2) >= (2, 4))"`
+ then
+ AC_MSG_ERROR([Python ($PYTHON) is too old. At least version 2.4 is required])
+ fi
+
DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; \
print '-I%s -I%s %s' % ( \
sysconfig.get_python_inc(), \
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 015c54d..781d640 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -1132,10 +1132,6 @@ sub Parse($$$$$)
#include \"$hdr\"
#include \"$ndr_hdr\"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
");
foreach my $x (@$ndr) {
diff --git a/source4/auth/credentials/pycredentials.c b/source4/auth/credentials/pycredentials.c
index 59a200b..3c06ae9 100644
--- a/source4/auth/credentials/pycredentials.c
+++ b/source4/auth/credentials/pycredentials.c
@@ -25,10 +25,6 @@
#include "libcli/util/pyerrors.h"
#include "param/pyparam.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static PyObject *PyString_FromStringOrNULL(const char *str)
{
if (str == NULL)
diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index 87c3805..1c2bd20 100644
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -25,10 +25,6 @@
#include "pytalloc.h"
#include <tevent.h>
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static PyObject *py_get_name_by_authtype(PyObject *self, PyObject *args)
{
int type;
diff --git a/source4/lib/com/pycom.c b/source4/lib/com/pycom.c
index 86e794e..3323ca6 100644
--- a/source4/lib/com/pycom.c
+++ b/source4/lib/com/pycom.c
@@ -23,10 +23,6 @@
#include "librpc/ndr/libndr.h"
#include "libcli/util/pyerrors.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static struct com_context *py_com_ctx = NULL; /* FIXME: evil global */
static PyObject *py_get_class_object(PyObject *self, PyObject *args)
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 0e6fe88..1f3b687 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -31,10 +31,6 @@
#include "param/param.h"
#include "param/pyparam.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
PyAPI_DATA(PyTypeObject) messaging_Type;
PyAPI_DATA(PyTypeObject) irpc_ClientConnectionType;
diff --git a/source4/lib/registry/pyregistry.c b/source4/lib/registry/pyregistry.c
index e98ac26..a2042f4 100644
--- a/source4/lib/registry/pyregistry.c
+++ b/source4/lib/registry/pyregistry.c
@@ -27,10 +27,6 @@
#include "auth/credentials/pycredentials.h"
#include "param/pyparam.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
PyAPI_DATA(PyTypeObject) PyRegistryKey;
PyAPI_DATA(PyTypeObject) PyRegistry;
PyAPI_DATA(PyTypeObject) PyHiveKey;
diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c
index a24649d..00bc683 100644
--- a/source4/librpc/rpc/pyrpc.c
+++ b/source4/librpc/rpc/pyrpc.c
@@ -26,10 +26,6 @@
#include "param/pyparam.h"
#include "auth/credentials/pycredentials.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static PyObject *py_dcerpc_run_function(dcerpc_InterfaceObject *iface,
const struct PyNdrRpcMethodDef *md,
PyObject *args, PyObject *kwargs)
diff --git a/source4/ntvfs/posix/python/pyxattr_native.c b/source4/ntvfs/posix/python/pyxattr_native.c
index 9b60039..7dcb5dd 100644
--- a/source4/ntvfs/posix/python/pyxattr_native.c
+++ b/source4/ntvfs/posix/python/pyxattr_native.c
@@ -23,10 +23,6 @@
#include "librpc/ndr/libndr.h"
#include "lib/util/wrap_xattr.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static PyObject *py_is_xattr_supported(PyObject *self)
{
#if !defined(HAVE_XATTR_SUPPORT)
diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
index e49cd88..195c8db 100644
--- a/source4/ntvfs/posix/python/pyxattr_tdb.c
+++ b/source4/ntvfs/posix/python/pyxattr_tdb.c
@@ -27,10 +27,6 @@
#include "ntvfs/posix/vfs_posix.h"
#include "libcli/util/pyerrors.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
static PyObject *py_is_xattr_supported(PyObject *self)
{
return Py_True;
diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index b425500..4b534fb 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -29,10 +29,6 @@ typedef int Py_ssize_t;
typedef inquiry lenfunc;
#endif
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
#define PyLoadparmContext_AsLoadparmContext(obj) py_talloc_get_type(obj, struct loadparm_context)
PyAPI_DATA(PyTypeObject) PyLoadparmContext;
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c
index 6ef7033..5279a0b 100644
--- a/source4/scripting/python/pyglue.c
+++ b/source4/scripting/python/pyglue.c
@@ -35,10 +35,6 @@
#include "param/pyparam.h"
#include "auth/credentials/pycredentials.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
/* FIXME: These should be in a header file somewhere, once we finish moving
* away from SWIG .. */
#define PyErr_LDB_OR_RAISE(py_ldb, ldb) \
diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c
index 48255bc..9b5e384 100644
--- a/source4/web_server/wsgi.c
+++ b/source4/web_server/wsgi.c
@@ -27,10 +27,6 @@
#include "../lib/util/data_blob.h"
#include "lib/tls/tls.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-
typedef struct {
PyObject_HEAD
struct websrv_context *web;
--
Samba Shared Repository
More information about the samba-cvs
mailing list