The branch, master has been updated via f1f47ac python: Remove uuid module from e551cdb winbind: Fix 100% loop
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f1f47ac93431231cebb7933c6974c6a52e24fcb4 Author: Petr Viktorin <pvikt...@redhat.com> Date: Tue Jul 14 11:02:36 2015 +0200 python: Remove uuid module The uuid module was only built for Python 2.4 and lower, which Samba no longer supports. Python 2.5+ includes uuid in its standard library. Signed-off-by: Petr Viktorin <pvikt...@redhat.com> Reviewed-by: Alexander Bokovoy <a...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> Autobuild-User(master): Andrew Bartlett <abart...@samba.org> Autobuild-Date(master): Sat Aug 29 04:03:49 CEST 2015 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: python/uuidmodule.c | 58 ---------------------------------------------------- python/wscript_build | 8 -------- 2 files changed, 66 deletions(-) delete mode 100644 python/uuidmodule.c Changeset truncated at 500 lines: diff --git a/python/uuidmodule.c b/python/uuidmodule.c deleted file mode 100644 index 3bfe016..0000000 --- a/python/uuidmodule.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Samba utility functions - Copyright (C) Jelmer Vernooij <jel...@samba.org> 2007 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include <Python.h> -#include "includes.h" -#include "librpc/ndr/libndr.h" - -static PyObject *uuid_random(PyObject *self, PyObject *args) -{ - struct GUID guid; - PyObject *pyobj; - char *str; - - if (!PyArg_ParseTuple(args, "")) - return NULL; - - guid = GUID_random(); - - str = GUID_string(NULL, &guid); - if (str == NULL) { - PyErr_SetString(PyExc_TypeError, "can't convert uuid to string"); - return NULL; - } - - pyobj = PyString_FromString(str); - - talloc_free(str); - - return pyobj; -} - -static PyMethodDef methods[] = { - { "uuid4", (PyCFunction)uuid_random, METH_VARARGS, NULL}, - { NULL, NULL } -}; - -void inituuid(void) -{ - PyObject *mod = Py_InitModule3("uuid", methods, "UUID helper routines"); - if (mod == NULL) - return; -} diff --git a/python/wscript_build b/python/wscript_build index a40b583..01ac362 100644 --- a/python/wscript_build +++ b/python/wscript_build @@ -16,14 +16,6 @@ bld.SAMBA_SUBSYSTEM('LIBPYTHON', ) -bld.SAMBA_PYTHON('python_uuid', - source='uuidmodule.c', - deps='ndr', - realname='uuid.so', - enabled = float(bld.env.PYTHON_VERSION) <= 2.4 - ) - - bld.SAMBA_PYTHON('python_glue', source='pyglue.c', deps='pyparam_util samba-util netif pytalloc-util', -- Samba Shared Repository