diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-01-21 16:18:19 +1300 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-01-21 16:18:19 +1300 |
| commit | 6afb16253399a58ac06b0061cd7ceb112bcd172b (patch) | |
| tree | 02ffdddc1c09712fcaa6acb1dd1860582877e528 | |
| parent | f679def4f2c4d878c8fac49ea248cfadb665168c (diff) | |
| download | samba-6afb16253399a58ac06b0061cd7ceb112bcd172b.tar.gz samba-6afb16253399a58ac06b0061cd7ceb112bcd172b.tar.bz2 samba-6afb16253399a58ac06b0061cd7ceb112bcd172b.zip | |
pyxattr: Remove unnecessary hacks.
| -rw-r--r-- | source4/scripting/python/pyxattr_native.c | 14 | ||||
| -rw-r--r-- | source4/scripting/python/pyxattr_tdb.c | 13 |
2 files changed, 1 insertions, 26 deletions
diff --git a/source4/scripting/python/pyxattr_native.c b/source4/scripting/python/pyxattr_native.c index 7cff42cebe..969ee7d416 100644 --- a/source4/scripting/python/pyxattr_native.c +++ b/source4/scripting/python/pyxattr_native.c @@ -19,7 +19,6 @@ */ #include <Python.h> -#include "version.h" #include "includes.h" #include "librpc/ndr/libndr.h" #include "lib/util/wrap_xattr.h" @@ -112,19 +111,8 @@ void initxattr_native(void) m = Py_InitModule3("xattr_native", py_xattr_methods, "Python bindings for xattr manipulation."); + if (m == NULL) return; - - PyModule_AddObject(m, "version", PyString_FromString(SAMBA_VERSION_STRING)); - - /* one of the most annoying things about python scripts is - that they don't die when you hit control-C. This fixes that - sillyness. As we do all database operations using - transactions, this is also safe. In fact, not dying - immediately is unsafe as we could end up treating the - control-C exception as a different error and try to modify - as database incorrectly - */ - signal(SIGINT, SIG_DFL); } diff --git a/source4/scripting/python/pyxattr_tdb.c b/source4/scripting/python/pyxattr_tdb.c index aa511fa5e7..071d4374f2 100644 --- a/source4/scripting/python/pyxattr_tdb.c +++ b/source4/scripting/python/pyxattr_tdb.c @@ -19,7 +19,6 @@ */ #include <Python.h> -#include "version.h" #include "includes.h" #include "../tdb/include/tdb.h" #include "tdb_wrap.h" @@ -116,17 +115,5 @@ void initxattr_tdb(void) "Python bindings for xattr manipulation."); if (m == NULL) return; - - PyModule_AddObject(m, "version", PyString_FromString(SAMBA_VERSION_STRING)); - - /* one of the most annoying things about python scripts is - that they don't die when you hit control-C. This fixes that - sillyness. As we do all database operations using - transactions, this is also safe. In fact, not dying - immediately is unsafe as we could end up treating the - control-C exception as a different error and try to modify - as database incorrectly - */ - signal(SIGINT, SIG_DFL); } |