add swig::PyItem and all the helper code

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7787 626c5289-ae23-0410-ae9c-e8d60b6d4f22

5 files changed, 27 insertions, 6 deletions

diff --git a/Examples/test-suite/python/li_std_map.i b/Examples/test-suite/python/li_std_map.i
index 0418613f2..4ff822d78 100644
--- a/Examples/test-suite/python/li_std_map.i
+++ b/Examples/test-suite/python/li_std_map.i
@@ -29,8 +29,8 @@ namespace std
   %template(pairiiAc) pair<int,const pair<int, A*> >;
 
 
-  %template() pair<PyObject *, PyObject *>;
-  %template(pymap) map<PyObject *, PyObject*>;
+  %template() pair<swig::PyItem, swig::PyItem>;
+  %template(pymap) map<swig::PyItem, swig::PyItem>;
   
 }
 
diff --git a/Examples/test-suite/python/li_std_map_runme.py b/Examples/test-suite/python/li_std_map_runme.py
index f45d288ab..4241c584d 100644
--- a/Examples/test-suite/python/li_std_map_runme.py
+++ b/Examples/test-suite/python/li_std_map_runme.py
@@ -32,10 +32,17 @@ for k in m:
   
 
 
+
+m = {}
+m[1] = (1,2)
+m["foo"] = "hello"
+
 pm = li_std_map.pymap()
 
-pm[1] = (1,2)
-pm["foo"] = "hello"
+for k in m:  
+  pm[k] = m[k]
 
 for k in pm:  
-  print pm[k]
+  if (pm[k] != m[k]):
+    raise RuntimeError
+
diff --git a/Examples/test-suite/python/li_std_set.i b/Examples/test-suite/python/li_std_set.i
index 3c833f39c..2d7b0cce4 100644
--- a/Examples/test-suite/python/li_std_set.i
+++ b/Examples/test-suite/python/li_std_set.i
@@ -13,3 +13,5 @@
 
 
 
+
+%template(pyset) std::set<swig::PyItem>; 
diff --git a/Examples/test-suite/python/li_std_set_runme.py b/Examples/test-suite/python/li_std_set_runme.py
index 71d398d92..50471ea13 100644
--- a/Examples/test-suite/python/li_std_set_runme.py
+++ b/Examples/test-suite/python/li_std_set_runme.py
@@ -82,3 +82,15 @@ if m.value() != "c":
 
 
 
+s = pyset()
+s.insert((1,2))
+s.insert(1)
+s.insert("hello")
+
+
+sum = ()
+for i in s:
+    sum += (i,)
+
+if sum != (1, 'hello', (1, 2)):
+    raise RuntimeError
diff --git a/Examples/test-suite/python/li_std_vector.i b/Examples/test-suite/python/li_std_vector.i
index e6dc180f8..40023eac8 100644
--- a/Examples/test-suite/python/li_std_vector.i
+++ b/Examples/test-suite/python/li_std_vector.i
@@ -123,4 +123,4 @@ std::vector<std::string>  vecStr(std::vector<std::string> v) {
 %array_functions(int,ArrInt)
 
 
-%template(pyvector) std::vector<PyObject*>; 
+%template(pyvector) std::vector<swig::PyItem>;