Merge branch 'python-iterator-protocol'

* python-iterator-protocol:
  Finish removal of SwigPySequence_Cont
  Remove undocumented and non-existent STL std::carray
  Remove assign method uses by the removed Python Sequence Protocol
  Remove now redundant use of Python Sequence protocol in STL wrappers
  Add support for all STL containers to be constructible from a Python set
  Iterator Protocol support for std::array wrappers
  STL support for copying Python objects supporting Iterator protocol

Closes #2515

Conflicts:
	CHANGES.current

1 files changed, 0 insertions, 10 deletions

diff --git a/Lib/python/std_multimap.i b/Lib/python/std_multimap.i
index bbffb6bcd..75b4d7fcf 100644
--- a/Lib/python/std_multimap.i
+++ b/Lib/python/std_multimap.i
@@ -6,16 +6,6 @@
 %fragment("StdMultimapTraits","header",fragment="StdMapCommonTraits")
 {
   namespace swig {
-    template <class SwigPySeq, class K, class T >
-    inline void 
-    assign(const SwigPySeq& swigpyseq, std::multimap<K,T > *multimap) {
-      typedef typename std::multimap<K,T>::value_type value_type;
-      typename SwigPySeq::const_iterator it = swigpyseq.begin();
-      for (;it != swigpyseq.end(); ++it) {
-	multimap->insert(value_type(it->first, it->second));
-      }
-    }
-
     template <class K, class T>
     struct traits_asptr<std::multimap<K,T> >  {
       typedef std::multimap<K,T> multimap_type;