sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

python: Remove uuid module

Browse Source 
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 <pviktori@redhat.com>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sat Aug 29 04:03:49 CEST 2015 on sn-devel-104
This commit is contained in:
Petr Viktorin 2015-07-14 11:02:36 +02:00 committed by Andrew Bartlett
parent e551cdb37d
commit f1f47ac934
2 changed files with 0 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
python/uuidmodule.c
View File

@ -1,58 +0,0 @@
/*
Unix SMB/CIFS implementation.
Samba utility functions
Copyright (C) Jelmer Vernooij <jelmer@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;
}

8
python/wscript_build
View File

@ -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', bld.SAMBA_PYTHON('python_glue',
source='pyglue.c', source='pyglue.c',
deps='pyparam_util samba-util netif pytalloc-util', deps='pyparam_util samba-util netif pytalloc-util',