Merged the Python 3.0 support branch. The merging progress is not so smooth, so hope this commit won't make anything broken.

This is the (incomplemete) log produced by svnmerge.py:

Merged revisions 10405-10409,10420-10422,10426,10438,10445,10451,10454-10465,10467,10473-10475,10485,10488-10489,10493-10495,10497,10509-10510,10513-10514,10517,10520,10525,10528-10529,10533-10535,10554-10557,10570,10573,10593,10614,10666-10669,10673,10678,10687,10690,10704-10706,10731,10744,10750-10752,10755,10759,10770,10775-10776,10813,10819 via svnmerge from 
https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-bhy



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

Examples/python/callback/Makefile

@@ -19,3 +19,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/class/Makefile

@@ -18,3 +18,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/constants/Makefile

@@ -17,3 +17,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/contract/Makefile

@@ -17,3 +17,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/docstrings/Makefile

@@ -21,3 +21,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/enum/Makefile

@@ -18,3 +18,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/exception/Makefile

@@ -18,3 +18,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/exceptproxy/Makefile

@@ -19,3 +19,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/extend/Makefile

@@ -19,3 +19,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/funcptr/Makefile

@@ -17,3 +17,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/funcptr2/Makefile

@@ -17,3 +17,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/functor/Makefile

@@ -19,3 +19,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/import/Makefile

@@ -19,3 +19,4 @@ clean::
 	@rm -f foo.py bar.py spam.py base.py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/import_template/Makefile

@@ -19,3 +19,4 @@ clean::
 	@rm -f foo.py bar.py spam.py base.py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/libffi/Makefile

@@ -17,3 +17,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/multimap/Makefile

@@ -17,3 +17,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/multimap/example.i

@@ -17,6 +17,7 @@ extern int    gcd(int x, int y);
 
 %typemap(in,fragment="t_output_helper") (int argc, char *argv[]) {
   int i;
+  int l;
   if (!PyList_Check($input)) {
     SWIG_exception(SWIG_ValueError, "Expecting a list");
   }
@@ -27,11 +28,21 @@ extern int    gcd(int x, int y);
   $2 = (char **) malloc(($1+1)*sizeof(char *));
   for (i = 0; i < $1; i++) {
     PyObject *s = PyList_GetItem($input,i);
-    if (!PyString_Check(s)) {
+%#if PY_VERSION_HEX >= 0x03000000
+    if (!PyUnicode_Check(s)) 
+%#else
+    if (!PyString_Check(s)) 
+%#endif
+    {
       free($2);
       SWIG_exception(SWIG_ValueError, "List items must be strings");
     }
+%#if PY_VERSION_HEX >= 0x03000000
+    $2[i] = PyUnicode_AsStringAndSize(s, &l);
+%#else
     $2[i] = PyString_AsString(s);
+%#endif
+
   }
   $2[i] = 0;
 }
@@ -39,12 +50,21 @@ extern int    gcd(int x, int y);
 extern int gcdmain(int argc, char *argv[]);
 
 %typemap(in) (char *bytes, int len) {
+
+%#if PY_VERSION_HEX >= 0x03000000
+  if (!PyUnicode_Check($input)) {
+    PyErr_SetString(PyExc_ValueError,"Expected a string");
+    return NULL;
+  }
+  $1 = PyUnicode_AsStringAndSize($input, &$2);
+%#else
   if (!PyString_Check($input)) {
     PyErr_SetString(PyExc_ValueError,"Expected a string");
     return NULL;
   }
   $1 = PyString_AsString($input);
   $2 = PyString_Size($input);
+%#endif
 }
 
 extern int count(char *bytes, int len, char c);
@@ -56,9 +76,15 @@ extern int count(char *bytes, int len, char c);
    so that we don't violate it's mutability */
 
 %typemap(in) (char *str, int len) {
+%#if PY_VERSION_HEX >= 0x03000000
+   $2 = PyUnicode_GetSize($input);
+   $1 = (char *) malloc($2+1);
+   memmove($1,PyUnicode_AsString($input),$2);
+%#else
    $2 = PyString_Size($input);
    $1 = (char *) malloc($2+1);
    memmove($1,PyString_AsString($input),$2);
+%#endif
 }
 
 /* Return the mutated string as a new object.  The t_output_helper
@@ -67,7 +93,11 @@ extern int count(char *bytes, int len, char c);
 
 %typemap(argout) (char *str, int len) {
    PyObject *o;
+%#if PY_VERSION_HEX >= 0x03000000
+   o = PyUnicode_FromStringAndSize($1,$2);
+%#else
    o = PyString_FromStringAndSize($1,$2);
+%#endif
    $result = t_output_helper($result,o);
    free($1);
 }   

Examples/python/operator/Makefile

@@ -19,3 +19,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/pointer/Makefile

@@ -17,3 +17,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/reference/Makefile

@@ -18,3 +18,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/simple/Makefile

@@ -17,3 +17,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/smartptr/Makefile

@@ -19,3 +19,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/std_map/Makefile

@@ -22,3 +22,4 @@ run:
 	python runme.py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/std_vector/Makefile

@@ -19,3 +19,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/swigrun/Makefile

@@ -22,3 +22,4 @@ clean::
 
 check: all
 
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/template/Makefile

@@ -19,3 +19,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/varargs/Makefile

@@ -17,3 +17,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/variables/Makefile

@@ -17,3 +17,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run

Examples/python/weave/Makefile

@@ -19,3 +19,4 @@ clean::
 	rm -f $(TARGET).py
 
 check: all
+	$(MAKE) -f $(TOP)/Makefile python_run