A slew of changes based on William Fulton's code review.

- Fixed naming conventions; SwigPyBuiltin is used a lot
- Removed use of std::vector
- builtin.swg isn't included if -builtin isn't specified
- Changed many feature names to use a "python:" prefix
- Eliminated static vars in std_pair.i
- Eliminated C++-style comments (//)
- Enabled autodoc and docstring with -builtin
- Fixed non-ansi generated C code
- Detect and complain if two incompatible swig modules are loaded
- Removed argcargvtest_runme3.py, and fixed argcargvtest_runme.py
  so that 2to3 handles it better
- Removed anonymous namespaces
- Eliminated builtin_init typemaps; consolidated functionality into
  SWIG_Python_NewPointerObj
- Eliminate printf warnings from %U conversion character by switching
  to %S, which works just as well
- Fixed li_std_set_runme.py for python3, which returns set members in
  a different order from python2





git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/szager-python-builtin@12562 626c5289-ae23-0410-ae9c-e8d60b6d4f22

1 files changed, 9 insertions, 9 deletions

diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg
index 4878f66c7..f2e633023 100644
--- a/Lib/python/pycontainer.swg
+++ b/Lib/python/pycontainer.swg
@@ -587,7 +587,7 @@ namespace swig
     }
 
 #if defined(SWIGPYTHON_BUILTIN)
-  %feature("pyslot", "tp_iter", functype="getiterfunc") iterator;
+  %feature("python:slot", "tp_iter", functype="getiterfunc") iterator;
 #else
   %pythoncode {def __iter__(self): return self.iterator()}
 #endif
@@ -604,8 +604,8 @@ namespace swig
   %newobject __getslice__;
 
 #if defined(SWIGPYTHON_BUILTIN)
-  %feature("pyslot", "nb_nonzero", functype="inquiry") __nonzero__;
-  %feature("pyslot", "sq_length", functype="lenfunc") __len__;
+  %feature("python:slot", "nb_nonzero", functype="inquiry") __nonzero__;
+  %feature("python:slot", "sq_length", functype="lenfunc") __len__;
 #endif // SWIGPYTHON_BUILTIN
 
   %extend {
@@ -634,12 +634,12 @@ namespace swig
   %fragment("SwigPySequence_Base");
 
 #if defined(SWIGPYTHON_BUILTIN)
-  //%feature("pyslot", "sq_item", functype="ssizeargfunc") __getitem__;
-  //%feature("pyslot", "sq_slice", functype="ssizessizeargfunc") __getslice__;
-  //%feature("pyslot", "sq_ass_item", functype="ssizeobjargproc") __setitem__;
-  //%feature("pyslot", "sq_ass_slice", functype="ssizessizeobjargproc") __setslice__;
-  %feature("pyslot", "mp_subscript", functype="binaryfunc") __getitem__;
-  %feature("pyslot", "mp_ass_subscript", functype="objobjargproc") __setitem__;
+  //%feature("python:slot", "sq_item", functype="ssizeargfunc") __getitem__;
+  //%feature("python:slot", "sq_slice", functype="ssizessizeargfunc") __getslice__;
+  //%feature("python:slot", "sq_ass_item", functype="ssizeobjargproc") __setitem__;
+  //%feature("python:slot", "sq_ass_slice", functype="ssizessizeobjargproc") __setslice__;
+  %feature("python:slot", "mp_subscript", functype="binaryfunc") __getitem__;
+  %feature("python:slot", "mp_ass_subscript", functype="objobjargproc") __setitem__;
 #endif // SWIGPYTHON_BUILTIN
 
   %extend {