diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-11 14:31:01 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:29 +0100 |
| commit | 68dc2dc526e146dd0ac68d5d68eb55b601282caf (patch) | |
| tree | 3cb17dbc091b56cd4293a7d9d095d71c93234094 /source4/scripting | |
| parent | 78a4f5eadad447cd92f27a5fe4311eceea12f1f9 (diff) | |
| download | samba-68dc2dc526e146dd0ac68d5d68eb55b601282caf.tar.gz samba-68dc2dc526e146dd0ac68d5d68eb55b601282caf.tar.bz2 samba-68dc2dc526e146dd0ac68d5d68eb55b601282caf.zip | |
r26399: Use -O option for SWIG (less evil generated code).
(This used to be commit 3378b6a559272cb702b52966692bf423f67a2b41)
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/config.mk | 2 | ||||
| -rw-r--r-- | source4/scripting/python/misc.py | 11 | ||||
| -rw-r--r-- | source4/scripting/python/misc_wrap.c | 15 |
3 files changed, 25 insertions, 3 deletions
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk index 91437e1e0b..c958761c70 100644 --- a/source4/scripting/python/config.mk +++ b/source4/scripting/python/config.mk @@ -16,7 +16,7 @@ swig: pythonmods .SUFFIXES: _wrap.c .i .i_wrap.c: - [ "$(SWIG)" == "no" ] || $(SWIG) -Wall -I$(srcdir)/scripting/swig -python -keyword $< + [ "$(SWIG)" == "no" ] || $(SWIG) -O -Wall -I$(srcdir)/scripting/swig -python -keyword $< realdistclean:: @echo "Removing SWIG output files" diff --git a/source4/scripting/python/misc.py b/source4/scripting/python/misc.py index 94625be2c9..afe7b723e0 100644 --- a/source4/scripting/python/misc.py +++ b/source4/scripting/python/misc.py @@ -2,7 +2,6 @@ # Version 1.3.33 # # Don't modify this file, modify the SWIG interface instead. -# This file is compatible with both classic and new-style classes. import _misc import new @@ -48,6 +47,16 @@ except AttributeError: del types +def _swig_setattr_nondynamic_method(set): + def set_attr(self,name,value): + if (name == "thisown"): return self.this.own(value) + if hasattr(self,name) or (name == "this"): + set(self,name,value) + else: + raise AttributeError("You cannot add attributes to %s" % self) + return set_attr + + random_password = _misc.random_password diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c index 2237f9cb03..fbdd33afda 100644 --- a/source4/scripting/python/misc_wrap.c +++ b/source4/scripting/python/misc_wrap.c @@ -9,7 +9,7 @@ * ----------------------------------------------------------------------------- */ #define SWIGPYTHON -#define SWIG_PYTHON_DIRECTOR_NO_VTABLE +#define SWIG_PYTHON_NO_BUILD_NONE /* ----------------------------------------------------------------------------- * This section contains generic SWIG labels for method/variable * declarations/attributes, and other compiler dependent labels. @@ -2478,6 +2478,19 @@ static swig_module_info swig_module = {swig_types, 10, 0, 0, 0, 0}; # error "This python version requires swig to be run with the '-classic' option" # endif #endif +#if (PY_VERSION_HEX <= 0x02020000) +# error "This python version requires swig to be run with the '-nomodern' option" +#endif +#if (PY_VERSION_HEX <= 0x02020000) +# error "This python version requires swig to be run with the '-nomodernargs' option" +#endif +#ifndef METH_O +# error "This python version requires swig to be run with the '-nofastunpack' option" +#endif +#ifdef SWIG_TypeQuery +# undef SWIG_TypeQuery +#endif +#define SWIG_TypeQuery SWIG_Python_TypeQuery /*----------------------------------------------- @(target):= _misc.so |