cosmetic for generated python code

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8850 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-20 07:33:18 +00:00
commit a66fa50a8c
4 changed files with 10 additions and 30 deletions

View file

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

View file

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

View file

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

View file

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