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

cosmetic for generated python code

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8850 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-20 07:33:18 +00:00
commit c58c487181
4 changed files with 10 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SWIG/Lib/python/pycontainer.swg
View file

@ -574,10 +574,7 @@ namespace swig
return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF); return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
} }
%pythoncode { %pythoncode {def __iter__(self): return self.iterator()}
def __iter__(self):
return self.iterator()
}
} }
#endif //SWIG_EXPORT_ITERATOR_METHODS #endif //SWIG_EXPORT_ITERATOR_METHODS
%enddef %enddef

5
SWIG/Lib/python/pyiterators.swg
View file

@ -316,10 +316,7 @@ namespace swig
%nodirector PySwigIterator; %nodirector PySwigIterator;
%extend PySwigIterator { %extend PySwigIterator {
%pythoncode { %pythoncode {def __iter__(self): return self}
def __iter__(self):
return self
}
} }
%catches(swig::stop_iteration) PySwigIterator::value() const; %catches(swig::stop_iteration) PySwigIterator::value() const;

17
SWIG/Lib/python/std_map.i
View file

@ -231,19 +231,10 @@
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 { %pythoncode {def __iter__(self): return self.key_iterator()}
def __iter__(self): %pythoncode {def iterkeys(self): return self.key_iterator()}
return self.key_iterator() %pythoncode {def itervalues(self): return self.value_iterator()}
%pythoncode {def iteritems(self): return self.iterator()}
def iterkeys(self):
return self.key_iterator()
def itervalues(self):
return self.value_iterator()
def iteritems(self):
return self.iterator()
}
} }
%enddef %enddef

13
SWIG/Lib/python/std_pair.i
View file

@ -120,10 +120,9 @@
%define %swig_pair_methods(pair...) %define %swig_pair_methods(pair...)
%extend { %extend {
%pythoncode { %pythoncode {def __len__(self): return 2
def __len__(self): def __repr__(self): return str((self.first, self.second))
return 2 def __getitem__(self, index):
def __getitem__(self, index):
if not (index % 2): if not (index % 2):
return self.first return self.first
else: else:
@ -132,13 +131,9 @@ 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}
def __repr__(self):
return str((self.first, self.second))
}
} }
%enddef %enddef
%include <std/std_pair.i> %include <std/std_pair.i>