jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use %{ %} instead of { } after %pythoncode

Browse source 
Simpler and safer change to address PR#357.
This commit is contained in:
Olly Betts 2015-03-20 13:45:19 +13:00
commit c8a7322a4d
6 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/python/pyabc.i
View file

@ -1,7 +1,7 @@
%define %pythonabc(Type, Abc) %define %pythonabc(Type, Abc)
%feature("python:abc", #Abc) Type; %feature("python:abc", #Abc) Type;
%enddef %enddef
%pythoncode {import collections}; %pythoncode %{import collections%}
%pythonabc(std::vector, collections.MutableSequence); %pythonabc(std::vector, collections.MutableSequence);
%pythonabc(std::list, collections.MutableSequence); %pythonabc(std::list, collections.MutableSequence);
%pythonabc(std::map, collections.MutableMapping); %pythonabc(std::map, collections.MutableMapping);

4
Lib/python/pycontainer.swg
View file

@ -710,8 +710,8 @@ namespace swig
#if defined(SWIGPYTHON_BUILTIN) #if defined(SWIGPYTHON_BUILTIN)
%feature("python:slot", "tp_iter", functype="getiterfunc") iterator; %feature("python:slot", "tp_iter", functype="getiterfunc") iterator;
#else #else
%pythoncode {def __iter__(self): %pythoncode %{def __iter__(self):
return self.iterator()} return self.iterator()%}
#endif #endif
} }

4
Lib/python/pyiterators.swg
View file

@ -344,8 +344,8 @@ namespace swig
%feature("python:slot", "tp_iternext", functype="iternextfunc") SwigPyIterator::__next__; %feature("python:slot", "tp_iternext", functype="iternextfunc") SwigPyIterator::__next__;
#else #else
%extend SwigPyIterator { %extend SwigPyIterator {
%pythoncode {def __iter__(self): %pythoncode %{def __iter__(self):
return self} return self%}
} }
#endif #endif

16
Lib/python/std_map.i
View file

@ -176,14 +176,14 @@
#else #else
%extend { %extend {
%pythoncode {def __iter__(self): %pythoncode %{def __iter__(self):
return self.key_iterator()} return self.key_iterator()%}
%pythoncode {def iterkeys(self): %pythoncode %{def iterkeys(self):
return self.key_iterator()} return self.key_iterator()%}
%pythoncode {def itervalues(self): %pythoncode %{def itervalues(self):
return self.value_iterator()} return self.value_iterator()%}
%pythoncode {def iteritems(self): %pythoncode %{def iteritems(self):
return self.iterator()} return self.iterator()%}
} }
#endif #endif

4
Lib/python/std_pair.i
View file

@ -176,7 +176,7 @@ SwigPython_std_pair_setitem (PyObject *a, Py_ssize_t b, PyObject *c)
%define %swig_pair_methods(pair...) %define %swig_pair_methods(pair...)
#if !defined(SWIGPYTHON_BUILTIN) #if !defined(SWIGPYTHON_BUILTIN)
%extend { %extend {
%pythoncode {def __len__(self): %pythoncode %{def __len__(self):
return 2 return 2
def __repr__(self): def __repr__(self):
return str((self.first, self.second)) return str((self.first, self.second))
@ -189,7 +189,7 @@ def __setitem__(self, index, val):
if not (index % 2): if not (index % 2):
self.first = val self.first = val
else: else:
self.second = val} self.second = val%}
} }
#endif #endif
%enddef %enddef

16
Lib/python/std_unordered_map.i
View file

@ -231,14 +231,14 @@
return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
} }
%pythoncode {def __iter__(self): %pythoncode %{def __iter__(self):
return self.key_iterator()} return self.key_iterator()%}
%pythoncode {def iterkeys(self): %pythoncode %{def iterkeys(self):
return self.key_iterator()} return self.key_iterator()%}
%pythoncode {def itervalues(self): %pythoncode %{def itervalues(self):
return self.value_iterator()} return self.value_iterator()%}
%pythoncode {def iteritems(self): %pythoncode %{def iteritems(self):
return self.iterator()} return self.iterator()%}
} }
%enddef %enddef