diff --git a/build/Attic/python_v1.zip b/build/Attic/python_v1.zip
deleted file mode 100644
index 0377a07b..00000000
Binary files a/build/Attic/python_v1.zip and /dev/null differ
diff --git a/build/Jamfile b/build/Jamfile
deleted file mode 100644
index 92990080..00000000
--- a/build/Jamfile
+++ /dev/null
@@ -1,92 +0,0 @@
-#  (C) Copyright David Abrahams 2001. Permission to copy, use, modify, sell and
-#  distribute this software is granted provided this copyright notice appears
-#  in all copies. This software is provided "as is" without express or implied
-#  warranty, and with no claim as to its suitability for any purpose.
-#
-# Boost.Python library Jamfile
-
-
-# declare the location of this subproject relative to the root
-subproject libs/python/build ;
-
-# bring in the rules for python
-import python ;
-
-if [ check-python-config ]
-{
-    
-  local bpl-linkflags ;
-
-  if $(UNIX) && ( $(OS) = AIX )
-  {
-      bpl-linkflags = <linkflags>"-e initlibboost_python" ;
-  }
-
-  # Enabling intrinsics (/0i) or maximize speed (/02) seem to cause
-  # internal compiler errors with this toolset.
-  local msvc-stlport-workarounds
-    = <optimization>off "<cxxflags>-Ogty -O1 -Gs" ;
-    
-  local sources =
-    numeric.cpp
-    list.cpp
-    long.cpp
-    dict.cpp
-    tuple.cpp
-    str.cpp
-
-    aix_init_module.cpp
-    converter/from_python.cpp
-    converter/registry.cpp
-    converter/type_id.cpp
-    object/enum.cpp
-    object/class.cpp
-    object/function.cpp
-    object/inheritance.cpp
-    object/life_support.cpp
-    object/pickle_support.cpp
-    errors.cpp
-    module.cpp
-    converter/builtin_converters.cpp
-    converter/arg_to_python_base.cpp
-    object/iterator.cpp
-    object_protocol.cpp
-    object_operators.cpp
-    ;
-  
-  dll boost_python
-    : ../src/$(sources)
-    : $(BOOST_PYTHON_V2_PROPERTIES)
-      <define>BOOST_PYTHON_SOURCE
-      $(bpl-linkflags)
-        <msvc-stlport><release>$(msvc-stlport-workarounds)
-      ;
-
-  template extension
-    : <dll>boost_python
-    : <sysinclude>../../..
-    ;
-  
-  lib boost_python
-    : # sources
-      ../src/$(sources)
-        
-    : # requirements
-      $(BOOST_PYTHON_V2_PROPERTIES)
-      <define>BOOST_PYTHON_SOURCE
-      <define>BOOST_STATIC_LIB
-      $(bpl-linkflags)
-        <msvc-stlport><release>$(msvc-stlport-workarounds)
-      ;
-
-  stage bin-stage : <dll>boost_python <lib>boost_python
-    : <tag><debug>"_debug"
-      <tag><debug-python>"_pydebug"
-    :
-        debug release
-    ;
-
-  install python lib
-    : <dll>boost_python <lib>boost_python
-    ;
-}
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
deleted file mode 100644
index 3fece47f..00000000
--- a/build/Jamfile.v2
+++ /dev/null
@@ -1,88 +0,0 @@
-import os ;
-import modules ;
-
-# Use a very crude way to sense there python is locatted
-
-
-local PYTHON_PATH = [ modules.peek : PYTHON_PATH ] ;
-ECHO "XXX" $(PYTHON_PATH) ;
-
-if [ GLOB /usr/local/include/python2.2 : * ]
-{
-    PYTHON_PATH = /usr/local ;
-}
-else if [ GLOB /usr/include/python2.2 : * ] 
-{
-    PYTHON_PATH = /usr ;
-}
-
-if [ os.name ] in CYGWIN NT
-{
-    lib_condition = <link>shared: ;
-    defines = USE_DL_IMPORT ;
-   
-    # Declare a target for the python interpreter library
-    lib python : : <name>python22 <search>$(PYTHON_PATH)/libs ;
-    PYTHON_LIB = python ;    
-} 
-else 
-{
-   lib python : : <name>python2.2 ;
-   PYTHON_LIB = python ;    
-}
-
-
-
-if $(PYTHON_PATH) {
-    
-
-project boost/python
-    : source-location ../src
-        : requirements <include>$(PYTHON_PATH)/include
-          $(lib_condition)<library-path>$(PYTHON_PATH)/libs
-            <link>shared:<library>$(PYTHON_LIB)
-            <define>$(defines)
-        : usage-requirements # requirement that will be propageted to *users* of this library
-          <include>$(PYTHON_PATH)/include
-
-# We have a bug which causes us to conclude that conditionalized
-# properties in this section are not free.
-#          $(lib_condition)<library-path>$(PYTHON_PATH)/lib/python2.2/config
-#            <shared>true:<find-library>$(PYTHON_LIB)
-            
-          <library-path>$(PYTHON_PATH)/lib/python2.2/config
-            <library>$(PYTHON_LIB)
-    ;
-
-lib boost_python
-    : 
-    numeric.cpp
-
-    list.cpp
-    long.cpp
-    dict.cpp
-    tuple.cpp
-    str.cpp
-
-    aix_init_module.cpp
-    converter/from_python.cpp
-    converter/registry.cpp
-    converter/type_id.cpp
-    object/enum.cpp
-    object/class.cpp
-    object/function.cpp
-    object/inheritance.cpp
-    object/life_support.cpp
-    object/pickle_support.cpp
-    errors.cpp
-    module.cpp
-    converter/builtin_converters.cpp
-    converter/arg_to_python_base.cpp
-    object/iterator.cpp
-    object_protocol.cpp
-    object_operators.cpp
-    :   <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-        <define>BOOST_PYTHON_SOURCE
-    : <link>shared
-      ;
-}
diff --git a/build/VisualStudio/boost_python.dsp b/build/VisualStudio/boost_python.dsp
deleted file mode 100644
index 1e4c5358..00000000
--- a/build/VisualStudio/boost_python.dsp
+++ /dev/null
@@ -1,882 +0,0 @@
-# Microsoft Developer Studio Project File - Name="boost_python" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=BOOST_PYTHON - WIN32 RELEASE
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "boost_python.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "boost_python.mak" CFG="BOOST_PYTHON - WIN32 RELEASE"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "boost_python - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "boost_python - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "boost_python - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../bin-stage"
-# PROP Intermediate_Dir "release-obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BPL_EXPORTS" /YX /FD /Zm800 /Zm800 /Zm800 /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../../../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BOOST_PYTHON_DYNAMIC_LIB" /D "BOOST_PYTHON_SOURCE" /FD /Zm800 /Zm800 /Zm800 /Zm800 /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x1409 /d "NDEBUG"
-# ADD RSC /l 0x1409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib /nologo /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "boost_python - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../bin-stage"
-# PROP Intermediate_Dir "debug-obj"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-F90=df.exe
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BPL_EXPORTS" /YX /FD /Zm800 /Zm800 /Zm800 /GZ /c
-# ADD CPP /nologo /MDd /W3 /GR /GX /Zi /Od /I "../../../../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BOOST_PYTHON_DYNAMIC_LIB" /D "BOOST_PYTHON_SOURCE" /FD /Zm800 /Zm800 /Zm800 /Zm800 /Zm800 /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x1409 /d "_DEBUG"
-# ADD RSC /l 0x1409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"../bin-stage/boost_python_debug.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "boost_python - Win32 Release"
-# Name "boost_python - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\src\aix_init_module.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\converter\arg_to_python_base.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\converter\builtin_converters.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\class.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\dict.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\enum.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\errors.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\converter\from_python.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\function.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\inheritance.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\iterator.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\life_support.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\list.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\long.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\module.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\numeric.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object_operators.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object_protocol.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\object\pickle_support.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\converter\registry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\str.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\tuple.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\converter\type_id.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "detail"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\aix_init_module.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\api_placeholder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\arg_tuple_size.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\borrowed_ptr.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\call_object.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\caller.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\char_array.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\config.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\construct.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\convertible.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\cv_category.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\decorated_type_id.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\def_helper.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\defaults_def.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\defaults_gen.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\dependent.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\destroy.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\exception_handler.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\force_instantiate.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\if_else.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\indirect_traits.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\make_keyword_range_fn.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\make_tuple.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\map_entry.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\member_function_cast.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\module_base.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\module_init.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\msvc_typeinfo.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\none.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\not_specified.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\operator_id.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\overloads_fwd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\pointee.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\preprocessor.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\python22_fixed.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\raw_pyobject.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\referent_storage.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\result.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\returning.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\scope.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\string_literal.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\target.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\translate_exception.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\type_list.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\type_list_impl.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\type_list_impl_no_pts.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\type_list_utils.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\unwind_type.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\void_ptr.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\void_return.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\detail\wrap_python.hpp
-# End Source File
-# End Group
-# Begin Group "converter"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\arg_from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\arg_to_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\arg_to_python_base.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\builtin_converters.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\constructor_function.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\convertible_function.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\implicit.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\obj_mgr_arg_from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\object_manager.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\pointer_type_id.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\pyobject_traits.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\pyobject_type.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\pytype_arg_from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\pytype_object_mgr_traits.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\registered.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\registered_pointee.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\registrations.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\registry.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\return_from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\rvalue_from_python_data.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\converter\to_python_function_type.hpp
-# End Source File
-# End Group
-# Begin Group "object"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\add_to_namespace.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\class.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\class_converters.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\class_detail.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\class_wrapper.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\construct.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\enum_base.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\find_instance.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\forward.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\function.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\function_handle.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\function_object.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\inheritance.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\instance.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\iterator.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\iterator_core.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\life_support.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\make_holder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\make_instance.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\pickle_support.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\pointer_holder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\py_function.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\select_holder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\value_holder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object\value_holder_fwd.hpp
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\arg_from_python.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\args.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\args_fwd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\back_reference.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\base_type_traits.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\bases.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\borrowed.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\call.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\call_method.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\cast.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\class.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\class_fwd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\copy_const_reference.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\copy_non_const_reference.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\data_members.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\def.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\default_call_policies.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\dict.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\enum.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\errors.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\exception_translator.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\extract.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\handle.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\handle_fwd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\has_back_reference.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\implicit.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\init.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\instance_holder.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\iterator.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\list.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\long.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\lvalue_from_pytype.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\make_function.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\manage_new_object.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\module.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\module_init.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\numeric.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_attributes.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_call.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_core.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_fwd.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_items.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_operators.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_protocol.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_protocol_core.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\object_slices.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\operators.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\operators2.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\other.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\overloads.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\pointee.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\proxy.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\ptr.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\refcount.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\reference_existing_object.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\return_internal_reference.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\return_value_policy.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\scope.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\self.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\signature.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\slice_nil.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\str.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\tag.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\to_python_converter.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\to_python_indirect.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\to_python_value.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\tuple.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\type_id.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\boost\python\with_custodian_and_ward.hpp
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/build/VisualStudio/boost_python.dsw b/build/VisualStudio/boost_python.dsw
deleted file mode 100644
index 574c3bf8..00000000
--- a/build/VisualStudio/boost_python.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "boost_python"=".\boost_python.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/build/python_v1.zip b/build/python_v1.zip
deleted file mode 100644
index 0377a07b..00000000
Binary files a/build/python_v1.zip and /dev/null differ
diff --git a/doc/PyConDC_2003/bpl.html b/doc/PyConDC_2003/bpl.html
deleted file mode 100755
index a9ecebd5..00000000
--- a/doc/PyConDC_2003/bpl.html
+++ /dev/null
@@ -1,1127 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.2.8: http://docutils.sourceforge.net/" />
-<title>Building Hybrid Systems with Boost.Python</title>
-<meta name="author" content="David Abrahams" />
-<meta name="organization" content="Boost Consulting" />
-<meta name="date" content="2003-03-19" />
-<meta name="author" content="Ralf W. Grosse-Kunstleve" />
-<meta name="copyright" content="Copyright David Abrahams and Ralf W. Grosse-Kunstleve 2003. All rights reserved" />
-<style type="text/css"><!--
-
-/*
-:Author: David Goodger
-:Contact: goodger@users.sourceforge.net
-:date: $Date$
-:version: $Revision$
-:copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-*/
-
-.first {
-  margin-top: 0 }
-
-.last {
-  margin-bottom: 0 }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-dd {
-  margin-bottom: 0.5em }
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.attention, div.caution, div.danger, div.error, div.hint,
-div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.hint p.admonition-title, div.important p.admonition-title,
-div.note p.admonition-title, div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em }
-
-div.footer, div.header {
-  font-size: smaller }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr {
-  width: 75% }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font-family: serif ;
-  font-size: 100% }
-
-pre.line-block {
-  font-family: serif ;
-  font-size: 100% }
-
-pre.literal-block, pre.doctest-block {
-  margin-left: 2em ;
-  margin-right: 2em ;
-  background-color: #eeeeee }
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option-argument {
-  font-style: italic }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-table {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.citation {
-  border-left: solid thin gray ;
-  padding-left: 0.5ex }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.footnote {
-  border-left: solid thin black ;
-  padding-left: 0.5ex }
-
-td, th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-th.docinfo-name, th.field-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap }
-
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
-  font-size: 100% }
-
-tt {
-  background-color: #eeeeee }
-
-ul.auto-toc {
-  list-style-type: none }
-
---></style>
-</head>
-<body>
-<div class="document" id="building-hybrid-systems-with-boost-python">
-<h1 class="title">Building Hybrid Systems with Boost.Python</h1>
-<table class="docinfo" frame="void" rules="none">
-<col class="docinfo-name" />
-<col class="docinfo-content" />
-<tbody valign="top">
-<tr><th class="docinfo-name">Author:</th>
-<td>David Abrahams</td></tr>
-<tr><th class="docinfo-name">Contact:</th>
-<td><a class="first last reference" href="mailto:dave&#64;boost-consulting.com">dave&#64;boost-consulting.com</a></td></tr>
-<tr><th class="docinfo-name">Organization:</th>
-<td><a class="first last reference" href="http://www.boost-consulting.com">Boost Consulting</a></td></tr>
-<tr><th class="docinfo-name">Date:</th>
-<td>2003-03-19</td></tr>
-<tr><th class="docinfo-name">Author:</th>
-<td>Ralf W. Grosse-Kunstleve</td></tr>
-<tr><th class="docinfo-name">Copyright:</th>
-<td>Copyright David Abrahams and Ralf W. Grosse-Kunstleve 2003. All rights reserved</td></tr>
-</tbody>
-</table>
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
-<ul class="simple">
-<li><a class="reference" href="#abstract" id="id5" name="id5">Abstract</a></li>
-<li><a class="reference" href="#introduction" id="id6" name="id6">Introduction</a></li>
-<li><a class="reference" href="#boost-python-design-goals" id="id7" name="id7">Boost.Python Design Goals</a></li>
-<li><a class="reference" href="#hello-boost-python-world" id="id8" name="id8">Hello Boost.Python World</a></li>
-<li><a class="reference" href="#library-overview" id="id9" name="id9">Library Overview</a><ul>
-<li><a class="reference" href="#exposing-classes" id="id10" name="id10">Exposing Classes</a><ul>
-<li><a class="reference" href="#constructors" id="id11" name="id11">Constructors</a></li>
-<li><a class="reference" href="#data-members-and-properties" id="id12" name="id12">Data Members and Properties</a></li>
-<li><a class="reference" href="#operator-overloading" id="id13" name="id13">Operator Overloading</a></li>
-<li><a class="reference" href="#inheritance" id="id14" name="id14">Inheritance</a></li>
-<li><a class="reference" href="#virtual-functions" id="id15" name="id15">Virtual Functions</a></li>
-<li><a class="reference" href="#deeper-reflection-on-the-horizon" id="id16" name="id16">Deeper Reflection on the Horizon?</a></li>
-</ul>
-</li>
-<li><a class="reference" href="#serialization" id="id17" name="id17">Serialization</a></li>
-<li><a class="reference" href="#object-interface" id="id18" name="id18">Object interface</a></li>
-</ul>
-</li>
-<li><a class="reference" href="#thinking-hybrid" id="id19" name="id19">Thinking hybrid</a></li>
-<li><a class="reference" href="#development-history" id="id20" name="id20">Development history</a></li>
-<li><a class="reference" href="#conclusions" id="id21" name="id21">Conclusions</a></li>
-<li><a class="reference" href="#citations" id="id22" name="id22">Citations</a></li>
-<li><a class="reference" href="#footnotes" id="id23" name="id23">Footnotes</a></li>
-</ul>
-</div>
-<div class="section" id="abstract">
-<h1><a class="toc-backref" href="#id5" name="abstract">Abstract</a></h1>
-<p>Boost.Python is an open source C++ library which provides a concise
-IDL-like interface for binding C++ classes and functions to
-Python. Leveraging the full power of C++ compile-time introspection
-and of recently developed metaprogramming techniques, this is achieved
-entirely in pure C++, without introducing a new syntax.
-Boost.Python's rich set of features and high-level interface make it
-possible to engineer packages from the ground up as hybrid systems,
-giving programmers easy and coherent access to both the efficient
-compile-time polymorphism of C++ and the extremely convenient run-time
-polymorphism of Python.</p>
-</div>
-<div class="section" id="introduction">
-<h1><a class="toc-backref" href="#id6" name="introduction">Introduction</a></h1>
-<p>Python and C++ are in many ways as different as two languages could
-be: while C++ is usually compiled to machine-code, Python is
-interpreted.  Python's dynamic type system is often cited as the
-foundation of its flexibility, while in C++ static typing is the
-cornerstone of its efficiency. C++ has an intricate and difficult
-compile-time meta-language, while in Python, practically everything
-happens at runtime.</p>
-<p>Yet for many programmers, these very differences mean that Python and
-C++ complement one another perfectly.  Performance bottlenecks in
-Python programs can be rewritten in C++ for maximal speed, and
-authors of powerful C++ libraries choose Python as a middleware
-language for its flexible system integration capabilities.
-Furthermore, the surface differences mask some strong similarities:</p>
-<ul class="simple">
-<li>'C'-family control structures (if, while, for...)</li>
-<li>Support for object-orientation, functional programming, and generic
-programming (these are both <em>multi-paradigm</em> programming languages.)</li>
-<li>Comprehensive operator overloading facilities, recognizing the
-importance of syntactic variability for readability and
-expressivity.</li>
-<li>High-level concepts such as collections and iterators.</li>
-<li>High-level encapsulation facilities (C++: namespaces, Python: modules)
-to support the design of re-usable libraries.</li>
-<li>Exception-handling for effective management of error conditions.</li>
-<li>C++ idioms in common use, such as handle/body classes and
-reference-counted smart pointers mirror Python reference semantics.</li>
-</ul>
-<p>Given Python's rich 'C' interoperability API, it should in principle
-be possible to expose C++ type and function interfaces to Python with
-an analogous interface to their C++ counterparts.  However, the
-facilities provided by Python alone for integration with C++ are
-relatively meager.  Compared to C++ and Python, 'C' has only very
-rudimentary abstraction facilities, and support for exception-handling
-is completely missing.  'C' extension module writers are required to
-manually manage Python reference counts, which is both annoyingly
-tedious and extremely error-prone. Traditional extension modules also
-tend to contain a great deal of boilerplate code repetition which
-makes them difficult to maintain, especially when wrapping an evolving
-API.</p>
-<p>These limitations have lead to the development of a variety of wrapping
-systems.  <a class="reference" href="http://www.swig.org/">SWIG</a> is probably the most popular package for the
-integration of C/C++ and Python. A more recent development is <a class="reference" href="http://www.riverbankcomputing.co.uk/sip/index.php">SIP</a>,
-which was specifically designed for interfacing Python with the <a class="reference" href="http://www.trolltech.com/">Qt</a>
-graphical user interface library.  Both SWIG and SIP introduce their
-own specialized languages for customizing inter-language bindings.
-This has certain advantages, but having to deal with three different
-languages (Python, C/C++ and the interface language) also introduces
-practical and mental difficulties.  The <a class="reference" href="http://cxx.sourceforge.net/">CXX</a> package demonstrates an
-interesting alternative.  It shows that at least some parts of
-Python's 'C' API can be wrapped and presented through a much more
-user-friendly C++ interface. However, unlike SWIG and SIP, CXX does
-not include support for wrapping C++ classes as new Python types.</p>
-<p>The features and goals of <a class="reference" href="http://www.boost.org/libs/python/doc">Boost.Python</a> overlap significantly with
-many of these other systems.  That said, Boost.Python attempts to
-maximize convenience and flexibility without introducing a separate
-wrapping language.  Instead, it presents the user with a high-level
-C++ interface for wrapping C++ classes and functions, managing much of
-the complexity behind-the-scenes with static metaprogramming.
-Boost.Python also goes beyond the scope of earlier systems by
-providing:</p>
-<ul class="simple">
-<li>Support for C++ virtual functions that can be overridden in Python.</li>
-<li>Comprehensive lifetime management facilities for low-level C++
-pointers and references.</li>
-<li>Support for organizing extensions as Python packages,
-with a central registry for inter-language type conversions.</li>
-<li>A safe and convenient mechanism for tying into Python's powerful
-serialization engine (pickle).</li>
-<li>Coherence with the rules for handling C++ lvalues and rvalues that
-can only come from a deep understanding of both the Python and C++
-type systems.</li>
-</ul>
-<p>The key insight that sparked the development of Boost.Python is that
-much of the boilerplate code in traditional extension modules could be
-eliminated using C++ compile-time introspection.  Each argument of a
-wrapped C++ function must be extracted from a Python object using a
-procedure that depends on the argument type.  Similarly the function's
-return type determines how the return value will be converted from C++
-to Python.  Of course argument and return types are part of each
-function's type, and this is exactly the source from which
-Boost.Python deduces most of the information required.</p>
-<p>This approach leads to <em>user guided wrapping</em>: as much information is
-extracted directly from the source code to be wrapped as is possible
-within the framework of pure C++, and some additional information is
-supplied explicitly by the user.  Mostly the guidance is mechanical
-and little real intervention is required.  Because the interface
-specification is written in the same full-featured language as the
-code being exposed, the user has unprecedented power available when
-she does need to take control.</p>
-</div>
-<div class="section" id="boost-python-design-goals">
-<h1><a class="toc-backref" href="#id7" name="boost-python-design-goals">Boost.Python Design Goals</a></h1>
-<p>The primary goal of Boost.Python is to allow users to expose C++
-classes and functions to Python using nothing more than a C++
-compiler.  In broad strokes, the user experience should be one of
-directly manipulating C++ objects from Python.</p>
-<p>However, it's also important not to translate all interfaces <em>too</em>
-literally: the idioms of each language must be respected.  For
-example, though C++ and Python both have an iterator concept, they are
-expressed very differently.  Boost.Python has to be able to bridge the
-interface gap.</p>
-<p>It must be possible to insulate Python users from crashes resulting
-from trivial misuses of C++ interfaces, such as accessing
-already-deleted objects.  By the same token the library should
-insulate C++ users from low-level Python 'C' API, replacing
-error-prone 'C' interfaces like manual reference-count management and
-raw <tt class="literal"><span class="pre">PyObject</span></tt> pointers with more-robust alternatives.</p>
-<p>Support for component-based development is crucial, so that C++ types
-exposed in one extension module can be passed to functions exposed in
-another without loss of crucial information like C++ inheritance
-relationships.</p>
-<p>Finally, all wrapping must be <em>non-intrusive</em>, without modifying or
-even seeing the original C++ source code.  Existing C++ libraries have
-to be wrappable by third parties who only have access to header files
-and binaries.</p>
-</div>
-<div class="section" id="hello-boost-python-world">
-<h1><a class="toc-backref" href="#id8" name="hello-boost-python-world">Hello Boost.Python World</a></h1>
-<p>And now for a preview of Boost.Python, and how it improves on the raw
-facilities offered by Python. Here's a function we might want to
-expose:</p>
-<pre class="literal-block">
-char const* greet(unsigned x)
-{
-   static char const* const msgs[] = { &quot;hello&quot;, &quot;Boost.Python&quot;, &quot;world!&quot; };
-
-   if (x &gt; 2) 
-       throw std::range_error(&quot;greet: index out of range&quot;);
-
-   return msgs[x];
-}
-</pre>
-<p>To wrap this function in standard C++ using the Python 'C' API, we'd
-need something like this:</p>
-<pre class="literal-block">
-extern &quot;C&quot; // all Python interactions use 'C' linkage and calling convention
-{
-    // Wrapper to handle argument/result conversion and checking
-    PyObject* greet_wrap(PyObject* args, PyObject * keywords)
-    {
-         int x;
-         if (PyArg_ParseTuple(args, &quot;i&quot;, &amp;x))    // extract/check arguments
-         {
-             char const* result = greet(x);      // invoke wrapped function
-             return PyString_FromString(result); // convert result to Python
-         }
-         return 0;                               // error occurred
-    }
-
-    // Table of wrapped functions to be exposed by the module
-    static PyMethodDef methods[] = {
-        { &quot;greet&quot;, greet_wrap, METH_VARARGS, &quot;return one of 3 parts of a greeting&quot; }
-        , { NULL, NULL, 0, NULL } // sentinel
-    };
-
-    // module initialization function
-    DL_EXPORT init_hello()
-    {
-        (void) Py_InitModule(&quot;hello&quot;, methods); // add the methods to the module
-    }
-}
-</pre>
-<p>Now here's the wrapping code we'd use to expose it with Boost.Python:</p>
-<pre class="literal-block">
-#include &lt;boost/python.hpp&gt;
-using namespace boost::python;
-BOOST_PYTHON_MODULE(hello)
-{
-    def(&quot;greet&quot;, greet, &quot;return one of 3 parts of a greeting&quot;);
-}
-</pre>
-<p>and here it is in action:</p>
-<pre class="literal-block">
-&gt;&gt;&gt; import hello
-&gt;&gt;&gt; for x in range(3):
-...     print hello.greet(x)
-...
-hello
-Boost.Python
-world!
-</pre>
-<p>Aside from the fact that the 'C' API version is much more verbose,
-it's worth noting a few things that it doesn't handle correctly:</p>
-<ul class="simple">
-<li>The original function accepts an unsigned integer, and the Python
-'C' API only gives us a way of extracting signed integers. The
-Boost.Python version will raise a Python exception if we try to pass
-a negative number to <tt class="literal"><span class="pre">hello.greet</span></tt>, but the other one will proceed
-to do whatever the C++ implementation does when converting an
-negative integer to unsigned (usually wrapping to some very large
-number), and pass the incorrect translation on to the wrapped
-function.</li>
-<li>That brings us to the second problem: if the C++ <tt class="literal"><span class="pre">greet()</span></tt>
-function is called with a number greater than 2, it will throw an
-exception.  Typically, if a C++ exception propagates across the
-boundary with code generated by a 'C' compiler, it will cause a
-crash.  As you can see in the first version, there's no C++
-scaffolding there to prevent this from happening.  Functions wrapped
-by Boost.Python automatically include an exception-handling layer
-which protects Python users by translating unhandled C++ exceptions
-into a corresponding Python exception.</li>
-<li>A slightly more-subtle limitation is that the argument conversion
-used in the Python 'C' API case can only get that integer <tt class="literal"><span class="pre">x</span></tt> in
-<em>one way</em>.  PyArg_ParseTuple can't convert Python <tt class="literal"><span class="pre">long</span></tt> objects
-(arbitrary-precision integers) which happen to fit in an <tt class="literal"><span class="pre">unsigned</span>
-<span class="pre">int</span></tt> but not in a <tt class="literal"><span class="pre">signed</span> <span class="pre">long</span></tt>, nor will it ever handle a
-wrapped C++ class with a user-defined implicit <tt class="literal"><span class="pre">operator</span> <span class="pre">unsigned</span>
-<span class="pre">int()</span></tt> conversion. Boost.Python's dynamic type conversion
-registry allows users to add arbitrary conversion methods.</li>
-</ul>
-</div>
-<div class="section" id="library-overview">
-<h1><a class="toc-backref" href="#id9" name="library-overview">Library Overview</a></h1>
-<p>This section outlines some of the library's major features.  Except as
-neccessary to avoid confusion, details of library implementation are
-omitted.</p>
-<div class="section" id="exposing-classes">
-<h2><a class="toc-backref" href="#id10" name="exposing-classes">Exposing Classes</a></h2>
-<p>C++ classes and structs are exposed with a similarly-terse interface.
-Given:</p>
-<pre class="literal-block">
-struct World
-{
-    void set(std::string msg) { this-&gt;msg = msg; }
-    std::string greet() { return msg; }
-    std::string msg;
-};
-</pre>
-<p>The following code will expose it in our extension module:</p>
-<pre class="literal-block">
-#include &lt;boost/python.hpp&gt;
-BOOST_PYTHON_MODULE(hello)
-{
-    class_&lt;World&gt;(&quot;World&quot;)
-        .def(&quot;greet&quot;, &amp;World::greet)
-        .def(&quot;set&quot;, &amp;World::set)
-    ;
-}
-</pre>
-<p>Although this code has a certain pythonic familiarity, people
-sometimes find the syntax bit confusing because it doesn't look like
-most of the C++ code they're used to. All the same, this is just
-standard C++.  Because of their flexible syntax and operator
-overloading, C++ and Python are great for defining domain-specific
-(sub)languages
-(DSLs), and that's what we've done in Boost.Python. To break it down:</p>
-<pre class="literal-block">
-class_&lt;World&gt;(&quot;World&quot;)
-</pre>
-<p>constructs an unnamed object of type <tt class="literal"><span class="pre">class_&lt;World&gt;</span></tt> and passes
-<tt class="literal"><span class="pre">&quot;World&quot;</span></tt> to its constructor.  This creates a new-style Python class
-called <tt class="literal"><span class="pre">World</span></tt> in the extension module, and associates it with the
-C++ type <tt class="literal"><span class="pre">World</span></tt> in the Boost.Python type conversion registry.  We
-might have also written:</p>
-<pre class="literal-block">
-class_&lt;World&gt; w(&quot;World&quot;);
-</pre>
-<p>but that would've been more verbose, since we'd have to name <tt class="literal"><span class="pre">w</span></tt>
-again to invoke its <tt class="literal"><span class="pre">def()</span></tt> member function:</p>
-<pre class="literal-block">
-w.def(&quot;greet&quot;, &amp;World::greet)
-</pre>
-<p>There's nothing special about the location of the dot for member
-access in the original example: C++ allows any amount of whitespace on
-either side of a token, and placing the dot at the beginning of each
-line allows us to chain as many successive calls to member functions
-as we like with a uniform syntax.  The other key fact that allows
-chaining is that <tt class="literal"><span class="pre">class_&lt;&gt;</span></tt> member functions all return a reference
-to <tt class="literal"><span class="pre">*this</span></tt>.</p>
-<p>So the example is equivalent to:</p>
-<pre class="literal-block">
-class_&lt;World&gt; w(&quot;World&quot;);
-w.def(&quot;greet&quot;, &amp;World::greet);
-w.def(&quot;set&quot;, &amp;World::set);
-</pre>
-<p>It's occasionally useful to be able to break down the components of a
-Boost.Python class wrapper in this way, but the rest of this article
-will stick to the terse syntax.</p>
-<p>For completeness, here's the wrapped class in use:</p>
-<pre class="literal-block">
-&gt;&gt;&gt; import hello
-&gt;&gt;&gt; planet = hello.World()
-&gt;&gt;&gt; planet.set('howdy')
-&gt;&gt;&gt; planet.greet()
-'howdy'
-</pre>
-<div class="section" id="constructors">
-<h3><a class="toc-backref" href="#id11" name="constructors">Constructors</a></h3>
-<p>Since our <tt class="literal"><span class="pre">World</span></tt> class is just a plain <tt class="literal"><span class="pre">struct</span></tt>, it has an
-implicit no-argument (nullary) constructor.  Boost.Python exposes the
-nullary constructor by default, which is why we were able to write:</p>
-<pre class="literal-block">
-&gt;&gt;&gt; planet = hello.World()
-</pre>
-<p>However, well-designed classes in any language may require constructor
-arguments in order to establish their invariants.  Unlike Python,
-where <tt class="literal"><span class="pre">__init__</span></tt> is just a specially-named method, In C++
-constructors cannot be handled like ordinary member functions.  In
-particular, we can't take their address: <tt class="literal"><span class="pre">&amp;World::World</span></tt> is an
-error.  The library provides a different interface for specifying
-constructors.  Given:</p>
-<pre class="literal-block">
-struct World
-{
-    World(std::string msg); // added constructor
-    ...
-</pre>
-<p>we can modify our wrapping code as follows:</p>
-<pre class="literal-block">
-class_&lt;World&gt;(&quot;World&quot;, init&lt;std::string&gt;())
-    ...
-</pre>
-<p>of course, a C++ class may have additional constructors, and we can
-expose those as well by passing more instances of <tt class="literal"><span class="pre">init&lt;...&gt;</span></tt> to
-<tt class="literal"><span class="pre">def()</span></tt>:</p>
-<pre class="literal-block">
-class_&lt;World&gt;(&quot;World&quot;, init&lt;std::string&gt;())
-    .def(init&lt;double, double&gt;())
-    ...
-</pre>
-<p>Boost.Python allows wrapped functions, member functions, and
-constructors to be overloaded to mirror C++ overloading.</p>
-</div>
-<div class="section" id="data-members-and-properties">
-<h3><a class="toc-backref" href="#id12" name="data-members-and-properties">Data Members and Properties</a></h3>
-<p>Any publicly-accessible data members in a C++ class can be easily
-exposed as either <tt class="literal"><span class="pre">readonly</span></tt> or <tt class="literal"><span class="pre">readwrite</span></tt> attributes:</p>
-<pre class="literal-block">
-class_&lt;World&gt;(&quot;World&quot;, init&lt;std::string&gt;())
-    .def_readonly(&quot;msg&quot;, &amp;World::msg)
-    ...
-</pre>
-<p>and can be used directly in Python:</p>
-<pre class="literal-block">
-&gt;&gt;&gt; planet = hello.World('howdy')
-&gt;&gt;&gt; planet.msg
-'howdy'
-</pre>
-<p>This does <em>not</em> result in adding attributes to the <tt class="literal"><span class="pre">World</span></tt> instance
-<tt class="literal"><span class="pre">__dict__</span></tt>, which can result in substantial memory savings when
-wrapping large data structures.  In fact, no instance <tt class="literal"><span class="pre">__dict__</span></tt>
-will be created at all unless attributes are explicitly added from
-Python. Boost.Python owes this capability to the new Python 2.2 type
-system, in particular the descriptor interface and <tt class="literal"><span class="pre">property</span></tt> type.</p>
-<p>In C++, publicly-accessible data members are considered a sign of poor
-design because they break encapsulation, and style guides usually
-dictate the use of &quot;getter&quot; and &quot;setter&quot; functions instead.  In
-Python, however, <tt class="literal"><span class="pre">__getattr__</span></tt>, <tt class="literal"><span class="pre">__setattr__</span></tt>, and since 2.2,
-<tt class="literal"><span class="pre">property</span></tt> mean that attribute access is just one more
-well-encapsulated syntactic tool at the programmer's disposal.
-Boost.Python bridges this idiomatic gap by making Python <tt class="literal"><span class="pre">property</span></tt>
-creation directly available to users.  If <tt class="literal"><span class="pre">msg</span></tt> were private, we
-could still expose it as attribute in Python as follows:</p>
-<pre class="literal-block">
-class_&lt;World&gt;(&quot;World&quot;, init&lt;std::string&gt;())
-    .add_property(&quot;msg&quot;, &amp;World::greet, &amp;World::set)
-    ...
-</pre>
-<p>The example above mirrors the familiar usage of properties in Python
-2.2+:</p>
-<pre class="literal-block">
-&gt;&gt;&gt; class World(object):
-...     __init__(self, msg):
-...         self.__msg = msg
-...     def greet(self):
-...         return self.__msg
-...     def set(self, msg):
-...         self.__msg = msg
-...     msg = property(greet, set)
-</pre>
-</div>
-<div class="section" id="operator-overloading">
-<h3><a class="toc-backref" href="#id13" name="operator-overloading">Operator Overloading</a></h3>
-<p>The ability to write arithmetic operators for user-defined types has
-been a major factor in the success of both languages for numerical
-computation, and the success of packages like <a class="reference" href="http://www.pfdubois.com/numpy/">NumPy</a> attests to the
-power of exposing operators in extension modules.  Boost.Python
-provides a concise mechanism for wrapping operator overloads. The
-example below shows a fragment from a wrapper for the Boost rational
-number library:</p>
-<pre class="literal-block">
-class_&lt;rational&lt;int&gt; &gt;(&quot;rational_int&quot;)
-  .def(init&lt;int, int&gt;()) // constructor, e.g. rational_int(3,4)
-  .def(&quot;numerator&quot;, &amp;rational&lt;int&gt;::numerator)
-  .def(&quot;denominator&quot;, &amp;rational&lt;int&gt;::denominator)
-  .def(-self)        // __neg__ (unary minus)
-  .def(self + self)  // __add__ (homogeneous)
-  .def(self * self)  // __mul__
-  .def(self + int()) // __add__ (heterogenous)
-  .def(int() + self) // __radd__
-  ...
-</pre>
-<p>The magic is performed using a simplified application of &quot;expression
-templates&quot; <a class="citation-reference" href="#veld1995" id="id1" name="id1">[VELD1995]</a>, a technique originally developed for
-optimization of high-performance matrix algebra expressions.  The
-essence is that instead of performing the computation immediately,
-operators are overloaded to construct a type <em>representing</em> the
-computation.  In matrix algebra, dramatic optimizations are often
-available when the structure of an entire expression can be taken into
-account, rather than evaluating each operation &quot;greedily&quot;.
-Boost.Python uses the same technique to build an appropriate Python
-method object based on expressions involving <tt class="literal"><span class="pre">self</span></tt>.</p>
-</div>
-<div class="section" id="inheritance">
-<h3><a class="toc-backref" href="#id14" name="inheritance">Inheritance</a></h3>
-<p>C++ inheritance relationships can be represented to Boost.Python by adding
-an optional <tt class="literal"><span class="pre">bases&lt;...&gt;</span></tt> argument to the <tt class="literal"><span class="pre">class_&lt;...&gt;</span></tt> template
-parameter list as follows:</p>
-<pre class="literal-block">
-class_&lt;Derived, bases&lt;Base1,Base2&gt; &gt;(&quot;Derived&quot;)
-     ...
-</pre>
-<p>This has two effects:</p>
-<ol class="arabic simple">
-<li>When the <tt class="literal"><span class="pre">class_&lt;...&gt;</span></tt> is created, Python type objects
-corresponding to <tt class="literal"><span class="pre">Base1</span></tt> and <tt class="literal"><span class="pre">Base2</span></tt> are looked up in
-Boost.Python's registry, and are used as bases for the new Python
-<tt class="literal"><span class="pre">Derived</span></tt> type object, so methods exposed for the Python <tt class="literal"><span class="pre">Base1</span></tt>
-and <tt class="literal"><span class="pre">Base2</span></tt> types are automatically members of the <tt class="literal"><span class="pre">Derived</span></tt>
-type.  Because the registry is global, this works correctly even if
-<tt class="literal"><span class="pre">Derived</span></tt> is exposed in a different module from either of its
-bases.</li>
-<li>C++ conversions from <tt class="literal"><span class="pre">Derived</span></tt> to its bases are added to the
-Boost.Python registry.  Thus wrapped C++ methods expecting (a
-pointer or reference to) an object of either base type can be
-called with an object wrapping a <tt class="literal"><span class="pre">Derived</span></tt> instance.  Wrapped
-member functions of class <tt class="literal"><span class="pre">T</span></tt> are treated as though they have an
-implicit first argument of <tt class="literal"><span class="pre">T&amp;</span></tt>, so these conversions are
-neccessary to allow the base class methods to be called for derived
-objects.</li>
-</ol>
-<p>Of course it's possible to derive new Python classes from wrapped C++
-class instances.  Because Boost.Python uses the new-style class
-system, that works very much as for the Python built-in types.  There
-is one significant detail in which it differs: the built-in types
-generally establish their invariants in their <tt class="literal"><span class="pre">__new__</span></tt> function, so
-that derived classes do not need to call <tt class="literal"><span class="pre">__init__</span></tt> on the base
-class before invoking its methods :</p>
-<pre class="literal-block">
-&gt;&gt;&gt; class L(list):
-...      def __init__(self):
-...          pass
-...
-&gt;&gt;&gt; L().reverse()
-&gt;&gt;&gt; 
-</pre>
-<p>Because C++ object construction is a one-step operation, C++ instance
-data cannot be constructed until the arguments are available, in the
-<tt class="literal"><span class="pre">__init__</span></tt> function:</p>
-<pre class="literal-block">
-&gt;&gt;&gt; class D(SomeBoostPythonClass):
-...      def __init__(self):
-...          pass
-...
-&gt;&gt;&gt; D().some_boost_python_method()
-Traceback (most recent call last):
-  File &quot;&lt;stdin&gt;&quot;, line 1, in ?
-TypeError: bad argument type for built-in operation
-</pre>
-<p>This happened because Boost.Python couldn't find instance data of type
-<tt class="literal"><span class="pre">SomeBoostPythonClass</span></tt> within the <tt class="literal"><span class="pre">D</span></tt> instance; <tt class="literal"><span class="pre">D</span></tt>'s <tt class="literal"><span class="pre">__init__</span></tt>
-function masked construction of the base class.  It could be corrected
-by either removing <tt class="literal"><span class="pre">D</span></tt>'s <tt class="literal"><span class="pre">__init__</span></tt> function or having it call
-<tt class="literal"><span class="pre">SomeBoostPythonClass.__init__(...)</span></tt> explicitly.</p>
-</div>
-<div class="section" id="virtual-functions">
-<h3><a class="toc-backref" href="#id15" name="virtual-functions">Virtual Functions</a></h3>
-<p>Deriving new types in Python from extension classes is not very
-interesting unless they can be used polymorphically from C++.  In
-other words, Python method implementations should appear to override
-the implementation of C++ virtual functions when called <em>through base
-class pointers/references from C++</em>.  Since the only way to alter the
-behavior of a virtual function is to override it in a derived class,
-the user must build a special derived class to dispatch a polymorphic
-class' virtual functions:</p>
-<pre class="literal-block">
-//
-// interface to wrap:
-//
-class Base
-{
- public:
-    virtual int f(std::string x) { return 42; }
-    virtual ~Base();
-};
-
-int calls_f(Base const&amp; b, std::string x) { return b.f(x); }
-
-//
-// Wrapping Code
-//
-
-// Dispatcher class
-struct BaseWrap : Base
-{
-    // Store a pointer to the Python object
-    BaseWrap(PyObject* self_) : self(self_) {}
-    PyObject* self;
-
-    // Default implementation, for when f is not overridden
-    int f_default(std::string x) { return this-&gt;Base::f(x); }
-    // Dispatch implementation
-    int f(std::string x) { return call_method&lt;int&gt;(self, &quot;f&quot;, x); }
-};
-
-...
-    def(&quot;calls_f&quot;, calls_f);
-    class_&lt;Base, BaseWrap&gt;(&quot;Base&quot;)
-        .def(&quot;f&quot;, &amp;Base::f, &amp;BaseWrap::f_default)
-        ;
-</pre>
-<p>Now here's some Python code which demonstrates:</p>
-<pre class="literal-block">
-&gt;&gt;&gt; class Derived(Base):
-...     def f(self, s):
-...          return len(s)
-...
-&gt;&gt;&gt; calls_f(Base(), 'foo')
-42
-&gt;&gt;&gt; calls_f(Derived(), 'forty-two')
-9
-</pre>
-<p>Things to notice about the dispatcher class:</p>
-<ul class="simple">
-<li>The key element which allows overriding in Python is the
-<tt class="literal"><span class="pre">call_method</span></tt> invocation, which uses the same global type
-conversion registry as the C++ function wrapping does to convert its
-arguments from C++ to Python and its return type from Python to C++.</li>
-<li>Any constructor signatures you wish to wrap must be replicated with
-an initial <tt class="literal"><span class="pre">PyObject*</span></tt> argument</li>
-<li>The dispatcher must store this argument so that it can be used to
-invoke <tt class="literal"><span class="pre">call_method</span></tt></li>
-<li>The <tt class="literal"><span class="pre">f_default</span></tt> member function is needed when the function being
-exposed is not pure virtual; there's no other way <tt class="literal"><span class="pre">Base::f</span></tt> can be
-called on an object of type <tt class="literal"><span class="pre">BaseWrap</span></tt>, since it overrides <tt class="literal"><span class="pre">f</span></tt>.</li>
-</ul>
-</div>
-<div class="section" id="deeper-reflection-on-the-horizon">
-<h3><a class="toc-backref" href="#id16" name="deeper-reflection-on-the-horizon">Deeper Reflection on the Horizon?</a></h3>
-<p>Admittedly, this formula is tedious to repeat, especially on a project
-with many polymorphic classes.  That it is neccessary reflects some
-limitations in C++'s compile-time introspection capabilities: there's
-no way to enumerate the members of a class and find out which are
-virtual functions.  At least one very promising project has been
-started to write a front-end which can generate these dispatchers (and
-other wrapping code) automatically from C++ headers.</p>
-<p><a class="reference" href="http://www.boost.org/libs/python/pyste">Pyste</a> is being developed by Bruno da Silva de Oliveira.  It builds on
-<a class="reference" href="http://www.gccxml.org/HTML/Index.html">GCC_XML</a>, which generates an XML version of GCC's internal program
-representation.  Since GCC is a highly-conformant C++ compiler, this
-ensures correct handling of the most-sophisticated template code and
-full access to the underlying type system.  In keeping with the
-Boost.Python philosophy, a Pyste interface description is neither
-intrusive on the code being wrapped, nor expressed in some unfamiliar
-language: instead it is a 100% pure Python script.  If Pyste is
-successful it will mark a move away from wrapping everything directly
-in C++ for many of our users.  It will also allow us the choice to
-shift some of the metaprogram code from C++ to Python.  We expect that
-soon, not only our users but the Boost.Python developers themselves
-will be &quot;thinking hybrid&quot; about their own code.</p>
-</div>
-</div>
-<div class="section" id="serialization">
-<h2><a class="toc-backref" href="#id17" name="serialization">Serialization</a></h2>
-<p><em>Serialization</em> is the process of converting objects in memory to a
-form that can be stored on disk or sent over a network connection. The
-serialized object (most often a plain string) can be retrieved and
-converted back to the original object. A good serialization system will
-automatically convert entire object hierarchies. Python's standard
-<tt class="literal"><span class="pre">pickle</span></tt> module is just such a system.  It leverages the language's strong
-runtime introspection facilities for serializing practically arbitrary
-user-defined objects. With a few simple and unintrusive provisions this
-powerful machinery can be extended to also work for wrapped C++ objects.
-Here is an example:</p>
-<pre class="literal-block">
-#include &lt;string&gt;
-
-struct World
-{
-    World(std::string a_msg) : msg(a_msg) {}
-    std::string greet() const { return msg; }
-    std::string msg;
-};
-
-#include &lt;boost/python.hpp&gt;
-using namespace boost::python;
-
-struct World_picklers : pickle_suite
-{
-  static tuple
-  getinitargs(World const&amp; w) { return make_tuple(w.greet()); }
-};
-
-BOOST_PYTHON_MODULE(hello)
-{
-    class_&lt;World&gt;(&quot;World&quot;, init&lt;std::string&gt;())
-        .def(&quot;greet&quot;, &amp;World::greet)
-        .def_pickle(World_picklers())
-    ;
-}
-</pre>
-<p>Now let's create a <tt class="literal"><span class="pre">World</span></tt> object and put it to rest on disk:</p>
-<pre class="literal-block">
-&gt;&gt;&gt; import hello
-&gt;&gt;&gt; import pickle
-&gt;&gt;&gt; a_world = hello.World(&quot;howdy&quot;)
-&gt;&gt;&gt; pickle.dump(a_world, open(&quot;my_world&quot;, &quot;w&quot;))
-</pre>
-<p>In a potentially <em>different script</em> on a potentially <em>different
-computer</em> with a potentially <em>different operating system</em>:</p>
-<pre class="literal-block">
-&gt;&gt;&gt; import pickle
-&gt;&gt;&gt; resurrected_world = pickle.load(open(&quot;my_world&quot;, &quot;r&quot;))
-&gt;&gt;&gt; resurrected_world.greet()
-'howdy'
-</pre>
-<p>Of course the <tt class="literal"><span class="pre">cPickle</span></tt> module can also be used for faster
-processing.</p>
-<p>Boost.Python's <tt class="literal"><span class="pre">pickle_suite</span></tt> fully supports the <tt class="literal"><span class="pre">pickle</span></tt> protocol
-defined in the standard Python documentation. Like a __getinitargs__
-function in Python, the pickle_suite's getinitargs() is responsible for
-creating the argument tuple that will be use to reconstruct the pickled
-object.  The other elements of the Python pickling protocol,
-__getstate__ and __setstate__ can be optionally provided via C++
-getstate and setstate functions.  C++'s static type system allows the
-library to ensure at compile-time that nonsensical combinations of
-functions (e.g. getstate without setstate) are not used.</p>
-<p>Enabling serialization of more complex C++ objects requires a little
-more work than is shown in the example above. Fortunately the
-<tt class="literal"><span class="pre">object</span></tt> interface (see next section) greatly helps in keeping the
-code manageable.</p>
-</div>
-<div class="section" id="object-interface">
-<h2><a class="toc-backref" href="#id18" name="object-interface">Object interface</a></h2>
-<p>Experienced 'C' language extension module authors will be familiar
-with the ubiquitous <tt class="literal"><span class="pre">PyObject*</span></tt>, manual reference-counting, and the
-need to remember which API calls return &quot;new&quot; (owned) references or
-&quot;borrowed&quot; (raw) references.  These constraints are not just
-cumbersome but also a major source of errors, especially in the
-presence of exceptions.</p>
-<p>Boost.Python provides a class <tt class="literal"><span class="pre">object</span></tt> which automates reference
-counting and provides conversion to Python from C++ objects of
-arbitrary type.  This significantly reduces the learning effort for
-prospective extension module writers.</p>
-<p>Creating an <tt class="literal"><span class="pre">object</span></tt> from any other type is extremely simple:</p>
-<pre class="literal-block">
-object s(&quot;hello, world&quot;);  // s manages a Python string
-</pre>
-<p><tt class="literal"><span class="pre">object</span></tt> has templated interactions with all other types, with
-automatic to-python conversions. It happens so naturally that it's
-easily overlooked:</p>
-<pre class="literal-block">
-object ten_Os = 10 * s[4]; // -&gt; &quot;oooooooooo&quot;
-</pre>
-<p>In the example above, <tt class="literal"><span class="pre">4</span></tt> and <tt class="literal"><span class="pre">10</span></tt> are converted to Python objects
-before the indexing and multiplication operations are invoked.</p>
-<p>The <tt class="literal"><span class="pre">extract&lt;T&gt;</span></tt> class template can be used to convert Python objects
-to C++ types:</p>
-<pre class="literal-block">
-double x = extract&lt;double&gt;(o);
-</pre>
-<p>If a conversion in either direction cannot be performed, an
-appropriate exception is thrown at runtime.</p>
-<p>The <tt class="literal"><span class="pre">object</span></tt> type is accompanied by a set of derived types
-that mirror the Python built-in types such as <tt class="literal"><span class="pre">list</span></tt>, <tt class="literal"><span class="pre">dict</span></tt>,
-<tt class="literal"><span class="pre">tuple</span></tt>, etc. as much as possible. This enables convenient
-manipulation of these high-level types from C++:</p>
-<pre class="literal-block">
-dict d;
-d[&quot;some&quot;] = &quot;thing&quot;;
-d[&quot;lucky_number&quot;] = 13;
-list l = d.keys();
-</pre>
-<p>This almost looks and works like regular Python code, but it is pure
-C++.  Of course we can wrap C++ functions which accept or return
-<tt class="literal"><span class="pre">object</span></tt> instances.</p>
-</div>
-</div>
-<div class="section" id="thinking-hybrid">
-<h1><a class="toc-backref" href="#id19" name="thinking-hybrid">Thinking hybrid</a></h1>
-<p>Because of the practical and mental difficulties of combining
-programming languages, it is common to settle a single language at the
-outset of any development effort.  For many applications, performance
-considerations dictate the use of a compiled language for the core
-algorithms.  Unfortunately, due to the complexity of the static type
-system, the price we pay for runtime performance is often a
-significant increase in development time.  Experience shows that
-writing maintainable C++ code usually takes longer and requires <em>far</em>
-more hard-earned working experience than developing comparable Python
-code.  Even when developers are comfortable working exclusively in
-compiled languages, they often augment their systems by some type of
-ad hoc scripting layer for the benefit of their users without ever
-availing themselves of the same advantages.</p>
-<p>Boost.Python enables us to <em>think hybrid</em>.  Python can be used for
-rapidly prototyping a new application; its ease of use and the large
-pool of standard libraries give us a head start on the way to a
-working system.  If necessary, the working code can be used to
-discover rate-limiting hotspots.  To maximize performance these can
-be reimplemented in C++, together with the Boost.Python bindings
-needed to tie them back into the existing higher-level procedure.</p>
-<p>Of course, this <em>top-down</em> approach is less attractive if it is clear
-from the start that many algorithms will eventually have to be
-implemented in C++.  Fortunately Boost.Python also enables us to
-pursue a <em>bottom-up</em> approach.  We have used this approach very
-successfully in the development of a toolbox for scientific
-applications.  The toolbox started out mainly as a library of C++
-classes with Boost.Python bindings, and for a while the growth was
-mainly concentrated on the C++ parts.  However, as the toolbox is
-becoming more complete, more and more newly added functionality can be
-implemented in Python.</p>
-<p><img alt="python_cpp_mix.jpg" src="python_cpp_mix.jpg" /></p>
-<p>This figure shows the estimated ratio of newly added C++ and Python
-code over time as new algorithms are implemented.  We expect this
-ratio to level out near 70% Python.  Being able to solve new problems
-mostly in Python rather than a more difficult statically typed
-language is the return on our investment in Boost.Python.  The ability
-to access all of our code from Python allows a broader group of
-developers to use it in the rapid development of new applications.</p>
-</div>
-<div class="section" id="development-history">
-<h1><a class="toc-backref" href="#id20" name="development-history">Development history</a></h1>
-<p>The first version of Boost.Python was developed in 2000 by Dave
-Abrahams at Dragon Systems, where he was privileged to have Tim Peters
-as a guide to &quot;The Zen of Python&quot;.  One of Dave's jobs was to develop
-a Python-based natural language processing system.  Since it was
-eventually going to be targeting embedded hardware, it was always
-assumed that the compute-intensive core would be rewritten in C++ to
-optimize speed and memory footprint <a class="footnote-reference" href="#proto" id="id2" name="id2"><sup>1</sup></a>.  The project also wanted to
-test all of its C++ code using Python test scripts <a class="footnote-reference" href="#test" id="id3" name="id3"><sup>2</sup></a>.  The only
-tool we knew of for binding C++ and Python was <a class="reference" href="http://www.swig.org/">SWIG</a>, and at the time
-its handling of C++ was weak.  It would be false to claim any deep
-insight into the possible advantages of Boost.Python's approach at
-this point.  Dave's interest and expertise in fancy C++ template
-tricks had just reached the point where he could do some real damage,
-and Boost.Python emerged as it did because it filled a need and
-because it seemed like a cool thing to try.</p>
-<p>This early version was aimed at many of the same basic goals we've
-described in this paper, differing most-noticeably by having a
-slightly more cumbersome syntax and by lack of special support for
-operator overloading, pickling, and component-based development.
-These last three features were quickly added by Ullrich Koethe and
-Ralf Grosse-Kunstleve <a class="footnote-reference" href="#feature" id="id4" name="id4"><sup>3</sup></a>, and other enthusiastic contributors arrived
-on the scene to contribute enhancements like support for nested
-modules and static member functions.</p>
-<p>By early 2001 development had stabilized and few new features were
-being added, however a disturbing new fact came to light: Ralf had
-begun testing Boost.Python on pre-release versions of a compiler using
-the <a class="reference" href="http://www.edg.com">EDG</a> front-end, and the mechanism at the core of Boost.Python
-responsible for handling conversions between Python and C++ types was
-failing to compile.  As it turned out, we had been exploiting a very
-common bug in the implementation of all the C++ compilers we had
-tested.  We knew that as C++ compilers rapidly became more
-standards-compliant, the library would begin failing on more
-platforms.  Unfortunately, because the mechanism was so central to the
-functioning of the library, fixing the problem looked very difficult.</p>
-<p>Fortunately, later that year Lawrence Berkeley and later Lawrence
-Livermore National labs contracted with <a class="reference" href="http://www.boost-consulting.com">Boost Consulting</a> for support
-and development of Boost.Python, and there was a new opportunity to
-address fundamental issues and ensure a future for the library.  A
-redesign effort began with the low level type conversion architecture,
-building in standards-compliance and support for component-based
-development (in contrast to version 1 where conversions had to be
-explicitly imported and exported across module boundaries).  A new
-analysis of the relationship between the Python and C++ objects was
-done, resulting in more intuitive handling for C++ lvalues and
-rvalues.</p>
-<p>The emergence of a powerful new type system in Python 2.2 made the
-choice of whether to maintain compatibility with Python 1.5.2 easy:
-the opportunity to throw away a great deal of elaborate code for
-emulating classic Python classes alone was too good to pass up.  In
-addition, Python iterators and descriptors provided crucial and
-elegant tools for representing similar C++ constructs.  The
-development of the generalized <tt class="literal"><span class="pre">object</span></tt> interface allowed us to
-further shield C++ programmers from the dangers and syntactic burdens
-of the Python 'C' API.  A great number of other features including C++
-exception translation, improved support for overloaded functions, and
-most significantly, CallPolicies for handling pointers and
-references, were added during this period.</p>
-<p>In October 2002, version 2 of Boost.Python was released.  Development
-since then has concentrated on improved support for C++ runtime
-polymorphism and smart pointers.  Peter Dimov's ingenious
-<tt class="literal"><span class="pre">boost::shared_ptr</span></tt> design in particular has allowed us to give the
-hybrid developer a consistent interface for moving objects back and
-forth across the language barrier without loss of information.  At
-first, we were concerned that the sophistication and complexity of the
-Boost.Python v2 implementation might discourage contributors, but the
-emergence of <a class="reference" href="http://www.boost.org/libs/python/pyste">Pyste</a> and several other significant feature
-contributions have laid those fears to rest.  Daily questions on the
-Python C++-sig and a backlog of desired improvements show that the
-library is getting used.  To us, the future looks bright.</p>
-</div>
-<div class="section" id="conclusions">
-<h1><a class="toc-backref" href="#id21" name="conclusions">Conclusions</a></h1>
-<p>Boost.Python achieves seamless interoperability between two rich and
-complimentary language environments.  Because it leverages template
-metaprogramming to introspect about types and functions, the user
-never has to learn a third syntax: the interface definitions are
-written in concise and maintainable C++.  Also, the wrapping system
-doesn't have to parse C++ headers or represent the type system: the
-compiler does that work for us.</p>
-<p>Computationally intensive tasks play to the strengths of C++ and are
-often impossible to implement efficiently in pure Python, while jobs
-like serialization that are trivial in Python can be very difficult in
-pure C++.  Given the luxury of building a hybrid software system from
-the ground up, we can approach design with new confidence and power.</p>
-</div>
-<div class="section" id="citations">
-<h1><a class="toc-backref" href="#id22" name="citations">Citations</a></h1>
-<table class="citation" frame="void" id="veld1995" rules="none">
-<colgroup><col class="label" /><col /></colgroup>
-<col />
-<tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id1" name="veld1995">[VELD1995]</a></td><td>T. Veldhuizen, &quot;Expression Templates,&quot; C++ Report,
-Vol. 7 No. 5 June 1995, pp. 26-31.
-<a class="reference" href="http://osl.iu.edu/~tveldhui/papers/Expression-Templates/exprtmpl.html">http://osl.iu.edu/~tveldhui/papers/Expression-Templates/exprtmpl.html</a></td></tr>
-</tbody>
-</table>
-</div>
-<div class="section" id="footnotes">
-<h1><a class="toc-backref" href="#id23" name="footnotes">Footnotes</a></h1>
-<table class="footnote" frame="void" id="proto" rules="none">
-<colgroup><col class="label" /><col /></colgroup>
-<tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id2" name="proto">[1]</a></td><td>In retrospect, it seems that &quot;thinking hybrid&quot; from the
-ground up might have been better for the NLP system: the
-natural component boundaries defined by the pure python
-prototype turned out to be inappropriate for getting the
-desired performance and memory footprint out of the C++ core,
-which eventually caused some redesign overhead on the Python
-side when the core was moved to C++.</td></tr>
-</tbody>
-</table>
-<table class="footnote" frame="void" id="test" rules="none">
-<colgroup><col class="label" /><col /></colgroup>
-<tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id3" name="test">[2]</a></td><td>We also have some reservations about driving all C++
-testing through a Python interface, unless that's the only way
-it will be ultimately used.  Any transition across language
-boundaries with such different object models can inevitably
-mask bugs.</td></tr>
-</tbody>
-</table>
-<table class="footnote" frame="void" id="feature" rules="none">
-<colgroup><col class="label" /><col /></colgroup>
-<tbody valign="top">
-<tr><td class="label"><a class="fn-backref" href="#id4" name="feature">[3]</a></td><td>These features were expressed very differently in v1 of
-Boost.Python</td></tr>
-</tbody>
-</table>
-</div>
-</div>
-<hr class="footer"/>
-<div class="footer">
-<a class="reference" href="bpl.txt">View document source</a>.
-Generated on: 2003-03-19 03:31 UTC.
-Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
-</div>
-</body>
-</html>
diff --git a/doc/PyConDC_2003/bpl.pdf b/doc/PyConDC_2003/bpl.pdf
deleted file mode 100755
index ffd8903e..00000000
Binary files a/doc/PyConDC_2003/bpl.pdf and /dev/null differ
diff --git a/doc/PyConDC_2003/bpl.txt b/doc/PyConDC_2003/bpl.txt
deleted file mode 100644
index c2ee19aa..00000000
--- a/doc/PyConDC_2003/bpl.txt
+++ /dev/null
@@ -1,947 +0,0 @@
-+++++++++++++++++++++++++++++++++++++++++++
- Building Hybrid Systems with Boost.Python
-+++++++++++++++++++++++++++++++++++++++++++
-
-:Author: David Abrahams
-:Contact: dave@boost-consulting.com
-:organization: `Boost Consulting`_
-:date: $Date$
-
-:Author: Ralf W. Grosse-Kunstleve
-
-:copyright: Copyright David Abrahams and Ralf W. Grosse-Kunstleve 2003. All rights reserved
-
-.. contents:: Table of Contents
-
-.. _`Boost Consulting`: http://www.boost-consulting.com
-
-==========
- Abstract
-==========
-
-Boost.Python is an open source C++ library which provides a concise
-IDL-like interface for binding C++ classes and functions to
-Python. Leveraging the full power of C++ compile-time introspection
-and of recently developed metaprogramming techniques, this is achieved
-entirely in pure C++, without introducing a new syntax.
-Boost.Python's rich set of features and high-level interface make it
-possible to engineer packages from the ground up as hybrid systems,
-giving programmers easy and coherent access to both the efficient
-compile-time polymorphism of C++ and the extremely convenient run-time
-polymorphism of Python.
-
-==============
- Introduction
-==============
-
-Python and C++ are in many ways as different as two languages could
-be: while C++ is usually compiled to machine-code, Python is
-interpreted.  Python's dynamic type system is often cited as the
-foundation of its flexibility, while in C++ static typing is the
-cornerstone of its efficiency. C++ has an intricate and difficult
-compile-time meta-language, while in Python, practically everything
-happens at runtime.
-
-Yet for many programmers, these very differences mean that Python and
-C++ complement one another perfectly.  Performance bottlenecks in
-Python programs can be rewritten in C++ for maximal speed, and
-authors of powerful C++ libraries choose Python as a middleware
-language for its flexible system integration capabilities.
-Furthermore, the surface differences mask some strong similarities:
-
-* 'C'-family control structures (if, while, for...)
-
-* Support for object-orientation, functional programming, and generic
-  programming (these are both *multi-paradigm* programming languages.)
-
-* Comprehensive operator overloading facilities, recognizing the
-  importance of syntactic variability for readability and
-  expressivity.
-
-* High-level concepts such as collections and iterators.
-
-* High-level encapsulation facilities (C++: namespaces, Python: modules)
-  to support the design of re-usable libraries.
-
-* Exception-handling for effective management of error conditions.
-
-* C++ idioms in common use, such as handle/body classes and
-  reference-counted smart pointers mirror Python reference semantics.
-
-Given Python's rich 'C' interoperability API, it should in principle
-be possible to expose C++ type and function interfaces to Python with
-an analogous interface to their C++ counterparts.  However, the
-facilities provided by Python alone for integration with C++ are
-relatively meager.  Compared to C++ and Python, 'C' has only very
-rudimentary abstraction facilities, and support for exception-handling
-is completely missing.  'C' extension module writers are required to
-manually manage Python reference counts, which is both annoyingly
-tedious and extremely error-prone. Traditional extension modules also
-tend to contain a great deal of boilerplate code repetition which
-makes them difficult to maintain, especially when wrapping an evolving
-API.
-
-These limitations have lead to the development of a variety of wrapping
-systems.  SWIG_ is probably the most popular package for the
-integration of C/C++ and Python. A more recent development is SIP_,
-which was specifically designed for interfacing Python with the Qt_
-graphical user interface library.  Both SWIG and SIP introduce their
-own specialized languages for customizing inter-language bindings.
-This has certain advantages, but having to deal with three different
-languages (Python, C/C++ and the interface language) also introduces
-practical and mental difficulties.  The CXX_ package demonstrates an
-interesting alternative.  It shows that at least some parts of
-Python's 'C' API can be wrapped and presented through a much more
-user-friendly C++ interface. However, unlike SWIG and SIP, CXX does
-not include support for wrapping C++ classes as new Python types.
-
-The features and goals of Boost.Python_ overlap significantly with
-many of these other systems.  That said, Boost.Python attempts to
-maximize convenience and flexibility without introducing a separate
-wrapping language.  Instead, it presents the user with a high-level
-C++ interface for wrapping C++ classes and functions, managing much of
-the complexity behind-the-scenes with static metaprogramming.
-Boost.Python also goes beyond the scope of earlier systems by
-providing:
-
-* Support for C++ virtual functions that can be overridden in Python.
-
-* Comprehensive lifetime management facilities for low-level C++
-  pointers and references.
-
-* Support for organizing extensions as Python packages,
-  with a central registry for inter-language type conversions.
-
-* A safe and convenient mechanism for tying into Python's powerful
-  serialization engine (pickle).
-
-* Coherence with the rules for handling C++ lvalues and rvalues that
-  can only come from a deep understanding of both the Python and C++
-  type systems.
-
-The key insight that sparked the development of Boost.Python is that
-much of the boilerplate code in traditional extension modules could be
-eliminated using C++ compile-time introspection.  Each argument of a
-wrapped C++ function must be extracted from a Python object using a
-procedure that depends on the argument type.  Similarly the function's
-return type determines how the return value will be converted from C++
-to Python.  Of course argument and return types are part of each
-function's type, and this is exactly the source from which
-Boost.Python deduces most of the information required.
-
-This approach leads to *user guided wrapping*: as much information is
-extracted directly from the source code to be wrapped as is possible
-within the framework of pure C++, and some additional information is
-supplied explicitly by the user.  Mostly the guidance is mechanical
-and little real intervention is required.  Because the interface
-specification is written in the same full-featured language as the
-code being exposed, the user has unprecedented power available when
-she does need to take control.
-
-.. _Python: http://www.python.org/
-.. _SWIG: http://www.swig.org/
-.. _SIP: http://www.riverbankcomputing.co.uk/sip/index.php
-.. _Qt: http://www.trolltech.com/
-.. _CXX: http://cxx.sourceforge.net/
-.. _Boost.Python: http://www.boost.org/libs/python/doc
-
-===========================
- Boost.Python Design Goals 
-===========================
-
-The primary goal of Boost.Python is to allow users to expose C++
-classes and functions to Python using nothing more than a C++
-compiler.  In broad strokes, the user experience should be one of
-directly manipulating C++ objects from Python.
-
-However, it's also important not to translate all interfaces *too*
-literally: the idioms of each language must be respected.  For
-example, though C++ and Python both have an iterator concept, they are
-expressed very differently.  Boost.Python has to be able to bridge the
-interface gap.
-
-It must be possible to insulate Python users from crashes resulting
-from trivial misuses of C++ interfaces, such as accessing
-already-deleted objects.  By the same token the library should
-insulate C++ users from low-level Python 'C' API, replacing
-error-prone 'C' interfaces like manual reference-count management and
-raw ``PyObject`` pointers with more-robust alternatives.
-
-Support for component-based development is crucial, so that C++ types
-exposed in one extension module can be passed to functions exposed in
-another without loss of crucial information like C++ inheritance
-relationships.
-
-Finally, all wrapping must be *non-intrusive*, without modifying or
-even seeing the original C++ source code.  Existing C++ libraries have
-to be wrappable by third parties who only have access to header files
-and binaries.
-
-==========================
- Hello Boost.Python World
-==========================
-
-And now for a preview of Boost.Python, and how it improves on the raw
-facilities offered by Python. Here's a function we might want to
-expose::
-
-    char const* greet(unsigned x)
-    {
-       static char const* const msgs[] = { "hello", "Boost.Python", "world!" };
-
-       if (x > 2) 
-           throw std::range_error("greet: index out of range");
-
-       return msgs[x];
-    }
-
-To wrap this function in standard C++ using the Python 'C' API, we'd
-need something like this::
-
-    extern "C" // all Python interactions use 'C' linkage and calling convention
-    {
-        // Wrapper to handle argument/result conversion and checking
-        PyObject* greet_wrap(PyObject* args, PyObject * keywords)
-        {
-             int x;
-             if (PyArg_ParseTuple(args, "i", &x))    // extract/check arguments
-             {
-                 char const* result = greet(x);      // invoke wrapped function
-                 return PyString_FromString(result); // convert result to Python
-             }
-             return 0;                               // error occurred
-        }
-
-        // Table of wrapped functions to be exposed by the module
-        static PyMethodDef methods[] = {
-            { "greet", greet_wrap, METH_VARARGS, "return one of 3 parts of a greeting" }
-            , { NULL, NULL, 0, NULL } // sentinel
-        };
-
-        // module initialization function
-        DL_EXPORT init_hello()
-        {
-            (void) Py_InitModule("hello", methods); // add the methods to the module
-        }
-    }
-
-Now here's the wrapping code we'd use to expose it with Boost.Python::
-
-    #include <boost/python.hpp>
-    using namespace boost::python;
-    BOOST_PYTHON_MODULE(hello)
-    {
-        def("greet", greet, "return one of 3 parts of a greeting");
-    }
-
-and here it is in action::
-
-    >>> import hello
-    >>> for x in range(3):
-    ...     print hello.greet(x)
-    ...
-    hello
-    Boost.Python
-    world!
-
-Aside from the fact that the 'C' API version is much more verbose,
-it's worth noting a few things that it doesn't handle correctly:
-
-* The original function accepts an unsigned integer, and the Python
-  'C' API only gives us a way of extracting signed integers. The
-  Boost.Python version will raise a Python exception if we try to pass
-  a negative number to ``hello.greet``, but the other one will proceed
-  to do whatever the C++ implementation does when converting an
-  negative integer to unsigned (usually wrapping to some very large
-  number), and pass the incorrect translation on to the wrapped
-  function.
-
-* That brings us to the second problem: if the C++ ``greet()``
-  function is called with a number greater than 2, it will throw an
-  exception.  Typically, if a C++ exception propagates across the
-  boundary with code generated by a 'C' compiler, it will cause a
-  crash.  As you can see in the first version, there's no C++
-  scaffolding there to prevent this from happening.  Functions wrapped
-  by Boost.Python automatically include an exception-handling layer
-  which protects Python users by translating unhandled C++ exceptions
-  into a corresponding Python exception.
-
-* A slightly more-subtle limitation is that the argument conversion
-  used in the Python 'C' API case can only get that integer ``x`` in
-  *one way*.  PyArg_ParseTuple can't convert Python ``long`` objects
-  (arbitrary-precision integers) which happen to fit in an ``unsigned
-  int`` but not in a ``signed long``, nor will it ever handle a
-  wrapped C++ class with a user-defined implicit ``operator unsigned
-  int()`` conversion. Boost.Python's dynamic type conversion
-  registry allows users to add arbitrary conversion methods.
-
-==================
- Library Overview
-==================
-
-This section outlines some of the library's major features.  Except as
-neccessary to avoid confusion, details of library implementation are
-omitted.
-
-------------------
- Exposing Classes
-------------------
-
-C++ classes and structs are exposed with a similarly-terse interface.
-Given::
-
-    struct World
-    {
-        void set(std::string msg) { this->msg = msg; }
-        std::string greet() { return msg; }
-        std::string msg;
-    };
-
-The following code will expose it in our extension module::
-    
-    #include <boost/python.hpp>
-    BOOST_PYTHON_MODULE(hello)
-    {
-        class_<World>("World")
-            .def("greet", &World::greet)
-            .def("set", &World::set)
-        ;
-    }
-
-Although this code has a certain pythonic familiarity, people
-sometimes find the syntax bit confusing because it doesn't look like
-most of the C++ code they're used to. All the same, this is just
-standard C++.  Because of their flexible syntax and operator
-overloading, C++ and Python are great for defining domain-specific
-(sub)languages
-(DSLs), and that's what we've done in Boost.Python. To break it down::
-
-    class_<World>("World")
-
-constructs an unnamed object of type ``class_<World>`` and passes
-``"World"`` to its constructor.  This creates a new-style Python class
-called ``World`` in the extension module, and associates it with the
-C++ type ``World`` in the Boost.Python type conversion registry.  We
-might have also written::
-
-    class_<World> w("World");
-
-but that would've been more verbose, since we'd have to name ``w``
-again to invoke its ``def()`` member function::
-
-        w.def("greet", &World::greet)
-
-There's nothing special about the location of the dot for member
-access in the original example: C++ allows any amount of whitespace on
-either side of a token, and placing the dot at the beginning of each
-line allows us to chain as many successive calls to member functions
-as we like with a uniform syntax.  The other key fact that allows
-chaining is that ``class_<>`` member functions all return a reference
-to ``*this``.
-
-So the example is equivalent to::
-
-    class_<World> w("World");
-    w.def("greet", &World::greet);
-    w.def("set", &World::set);
-
-It's occasionally useful to be able to break down the components of a
-Boost.Python class wrapper in this way, but the rest of this article
-will stick to the terse syntax.
-
-For completeness, here's the wrapped class in use: ::
-
-    >>> import hello
-    >>> planet = hello.World()
-    >>> planet.set('howdy')
-    >>> planet.greet()
-    'howdy'
-
-Constructors
-============
-
-Since our ``World`` class is just a plain ``struct``, it has an
-implicit no-argument (nullary) constructor.  Boost.Python exposes the
-nullary constructor by default, which is why we were able to write: ::
-
-  >>> planet = hello.World()
-
-However, well-designed classes in any language may require constructor
-arguments in order to establish their invariants.  Unlike Python,
-where ``__init__`` is just a specially-named method, In C++
-constructors cannot be handled like ordinary member functions.  In
-particular, we can't take their address: ``&World::World`` is an
-error.  The library provides a different interface for specifying
-constructors.  Given::
-
-    struct World
-    {
-        World(std::string msg); // added constructor
-        ...
-
-we can modify our wrapping code as follows::
-
-    class_<World>("World", init<std::string>())
-        ...
-
-of course, a C++ class may have additional constructors, and we can
-expose those as well by passing more instances of ``init<...>`` to
-``def()``::
-
-    class_<World>("World", init<std::string>())
-        .def(init<double, double>())
-        ...
-
-Boost.Python allows wrapped functions, member functions, and
-constructors to be overloaded to mirror C++ overloading.
-
-Data Members and Properties
-===========================
-
-Any publicly-accessible data members in a C++ class can be easily
-exposed as either ``readonly`` or ``readwrite`` attributes::
-
-    class_<World>("World", init<std::string>())
-        .def_readonly("msg", &World::msg)
-        ...
-
-and can be used directly in Python: ::
-
-    >>> planet = hello.World('howdy')
-    >>> planet.msg
-    'howdy'
-
-This does *not* result in adding attributes to the ``World`` instance
-``__dict__``, which can result in substantial memory savings when
-wrapping large data structures.  In fact, no instance ``__dict__``
-will be created at all unless attributes are explicitly added from
-Python. Boost.Python owes this capability to the new Python 2.2 type
-system, in particular the descriptor interface and ``property`` type.
-
-In C++, publicly-accessible data members are considered a sign of poor
-design because they break encapsulation, and style guides usually
-dictate the use of "getter" and "setter" functions instead.  In
-Python, however, ``__getattr__``, ``__setattr__``, and since 2.2,
-``property`` mean that attribute access is just one more
-well-encapsulated syntactic tool at the programmer's disposal.
-Boost.Python bridges this idiomatic gap by making Python ``property``
-creation directly available to users.  If ``msg`` were private, we
-could still expose it as attribute in Python as follows::
-
-    class_<World>("World", init<std::string>())
-        .add_property("msg", &World::greet, &World::set)
-        ...
-
-The example above mirrors the familiar usage of properties in Python
-2.2+: ::
-
-    >>> class World(object):
-    ...     __init__(self, msg):
-    ...         self.__msg = msg
-    ...     def greet(self):
-    ...         return self.__msg
-    ...     def set(self, msg):
-    ...         self.__msg = msg
-    ...     msg = property(greet, set)
-
-Operator Overloading
-====================
-
-The ability to write arithmetic operators for user-defined types has
-been a major factor in the success of both languages for numerical
-computation, and the success of packages like NumPy_ attests to the
-power of exposing operators in extension modules.  Boost.Python
-provides a concise mechanism for wrapping operator overloads. The
-example below shows a fragment from a wrapper for the Boost rational
-number library::
-
-    class_<rational<int> >("rational_int")
-      .def(init<int, int>()) // constructor, e.g. rational_int(3,4)
-      .def("numerator", &rational<int>::numerator)
-      .def("denominator", &rational<int>::denominator)
-      .def(-self)        // __neg__ (unary minus)
-      .def(self + self)  // __add__ (homogeneous)
-      .def(self * self)  // __mul__
-      .def(self + int()) // __add__ (heterogenous)
-      .def(int() + self) // __radd__
-      ...
-
-The magic is performed using a simplified application of "expression
-templates" [VELD1995]_, a technique originally developed for
-optimization of high-performance matrix algebra expressions.  The
-essence is that instead of performing the computation immediately,
-operators are overloaded to construct a type *representing* the
-computation.  In matrix algebra, dramatic optimizations are often
-available when the structure of an entire expression can be taken into
-account, rather than evaluating each operation "greedily".
-Boost.Python uses the same technique to build an appropriate Python
-method object based on expressions involving ``self``.
-
-.. _NumPy: http://www.pfdubois.com/numpy/
-
-Inheritance
-===========
-
-C++ inheritance relationships can be represented to Boost.Python by adding
-an optional ``bases<...>`` argument to the ``class_<...>`` template
-parameter list as follows::
-
-     class_<Derived, bases<Base1,Base2> >("Derived")
-          ...
-
-This has two effects:  
-
-1. When the ``class_<...>`` is created, Python type objects
-   corresponding to ``Base1`` and ``Base2`` are looked up in
-   Boost.Python's registry, and are used as bases for the new Python
-   ``Derived`` type object, so methods exposed for the Python ``Base1``
-   and ``Base2`` types are automatically members of the ``Derived``
-   type.  Because the registry is global, this works correctly even if
-   ``Derived`` is exposed in a different module from either of its
-   bases.
-
-2. C++ conversions from ``Derived`` to its bases are added to the
-   Boost.Python registry.  Thus wrapped C++ methods expecting (a
-   pointer or reference to) an object of either base type can be
-   called with an object wrapping a ``Derived`` instance.  Wrapped
-   member functions of class ``T`` are treated as though they have an
-   implicit first argument of ``T&``, so these conversions are
-   neccessary to allow the base class methods to be called for derived
-   objects.
-
-Of course it's possible to derive new Python classes from wrapped C++
-class instances.  Because Boost.Python uses the new-style class
-system, that works very much as for the Python built-in types.  There
-is one significant detail in which it differs: the built-in types
-generally establish their invariants in their ``__new__`` function, so
-that derived classes do not need to call ``__init__`` on the base
-class before invoking its methods : ::
-
-    >>> class L(list):
-    ...      def __init__(self):
-    ...          pass
-    ...
-    >>> L().reverse()
-    >>> 
-
-Because C++ object construction is a one-step operation, C++ instance
-data cannot be constructed until the arguments are available, in the
-``__init__`` function: ::
-
-    >>> class D(SomeBoostPythonClass):
-    ...      def __init__(self):
-    ...          pass
-    ...
-    >>> D().some_boost_python_method()
-    Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    TypeError: bad argument type for built-in operation
-
-This happened because Boost.Python couldn't find instance data of type
-``SomeBoostPythonClass`` within the ``D`` instance; ``D``'s ``__init__``
-function masked construction of the base class.  It could be corrected
-by either removing ``D``'s ``__init__`` function or having it call
-``SomeBoostPythonClass.__init__(...)`` explicitly.
-
-Virtual Functions
-=================
-
-Deriving new types in Python from extension classes is not very
-interesting unless they can be used polymorphically from C++.  In
-other words, Python method implementations should appear to override
-the implementation of C++ virtual functions when called *through base
-class pointers/references from C++*.  Since the only way to alter the
-behavior of a virtual function is to override it in a derived class,
-the user must build a special derived class to dispatch a polymorphic
-class' virtual functions::
-
-    //
-    // interface to wrap:
-    //
-    class Base
-    {
-     public:
-        virtual int f(std::string x) { return 42; }
-        virtual ~Base();
-    };
-
-    int calls_f(Base const& b, std::string x) { return b.f(x); }
-
-    //
-    // Wrapping Code
-    //
-
-    // Dispatcher class
-    struct BaseWrap : Base
-    {
-        // Store a pointer to the Python object
-        BaseWrap(PyObject* self_) : self(self_) {}
-        PyObject* self;
-
-        // Default implementation, for when f is not overridden
-        int f_default(std::string x) { return this->Base::f(x); }
-        // Dispatch implementation
-        int f(std::string x) { return call_method<int>(self, "f", x); }
-    };
-
-    ...
-        def("calls_f", calls_f);
-        class_<Base, BaseWrap>("Base")
-            .def("f", &Base::f, &BaseWrap::f_default)
-            ;
-
-Now here's some Python code which demonstrates: ::
-
-    >>> class Derived(Base):
-    ...     def f(self, s):
-    ...          return len(s)
-    ...
-    >>> calls_f(Base(), 'foo')
-    42
-    >>> calls_f(Derived(), 'forty-two')
-    9
-
-Things to notice about the dispatcher class:
-
-* The key element which allows overriding in Python is the
-  ``call_method`` invocation, which uses the same global type
-  conversion registry as the C++ function wrapping does to convert its
-  arguments from C++ to Python and its return type from Python to C++.
-
-* Any constructor signatures you wish to wrap must be replicated with
-  an initial ``PyObject*`` argument
-
-* The dispatcher must store this argument so that it can be used to
-  invoke ``call_method``
-
-* The ``f_default`` member function is needed when the function being
-  exposed is not pure virtual; there's no other way ``Base::f`` can be
-  called on an object of type ``BaseWrap``, since it overrides ``f``.
-
-Deeper Reflection on the Horizon?
-=================================
-
-Admittedly, this formula is tedious to repeat, especially on a project
-with many polymorphic classes.  That it is neccessary reflects some
-limitations in C++'s compile-time introspection capabilities: there's
-no way to enumerate the members of a class and find out which are
-virtual functions.  At least one very promising project has been
-started to write a front-end which can generate these dispatchers (and
-other wrapping code) automatically from C++ headers.  
-
-Pyste_ is being developed by Bruno da Silva de Oliveira.  It builds on
-GCC_XML_, which generates an XML version of GCC's internal program
-representation.  Since GCC is a highly-conformant C++ compiler, this
-ensures correct handling of the most-sophisticated template code and
-full access to the underlying type system.  In keeping with the
-Boost.Python philosophy, a Pyste interface description is neither
-intrusive on the code being wrapped, nor expressed in some unfamiliar
-language: instead it is a 100% pure Python script.  If Pyste is
-successful it will mark a move away from wrapping everything directly
-in C++ for many of our users.  It will also allow us the choice to
-shift some of the metaprogram code from C++ to Python.  We expect that
-soon, not only our users but the Boost.Python developers themselves
-will be "thinking hybrid" about their own code.
-
-.. _`GCC_XML`: http://www.gccxml.org/HTML/Index.html
-.. _`Pyste`: http://www.boost.org/libs/python/pyste
-
----------------
- Serialization
----------------
-
-*Serialization* is the process of converting objects in memory to a
-form that can be stored on disk or sent over a network connection. The
-serialized object (most often a plain string) can be retrieved and
-converted back to the original object. A good serialization system will
-automatically convert entire object hierarchies. Python's standard
-``pickle`` module is just such a system.  It leverages the language's strong
-runtime introspection facilities for serializing practically arbitrary
-user-defined objects. With a few simple and unintrusive provisions this
-powerful machinery can be extended to also work for wrapped C++ objects.
-Here is an example::
-
-    #include <string>
-
-    struct World
-    {
-        World(std::string a_msg) : msg(a_msg) {}
-        std::string greet() const { return msg; }
-        std::string msg;
-    };
-
-    #include <boost/python.hpp>
-    using namespace boost::python;
-
-    struct World_picklers : pickle_suite
-    {
-      static tuple
-      getinitargs(World const& w) { return make_tuple(w.greet()); }
-    };
-
-    BOOST_PYTHON_MODULE(hello)
-    {
-        class_<World>("World", init<std::string>())
-            .def("greet", &World::greet)
-            .def_pickle(World_picklers())
-        ;
-    }
-
-Now let's create a ``World`` object and put it to rest on disk::
-
-    >>> import hello
-    >>> import pickle
-    >>> a_world = hello.World("howdy")
-    >>> pickle.dump(a_world, open("my_world", "w"))
-
-In a potentially *different script* on a potentially *different
-computer* with a potentially *different operating system*::
-
-    >>> import pickle
-    >>> resurrected_world = pickle.load(open("my_world", "r"))
-    >>> resurrected_world.greet()
-    'howdy'
-
-Of course the ``cPickle`` module can also be used for faster
-processing.
-
-Boost.Python's ``pickle_suite`` fully supports the ``pickle`` protocol
-defined in the standard Python documentation. Like a __getinitargs__
-function in Python, the pickle_suite's getinitargs() is responsible for
-creating the argument tuple that will be use to reconstruct the pickled
-object.  The other elements of the Python pickling protocol,
-__getstate__ and __setstate__ can be optionally provided via C++
-getstate and setstate functions.  C++'s static type system allows the
-library to ensure at compile-time that nonsensical combinations of
-functions (e.g. getstate without setstate) are not used.
-
-Enabling serialization of more complex C++ objects requires a little
-more work than is shown in the example above. Fortunately the
-``object`` interface (see next section) greatly helps in keeping the
-code manageable.
-
-------------------
- Object interface
-------------------
-
-Experienced 'C' language extension module authors will be familiar
-with the ubiquitous ``PyObject*``, manual reference-counting, and the
-need to remember which API calls return "new" (owned) references or
-"borrowed" (raw) references.  These constraints are not just
-cumbersome but also a major source of errors, especially in the
-presence of exceptions.
-
-Boost.Python provides a class ``object`` which automates reference
-counting and provides conversion to Python from C++ objects of
-arbitrary type.  This significantly reduces the learning effort for
-prospective extension module writers.
-
-Creating an ``object`` from any other type is extremely simple::
-
-    object s("hello, world");  // s manages a Python string
-
-``object`` has templated interactions with all other types, with
-automatic to-python conversions. It happens so naturally that it's
-easily overlooked::
-
-   object ten_Os = 10 * s[4]; // -> "oooooooooo"
-
-In the example above, ``4`` and ``10`` are converted to Python objects
-before the indexing and multiplication operations are invoked.
-
-The ``extract<T>`` class template can be used to convert Python objects
-to C++ types::
-
-    double x = extract<double>(o);
-
-If a conversion in either direction cannot be performed, an
-appropriate exception is thrown at runtime.
-
-The ``object`` type is accompanied by a set of derived types
-that mirror the Python built-in types such as ``list``, ``dict``,
-``tuple``, etc. as much as possible. This enables convenient
-manipulation of these high-level types from C++::
-
-    dict d;
-    d["some"] = "thing";
-    d["lucky_number"] = 13;
-    list l = d.keys();
-
-This almost looks and works like regular Python code, but it is pure
-C++.  Of course we can wrap C++ functions which accept or return
-``object`` instances.
-
-=================
- Thinking hybrid
-=================
-
-Because of the practical and mental difficulties of combining
-programming languages, it is common to settle a single language at the
-outset of any development effort.  For many applications, performance
-considerations dictate the use of a compiled language for the core
-algorithms.  Unfortunately, due to the complexity of the static type
-system, the price we pay for runtime performance is often a
-significant increase in development time.  Experience shows that
-writing maintainable C++ code usually takes longer and requires *far*
-more hard-earned working experience than developing comparable Python
-code.  Even when developers are comfortable working exclusively in
-compiled languages, they often augment their systems by some type of
-ad hoc scripting layer for the benefit of their users without ever
-availing themselves of the same advantages.
-
-Boost.Python enables us to *think hybrid*.  Python can be used for
-rapidly prototyping a new application; its ease of use and the large
-pool of standard libraries give us a head start on the way to a
-working system.  If necessary, the working code can be used to
-discover rate-limiting hotspots.  To maximize performance these can
-be reimplemented in C++, together with the Boost.Python bindings
-needed to tie them back into the existing higher-level procedure.
-
-Of course, this *top-down* approach is less attractive if it is clear
-from the start that many algorithms will eventually have to be
-implemented in C++.  Fortunately Boost.Python also enables us to
-pursue a *bottom-up* approach.  We have used this approach very
-successfully in the development of a toolbox for scientific
-applications.  The toolbox started out mainly as a library of C++
-classes with Boost.Python bindings, and for a while the growth was
-mainly concentrated on the C++ parts.  However, as the toolbox is
-becoming more complete, more and more newly added functionality can be
-implemented in Python.
-
-.. image:: python_cpp_mix.jpg
-
-This figure shows the estimated ratio of newly added C++ and Python
-code over time as new algorithms are implemented.  We expect this
-ratio to level out near 70% Python.  Being able to solve new problems
-mostly in Python rather than a more difficult statically typed
-language is the return on our investment in Boost.Python.  The ability
-to access all of our code from Python allows a broader group of
-developers to use it in the rapid development of new applications.
-
-=====================
- Development history
-=====================
-
-The first version of Boost.Python was developed in 2000 by Dave
-Abrahams at Dragon Systems, where he was privileged to have Tim Peters
-as a guide to "The Zen of Python".  One of Dave's jobs was to develop
-a Python-based natural language processing system.  Since it was
-eventually going to be targeting embedded hardware, it was always
-assumed that the compute-intensive core would be rewritten in C++ to
-optimize speed and memory footprint [#proto]_.  The project also wanted to
-test all of its C++ code using Python test scripts [#test]_.  The only
-tool we knew of for binding C++ and Python was SWIG_, and at the time
-its handling of C++ was weak.  It would be false to claim any deep
-insight into the possible advantages of Boost.Python's approach at
-this point.  Dave's interest and expertise in fancy C++ template
-tricks had just reached the point where he could do some real damage,
-and Boost.Python emerged as it did because it filled a need and
-because it seemed like a cool thing to try.
-
-This early version was aimed at many of the same basic goals we've
-described in this paper, differing most-noticeably by having a
-slightly more cumbersome syntax and by lack of special support for
-operator overloading, pickling, and component-based development.
-These last three features were quickly added by Ullrich Koethe and
-Ralf Grosse-Kunstleve [#feature]_, and other enthusiastic contributors arrived
-on the scene to contribute enhancements like support for nested
-modules and static member functions.
-
-By early 2001 development had stabilized and few new features were
-being added, however a disturbing new fact came to light: Ralf had
-begun testing Boost.Python on pre-release versions of a compiler using
-the EDG_ front-end, and the mechanism at the core of Boost.Python
-responsible for handling conversions between Python and C++ types was
-failing to compile.  As it turned out, we had been exploiting a very
-common bug in the implementation of all the C++ compilers we had
-tested.  We knew that as C++ compilers rapidly became more
-standards-compliant, the library would begin failing on more
-platforms.  Unfortunately, because the mechanism was so central to the
-functioning of the library, fixing the problem looked very difficult.
-
-Fortunately, later that year Lawrence Berkeley and later Lawrence
-Livermore National labs contracted with `Boost Consulting`_ for support
-and development of Boost.Python, and there was a new opportunity to
-address fundamental issues and ensure a future for the library.  A
-redesign effort began with the low level type conversion architecture,
-building in standards-compliance and support for component-based
-development (in contrast to version 1 where conversions had to be
-explicitly imported and exported across module boundaries).  A new
-analysis of the relationship between the Python and C++ objects was
-done, resulting in more intuitive handling for C++ lvalues and
-rvalues.
-
-The emergence of a powerful new type system in Python 2.2 made the
-choice of whether to maintain compatibility with Python 1.5.2 easy:
-the opportunity to throw away a great deal of elaborate code for
-emulating classic Python classes alone was too good to pass up.  In
-addition, Python iterators and descriptors provided crucial and
-elegant tools for representing similar C++ constructs.  The
-development of the generalized ``object`` interface allowed us to
-further shield C++ programmers from the dangers and syntactic burdens
-of the Python 'C' API.  A great number of other features including C++
-exception translation, improved support for overloaded functions, and
-most significantly, CallPolicies for handling pointers and
-references, were added during this period.
-
-In October 2002, version 2 of Boost.Python was released.  Development
-since then has concentrated on improved support for C++ runtime
-polymorphism and smart pointers.  Peter Dimov's ingenious
-``boost::shared_ptr`` design in particular has allowed us to give the
-hybrid developer a consistent interface for moving objects back and
-forth across the language barrier without loss of information.  At
-first, we were concerned that the sophistication and complexity of the
-Boost.Python v2 implementation might discourage contributors, but the
-emergence of Pyste_ and several other significant feature
-contributions have laid those fears to rest.  Daily questions on the
-Python C++-sig and a backlog of desired improvements show that the
-library is getting used.  To us, the future looks bright.
-
-.. _`EDG`: http://www.edg.com
-
-=============
- Conclusions
-=============
-
-Boost.Python achieves seamless interoperability between two rich and
-complimentary language environments.  Because it leverages template
-metaprogramming to introspect about types and functions, the user
-never has to learn a third syntax: the interface definitions are
-written in concise and maintainable C++.  Also, the wrapping system
-doesn't have to parse C++ headers or represent the type system: the
-compiler does that work for us.
-
-Computationally intensive tasks play to the strengths of C++ and are
-often impossible to implement efficiently in pure Python, while jobs
-like serialization that are trivial in Python can be very difficult in
-pure C++.  Given the luxury of building a hybrid software system from
-the ground up, we can approach design with new confidence and power.
-
-===========
- Citations
-===========
-
-.. [VELD1995] T. Veldhuizen, "Expression Templates," C++ Report,
-   Vol. 7 No. 5 June 1995, pp. 26-31.
-   http://osl.iu.edu/~tveldhui/papers/Expression-Templates/exprtmpl.html
-
-===========
- Footnotes
-===========
-
-.. [#proto] In retrospect, it seems that "thinking hybrid" from the
-        ground up might have been better for the NLP system: the
-        natural component boundaries defined by the pure python
-        prototype turned out to be inappropriate for getting the
-        desired performance and memory footprint out of the C++ core,
-        which eventually caused some redesign overhead on the Python
-        side when the core was moved to C++.
-
-.. [#test] We also have some reservations about driving all C++
-        testing through a Python interface, unless that's the only way
-        it will be ultimately used.  Any transition across language
-        boundaries with such different object models can inevitably
-        mask bugs.
-
-.. [#feature] These features were expressed very differently in v1 of
-        Boost.Python
diff --git a/doc/PyConDC_2003/bpl_mods.txt b/doc/PyConDC_2003/bpl_mods.txt
deleted file mode 100644
index e243cda9..00000000
--- a/doc/PyConDC_2003/bpl_mods.txt
+++ /dev/null
@@ -1,908 +0,0 @@
-.. This is a comment. Note how any initial comments are moved by
-   transforms to after the document title, subtitle, and docinfo.
-
-.. Need intro and conclusion
-.. Exposing classes
-    .. Constructors
-    .. Overloading
-    .. Properties and data members
-    .. Inheritance
-    .. Operators and Special Functions
-    .. Virtual Functions
-.. Call Policies
-
-++++++++++++++++++++++++++++++++++++++++++++++
- Introducing Boost.Python (Extended Abstract)
-++++++++++++++++++++++++++++++++++++++++++++++
-
-
-.. bibliographic fields (which also require a transform):
-
-:Author: David Abrahams
-:Address: 45 Walnut Street
-          Somerville, MA 02143
-:Contact: dave@boost-consulting.com
-:organization: `Boost Consulting`_
-:date: $Date$
-:status: This is a "work in progress"
-:version: 1
-:copyright: Copyright David Abrahams 2002. All rights reserved
-
-:Dedication:
-
-    For my girlfriend, wife, and partner Luann
-
-:abstract:
-
-    This paper describes the Boost.Python library, a system for
-    C++/Python interoperability.
-
-.. meta::
-   :keywords: Boost,python,Boost.Python,C++
-   :description lang=en: C++/Python interoperability with Boost.Python
-
-.. contents:: Table of Contents
-.. section-numbering::
-
-
-.. _`Boost Consulting`: http://www.boost-consulting.com
-
-==============
- Introduction
-==============
-
-Python and C++ are in many ways as different as two languages could
-be: while C++ is usually compiled to machine-code, Python is
-interpreted.  Python's dynamic type system is often cited as the
-foundation of its flexibility, while in C++ static typing is the
-cornerstone of its efficiency. C++ has an intricate and difficult
-meta-language to support compile-time polymorphism, while Python is
-a uniform language with convenient runtime polymorphism.
-
-Yet for many programmers, these very differences mean that Python and
-C++ complement one another perfectly.  Performance bottlenecks in
-Python programs can be rewritten in C++ for maximal speed, and
-authors of powerful C++ libraries choose Python as a middleware
-language for its flexible system integration capabilities.
-Furthermore, the surface differences mask some strong similarities:
-
-* 'C'-family control structures (if, while, for...)
-
-* Support for object-orientation, functional programming, and generic
-  programming (these are both *multi-paradigm* programming languages.)
-
-* Comprehensive operator overloading facilities, recognizing the
-  importance of syntactic variability for readability and
-  expressivity.
-
-* High-level concepts such as collections and iterators.
-
-* High-level encapsulation facilities (C++: namespaces, Python: modules)
-  to support the design of re-usable libraries.
-
-* Exception-handling for effective management of error conditions.
-
-* C++ idioms in common use, such as handle/body classes and
-  reference-counted smart pointers mirror Python reference semantics.
-
-Python provides a rich 'C' API for writers of 'C' extension modules.
-Unfortunately, using this API directly for exposing C++ type and
-function interfaces to Python is much more tedious than it should be.
-This is mainly due to the limitations of the 'C' language.  Compared to
-C++ and Python, 'C' has only very rudimentary abstraction facilities.
-Support for exception-handling is completely missing. One important
-undesirable consequence is that 'C' extension module writers are
-required to manually manage Python reference counts. Another unpleasant
-consequence is a very high degree of repetition of similar code in 'C'
-extension modules. Of course highly redundant code does not only cause
-frustration for the module writer, but is also very difficult to
-maintain.
-
-The limitations of the 'C' API have lead to the development of a
-variety of wrapping systems. SWIG_ is probably the most popular package
-for the integration of C/C++ and Python. A more recent development is
-the SIP_ package, which is specifically designed for interfacing Python
-with the Qt_ graphical user interface library. Both SWIG and SIP
-introduce a new specialized language for defining the inter-language
-bindings. Of course being able to use a specialized language has
-advantages, but having to deal with three different languages (Python,
-C/C++ and the interface language) also introduces practical and mental
-difficulties. The CXX_ package demonstrates an interesting alternative.
-It shows that at least some parts of Python's 'C' API can be wrapped
-and presented through a much more user-friendly C++ interface. However,
-unlike SWIG and SIP, CXX does not include support for wrapping C++
-classes as new Python types. CXX is also no longer actively developed.
-
-In some respects Boost.Python combines ideas from SWIG and SIP with
-ideas from CXX. Like SWIG and SIP, Boost.Python is a system for
-wrapping C++ classes as new Python "built-in" types, and C/C++
-functions as Python functions. Like CXX, Boost.Python presents Python's
-'C' API through a C++ interface. Boost.Python goes beyond the scope of
-other systems with the unique support for C++ virtual functions that
-are overrideable in Python, support for organizing extensions as Python
-packages with a central registry for inter-language type conversions,
-and a convenient mechanism for tying into Python's serialization engine
-(pickle). Importantly, all this is achieved without introducing a new
-syntax. Boost.Python leverages the power of C++ meta-programming
-techniques to introspect about the C++ type system, and presents a
-simple, IDL-like C++ interface for exposing C/C++ code in extension
-modules. Boost.Python is a pure C++ library, the inter-language
-bindings are defined in pure C++, and other than a C++ compiler only
-Python itself is required to get started with Boost.Python. Last but
-not least, Boost.Python is an unrestricted open source library. There
-are no strings attached even for commercial applications.
-
-.. _SWIG: http://www.swig.org/
-.. _SIP: http://www.riverbankcomputing.co.uk/sip/index.php
-.. _Qt: http://www.trolltech.com/
-.. _CXX: http://cxx.sourceforge.net/
-
-===========================
- Boost.Python Design Goals 
-===========================
-
-The primary goal of Boost.Python is to allow users to expose C++
-classes and functions to Python using nothing more than a C++
-compiler.  In broad strokes, the user experience should be one of
-directly manipulating C++ objects from Python.
-
-However, it's also important not to translate all interfaces *too*
-literally: the idioms of each language must be respected.  For
-example, though C++ and Python both have an iterator concept, they are
-expressed very differently.  Boost.Python has to be able to bridge the
-interface gap.
-
-It must be possible to insulate Python users from crashes resulting
-from trivial misuses of C++ interfaces, such as accessing
-already-deleted objects.  By the same token the library should
-insulate C++ users from low-level Python 'C' API, replacing
-error-prone 'C' interfaces like manual reference-count management and
-raw ``PyObject`` pointers with more-robust alternatives.
-
-Support for component-based development is crucial, so that C++ types
-exposed in one extension module can be passed to functions exposed in
-another without loss of crucial information like C++ inheritance
-relationships.
-
-Finally, all wrapping must be *non-intrusive*, without modifying or
-even seeing the original C++ source code.  Existing C++ libraries have
-to be wrappable by third parties who only have access to header files
-and binaries.
-
-==========================
- Hello Boost.Python World
-==========================
-
-And now for a preview of Boost.Python, and how it improves on the raw
-facilities offered by Python. Here's a function we might want to
-expose::
-
-    char const* greet(unsigned x)
-    {
-       static char const* const msgs[] = { "hello", "Boost.Python", "world!" };
-
-       if (x > 2) 
-           throw std::range_error("greet: index out of range");
-
-       return msgs[x];
-    }
-
-To wrap this function in standard C++ using the Python 'C' API, we'd
-need something like this::
-
-    extern "C" // all Python interactions use 'C' linkage and calling convention
-    {
-        // Wrapper to handle argument/result conversion and checking
-        PyObject* greet_wrap(PyObject* args, PyObject * keywords)
-        {
-             int x;
-             if (PyArg_ParseTuple(args, "i", &x))    // extract/check arguments
-             {
-                 char const* result = greet(x);      // invoke wrapped function
-                 return PyString_FromString(result); // convert result to Python
-             }
-             return 0;                               // error occurred
-        }
-
-        // Table of wrapped functions to be exposed by the module
-        static PyMethodDef methods[] = {
-            { "greet", greet_wrap, METH_VARARGS, "return one of 3 parts of a greeting" }
-            , { NULL, NULL, 0, NULL } // sentinel
-        };
-
-        // module initialization function
-        DL_EXPORT init_hello()
-        {
-            (void) Py_InitModule("hello", methods); // add the methods to the module
-        }
-    }
-
-Now here's the wrapping code we'd use to expose it with Boost.Python::
-
-    #include <boost/python.hpp>
-    using namespace boost::python;
-    BOOST_PYTHON_MODULE(hello)
-    {
-        def("greet", greet, "return one of 3 parts of a greeting");
-    }
-
-and here it is in action::
-
-    >>> import hello
-    >>> for x in range(3):
-    ...     print hello.greet(x)
-    ...
-    hello
-    Boost.Python
-    world!
-
-Aside from the fact that the 'C' API version is much more verbose than
-the BPL one, it's worth noting that it doesn't handle a few things
-correctly:
-
-* The original function accepts an unsigned integer, and the Python
-  'C' API only gives us a way of extracting signed integers. The
-  Boost.Python version will raise a Python exception if we try to pass
-  a negative number to ``hello.greet``, but the other one will proceed
-  to do whatever the C++ implementation does when converting an
-  negative integer to unsigned (usually wrapping to some very large
-  number), and pass the incorrect translation on to the wrapped
-  function.
-
-* That brings us to the second problem: if the C++ ``greet()``
-  function is called with a number greater than 2, it will throw an
-  exception.  Typically, if a C++ exception propagates across the
-  boundary with code generated by a 'C' compiler, it will cause a
-  crash.  As you can see in the first version, there's no C++
-  scaffolding there to prevent this from happening.  Functions wrapped
-  by Boost.Python automatically include an exception-handling layer
-  which protects Python users by translating unhandled C++ exceptions
-  into a corresponding Python exception.
-
-* A slightly more-subtle limitation is that the argument conversion
-  used in the Python 'C' API case can only get that integer ``x`` in
-  *one way*.  PyArg_ParseTuple can't convert Python ``long`` objects
-  (arbitrary-precision integers) which happen to fit in an ``unsigned
-  int`` but not in a ``signed long``, nor will it ever handle a
-  wrapped C++ class with a user-defined implicit ``operator unsigned
-  int()`` conversion.  The BPL's dynamic type conversion registry
-  allows users to add arbitrary conversion methods.
-
-==================
- Library Overview
-==================
-
-This section outlines some of the library's major features.  Except as
-neccessary to avoid confusion, details of library implementation are
-omitted.
-
--------------------------------------------
- The fundamental type-conversion mechanism
--------------------------------------------
-
-XXX This needs to be rewritten.
-
-Every argument of every wrapped function requires some kind of
-extraction code to convert it from Python to C++.  Likewise, the
-function return value has to be converted from C++ to Python.
-Appropriate Python exceptions must be raised if the conversion fails.
-Argument and return types are part of the function's type, and much of
-this tedium can be relieved if the wrapping system can extract that
-information through  introspection.
-
-Passing a wrapped C++ derived class instance to a C++ function
-accepting a pointer or reference to a base class requires knowledge of
-the inheritance relationship and how to translate the address of a base
-class into that of a derived class.
-
-------------------
- Exposing Classes
-------------------
-
-C++ classes and structs are exposed with a similarly-terse interface.
-Given::
-
-    struct World
-    {
-        void set(std::string msg) { this->msg = msg; }
-        std::string greet() { return msg; }
-        std::string msg;
-    };
-
-The following code will expose it in our extension module::
-    
-    #include <boost/python.hpp>
-    BOOST_PYTHON_MODULE(hello)
-    {
-        class_<World>("World")
-            .def("greet", &World::greet)
-            .def("set", &World::set)
-        ;
-    }
-
-Although this code has a certain pythonic familiarity, people
-sometimes find the syntax bit confusing because it doesn't look like
-most of the C++ code they're used to. All the same, this is just
-standard C++.  Because of their flexible syntax and operator
-overloading, C++ and Python are great for defining domain-specific
-(sub)languages
-(DSLs), and that's what we've done in BPL.  To break it down::
-
-    class_<World>("World")
-
-constructs an unnamed object of type ``class_<World>`` and passes
-``"World"`` to its constructor.  This creates a new-style Python class
-called ``World`` in the extension module, and associates it with the
-C++ type ``World`` in the BPL type conversion registry.  We might have
-also written::
-
-    class_<World> w("World");
-
-but that would've been more verbose, since we'd have to name ``w``
-again to invoke its ``def()`` member function::
-
-        w.def("greet", &World::greet)
-
-There's nothing special about the location of the dot for member
-access in the original example: C++ allows any amount of whitespace on
-either side of a token, and placing the dot at the beginning of each
-line allows us to chain as many successive calls to member functions
-as we like with a uniform syntax.  The other key fact that allows
-chaining is that ``class_<>`` member functions all return a reference
-to ``*this``.
-
-So the example is equivalent to::
-
-    class_<World> w("World");
-    w.def("greet", &World::greet);
-    w.def("set", &World::set);
-
-It's occasionally useful to be able to break down the components of a
-Boost.Python class wrapper in this way, but the rest of this paper
-will tend to stick to the terse syntax.
-
-For completeness, here's the wrapped class in use:
-
->>> import hello
->>> planet = hello.World()
->>> planet.set('howdy')
->>> planet.greet()
-'howdy'
-
-Constructors
-============
-
-Since our ``World`` class is just a plain ``struct``, it has an
-implicit no-argument (nullary) constructor.  Boost.Python exposes the
-nullary constructor by default, which is why we were able to write:
-
->>> planet = hello.World()
-
-However, well-designed classes in any language may require constructor
-arguments in order to establish their invariants.  Unlike Python,
-where ``__init__`` is just a specially-named method, In C++
-constructors cannot be handled like ordinary member functions.  In
-particular, we can't take their address: ``&World::World`` is an
-error.  The library provides a different interface for specifying
-constructors.  Given::
-
-    struct World
-    {
-        World(std::string msg); // added constructor
-        ...
-
-we can modify our wrapping code as follows::
-
-    class_<World>("World", init<std::string>())
-        ...
-
-of course, a C++ class may have additional constructors, and we can
-expose those as well by passing more instances of ``init<...>`` to
-``def()``::
-
-    class_<World>("World", init<std::string>())
-        .def(init<double, double>())
-        ...
-
-Boost.Python allows wrapped functions, member functions, and
-constructors to be overloaded to mirror C++ overloading.
-
-Data Members and Properties
-===========================
-
-Any publicly-accessible data members in a C++ class can be easily
-exposed as either ``readonly`` or ``readwrite`` attributes::
-
-    class_<World>("World", init<std::string>())
-        .def_readonly("msg", &World::msg)
-        ...
-
-and can be used directly in Python:
-
->>> planet = hello.World('howdy')
->>> planet.msg
-'howdy'
-
-This does *not* result in adding attributes to the ``World`` instance
-``__dict__``, which can result in substantial memory savings when
-wrapping large data structures.  In fact, no instance ``__dict__``
-will be created at all unless attributes are explicitly added from
-Python.  BPL owes this capability to the new Python 2.2 type system,
-in particular the descriptor interface and ``property`` type.
-
-In C++, publicly-accessible data members are considered a sign of poor
-design because they break encapsulation, and style guides usually
-dictate the use of "getter" and "setter" functions instead.  In
-Python, however, ``__getattr__``, ``__setattr__``, and since 2.2,
-``property`` mean that attribute access is just one more
-well-encapsulated syntactic tool at the programmer's disposal.  BPL
-bridges this idiomatic gap by making Python ``property`` creation
-directly available to users.  So if ``msg`` were private, we could
-still expose it as attribute in Python as follows::
-
-    class_<World>("World", init<std::string>())
-        .add_property("msg", &World::greet, &World::set)
-        ...
-
-The example above mirrors the familiar usage of properties in Python
-2.2+:
-
->>> class World(object):
-...     __init__(self, msg):
-...         self.__msg = msg
-...     def greet(self):
-...         return self.__msg
-...     def set(self, msg):
-...         self.__msg = msg
-...     msg = property(greet, set)
-
-Operators and Special Functions
-===============================
-
-The ability to write arithmetic operators for user-defined types that
-C++ and Python both allow the definition of has been a major factor in
-the popularity of both languages for scientific computing.  The
-success of packages like NumPy attests to the power of exposing
-operators in extension modules.  In this example we'll wrap a class
-representing a position in a large file::
-
-    class FilePos { /*...*/ };
-
-    // Linear offset
-    FilePos     operator+(FilePos, int);
-    FilePos     operator+(int, FilePos);
-    FilePos     operator-(FilePos, int);
-    
-    // Distance between two FilePos objects
-    int         operator-(FilePos, FilePos);
-
-    // Offset with assignment
-    FilePos&    operator+=(FilePos&, int);
-    FilePos&    operator-=(FilePos&, int);
-
-    // Comparison
-    bool        operator<(FilePos, FilePos);
-
-The wrapping code looks like this::
-
-    class_<FilePos>("FilePos")
-        .def(self + int())     // __add__
-        .def(int() + self)     // __radd__
-        .def(self - int())     // __sub__
-
-        .def(self - self)      // __sub__
-
-        .def(self += int())    // __iadd__
-        .def(self -= int())    // __isub__
-
-        .def(self < self);     // __lt__
-        ;
-
-The magic is performed using a simplified application of "expression
-templates" [VELD1995]_, a technique originally developed by for
-optimization of high-performance matrix algebra expressions.  The
-essence is that instead of performing the computation immediately,
-operators are overloaded to construct a type *representing* the
-computation.  In matrix algebra, dramatic optimizations are often
-available when the structure of an entire expression can be taken into
-account, rather than processing each operation "greedily".
-Boost.Python uses the same technique to build an appropriate Python
-callable object based on an expression involving ``self``, which is
-then added to the class.
-
-Inheritance
-===========
-
-C++ inheritance relationships can be represented to Boost.Python by adding
-an optional ``bases<...>`` argument to the ``class_<...>`` template
-parameter list as follows::
-
-     class_<Derived, bases<Base1,Base2> >("Derived")
-          ...
-
-This has two effects:  
-
-1. When the ``class_<...>`` is created, Python type objects
-   corresponding to ``Base1`` and ``Base2`` are looked up in the BPL
-   registry, and are used as bases for the new Python ``Derived`` type
-   object [#mi]_, so methods exposed for the Python ``Base1`` and
-   ``Base2`` types are automatically members of the ``Derived`` type.
-   Because the registry is global, this works correctly even if
-   ``Derived`` is exposed in a different module from either of its
-   bases.
-
-2. C++ conversions from ``Derived`` to its bases are added to the
-   Boost.Python registry.  Thus wrapped C++ methods expecting (a
-   pointer or reference to) an object of either base type can be
-   called with an object wrapping a ``Derived`` instance.  Wrapped
-   member functions of class ``T`` are treated as though they have an
-   implicit first argument of ``T&``, so these conversions are
-   neccessary to allow the base class methods to be called for derived
-   objects.
-
-Of course it's possible to derive new Python classes from wrapped C++
-class instances.  Because Boost.Python uses the new-style class
-system, that works very much as for the Python built-in types.  There
-is one significant detail in which it differs: the built-in types
-generally establish their invariants in their ``__new__`` function, so
-that derived classes do not need to call ``__init__`` on the base
-class before invoking its methods :
-
->>> class L(list):
-...      def __init__(self):
-...          pass
-...
->>> L().reverse()
->>> 
-
-Because C++ object construction is a one-step operation, C++ instance
-data cannot be constructed until the arguments are available, in the
-``__init__`` function:
-
->>> class D(SomeBPLClass):
-...      def __init__(self):
-...          pass
-...
->>> D().some_bpl_method()
-Traceback (most recent call last):
-  File "<stdin>", line 1, in ?
-TypeError: bad argument type for built-in operation
-
-This happened because Boost.Python couldn't find instance data of type
-``SomeBPLClass`` within the ``D`` instance; ``D``'s ``__init__``
-function masked construction of the base class.  It could be corrected
-by either removing ``D``'s ``__init__`` function or having it call
-``SomeBPLClass.__init__(...)`` explicitly.
-
-Virtual Functions
-=================
-
-Deriving new types in Python from extension classes is not very
-interesting unless they can be used polymorphically from C++.  In
-other words, Python method implementations should appear to override
-the implementation of C++ virtual functions when called *through base
-class pointers/references from C++*.  Since the only way to alter the
-behavior of a virtual function is to override it in a derived class,
-the user must build a special derived class to dispatch a polymorphic
-class' virtual functions::
-
-    //
-    // interface to wrap:
-    //
-    class Base
-    {
-     public:
-        virtual int f(std::string x) { return 42; }
-        virtual ~Base();
-    };
-
-    int calls_f(Base const& b, std::string x) { return b.f(x); }
-
-    //
-    // Wrapping Code
-    //
-
-    // Dispatcher class
-    struct BaseWrap : Base
-    {
-        // Store a pointer to the Python object
-        BaseWrap(PyObject* self_) : self(self_) {}
-        PyObject* self;
-
-        // Default implementation, for when f is not overridden
-        int f_default(std::string x) { return this->Base::f(x); }
-        // Dispatch implementation
-        int f(std::string x) { return call_method<int>(self, "f", x); }
-    };
-
-    ...
-        def("calls_f", calls_f);
-        class_<Base, BaseWrap>("Base")
-            .def("f", &Base::f, &BaseWrap::f_default)
-            ;
-
-Now here's some Python code which demonstrates:
-
->>> class Derived(Base):
-...     def f(self, s):
-...          return len(s)
-...
->>> calls_f(Base(), 'foo')
-42
->>> calls_f(Derived(), 'forty-two')
-9
-
-Things to notice about the dispatcher class:
-
-* The key element which allows overriding in Python is the
-  ``call_method`` invocation, which uses the same global type
-  conversion registry as the C++ function wrapping does to convert its
-  arguments from C++ to Python and its return type from Python to C++.
-
-* Any constructor signatures you wish to wrap must be replicated with
-  an initial ``PyObject*`` argument
-
-* The dispatcher must store this argument so that it can be used to
-  invoke ``call_method``
-
-* The ``f_default`` member function is needed when the function being
-  exposed is not pure virtual; there's no other way ``Base::f`` can be
-  called on an object of type ``BaseWrap``, since it overrides ``f``.
-
-Admittedly, this formula is tedious to repeat, especially on a project
-with many polymorphic classes; that it is neccessary reflects
-limitations in C++'s compile-time reflection capabilities.  Several
-efforts are underway to write front-ends for Boost.Python which can
-generate these dispatchers (and other wrapping code) automatically.
-If these are successful it will mark a move away from wrapping
-everything directly in pure C++ for many of our users.
-
----------------
- Serialization
----------------
-
-*Serialization* is the process of converting objects in memory to a
-form that can be stored on disk or sent over a network connection. The
-serialized object (most often a plain string) can be retrieved and
-converted back to the original object. A good serialization system will
-automatically convert entire object hierarchies. Python's standard
-``pickle`` module is such a system.  It leverages the language's strong
-runtime introspection facilities for serializing practically arbitrary
-user-defined objects. With a few simple and unintrusive provisions this
-powerful machinery can be extended to also work for wrapped C++ objects.
-Here is an example::
-
-    #include <string>
-
-    struct World
-    {
-        World(std::string a_msg) : msg(a_msg) {}
-        std::string greet() const { return msg; }
-        std::string msg;
-    };
-
-    #include <boost/python.hpp>
-    using namespace boost::python;
-
-    struct World_picklers : pickle_suite
-    {
-      static tuple
-      getinitargs(World const& w) { return make_tuple(w.greet()); }
-    };
-
-    BOOST_PYTHON_MODULE(hello)
-    {
-        class_<World>("World", init<std::string>())
-            .def("greet", &World::greet)
-            .def_pickle(World_picklers())
-        ;
-    }
-
-Now let's create a ``World`` object and put it to rest on disk::
-
-    >>> import hello
-    >>> import pickle
-    >>> a_world = hello.World("howdy")
-    >>> pickle.dump(a_world, open("my_world", "w"))
-
-In a potentially *different script* on a potentially *different
-computer* with a potentially *different operating system*::
-
-    >>> import pickle
-    >>> resurrected_world = pickle.load(open("my_world", "r"))
-    >>> resurrected_world.greet()
-    'howdy'
-
-Of course the ``cPickle`` module can also be used for faster
-processing.
-
-Boost.Python's ``pickle_suite`` fully supports the ``pickle`` protocol
-defined in the standard Python documentation. There is a one-to-one
-correspondence between the standard pickling methods (``__getinitargs__``,
-``__getstate__``, ``__setstate__``) and the functions defined by the
-user in the class derived from ``pickle_suite`` (``getinitargs``,
-``getstate``, ``setstate``). The ``class_::def_pickle()`` member function
-is used to establish the Python bindings for all user-defined functions
-simultaneously. Correct signatures for these functions are enforced at
-compile time. Non-sensical combinations of the three pickle functions
-are also rejected at compile time. These measures are designed to
-help the user in avoiding obvious errors.
-
-Enabling serialization of more complex C++ objects requires a little
-more work than is shown in the example above. Fortunately the
-``object`` interface (see next section) greatly helps in keeping the
-code manageable.
-
-------------------
- Object interface
-------------------
-
-Experienced extension module authors will be familiar with the 'C' view
-of Python objects, the ubiquitous ``PyObject*``. Most if not all Python
-'C' API functions involve ``PyObject*`` as arguments or return type.  A
-major complication is the raw reference counting interface presented to
-the 'C' programmer. E.g. some API functions return *new references* and
-others return *borrowed references*. It is up to the extension module
-writer to properly increment and decrement reference counts.  This
-quickly becomes cumbersome and error prone, especially if there are
-multiple execution paths.
-
-Boost.Python provides a type ``object`` which is essentially a high
-level wrapper around ``PyObject*``. ``object`` automates reference
-counting as much as possible. It also provides the facilities for
-converting arbitrary C++ types to Python objects and vice versa.
-This significantly reduces the learning effort for prospective
-extension module writers.
-
-Creating an ``object`` from any other type is extremely simple::
-
-    object o(3);
-
-``object`` has templated interactions with all other types, with
-automatic to-python conversions. It happens so naturally that it's
-easily overlooked.
-
-The ``extract<T>`` class template can be used to convert Python objects
-to C++ types::
-
-    double x = extract<double>(o);
-
-All registered user-defined conversions are automatically accessible
-through the ``object`` interface. With reference to the ``World`` class
-defined in previous examples::
-
-    object as_python_object(World("howdy"));
-    World back_as_c_plus_plus_object = extract<World>(as_python_object);
-
-If a C++ type cannot be converted to a Python object an appropriate
-exception is thrown at runtime.  Similarly, an appropriate exception is
-thrown if a C++ type cannot be extracted from a Python object.
-``extract<T>`` provides facilities for avoiding exceptions if this is
-desired.
-
-The ``object::attr()`` member function is available for accessing
-and manipulating attributes of Python objects. For example::
-
-    object planet(World());
-    planet.attr("set")("howdy");
-
-``planet.attr("set")`` returns a callable ``object``.  ``"howdy"`` is
-converted to a Python string object which is then passed as an argument
-to the ``set`` method.
-
-The ``object`` type is accompanied by a set of derived types
-that mirror the Python built-in types such as ``list``, ``dict``,
-``tuple``, etc. as much as possible. This enables convenient
-manipulation of these high-level types from C++::
-
-    dict d;
-    d["some"] = "thing";
-    d["lucky_number"] = 13;
-    list l = d.keys();
-
-This almost looks and works like regular Python code, but it is pure C++.
-
-=================
- Thinking hybrid
-=================
-
-For many applications runtime performance considerations are very
-important. This is particularly true for most scientific applications.
-Often the performance considerations dictate the use of a compiled
-language for the core algorithms. Traditionally the decision to use a
-particular programming language is an exclusive one. Because of the
-practical and mental difficulties of combining different languages many
-systems are written in just one language. This is quite unfortunate
-because the price payed for runtime performance is typically a
-significant overhead due to static typing. For example, our experience
-shows that developing maintainable C++ code is typically much more
-time-consuming and requires much more hard-earned working experience
-than developing useful Python code. A related observation is that many
-compiled packages are augmented by some type of rudimentary scripting
-layer. These ad hoc solutions clearly show that many times a compiled
-language alone does not get the job done. On the other hand it is also
-clear that a pure Python implementation is too slow for numerically
-intensive production code.
-
-Boost.Python enables us to *think hybrid* when developing new
-applications. Python can be used for rapidly prototyping a
-new application. Python's ease of use and the large pool of standard
-libraries give us a head start on the way to a first working system. If
-necessary, the working procedure can be used to discover the
-rate-limiting algorithms. To maximize performance these can be
-reimplemented in C++, together with the Boost.Python bindings needed to
-tie them back into the existing higher-level procedure.
-
-Of course, this *top-down* approach is less attractive if it is clear
-from the start that many algorithms will eventually have to be
-implemented in a compiled language. Fortunately Boost.Python also
-enables us to pursue a *bottom-up* approach. We have used this approach
-very successfully in the development of a toolbox for scientific
-applications (scitbx) that we will describe elsewhere. The toolbox
-started out mainly as a library of C++ classes with Boost.Python
-bindings, and for a while the growth was mainly concentrated on the C++
-parts. However, as the toolbox is becoming more complete, more and more
-newly added functionality can be implemented in Python. We expect this
-trend to continue, as illustrated qualitatively in this figure:
-
-.. image:: python_cpp_mix.png
-
-This figure shows the ratio of newly added C++ and Python code over
-time as new algorithms are implemented. We expect this ratio to level
-out near 70% Python. The increasing ability to solve new problems
-mostly with the easy-to-use Python language rather than a necessarily
-more arcane statically typed language is the return on the investment
-of learning how to use Boost.Python. The ability to solve some problems
-entirely using only Python will enable a larger group of people to
-participate in the rapid development of new applications.
-
-=============
- Conclusions
-=============
-
-The examples in this paper illustrate that Boost.Python enables
-seamless interoperability between C++ and Python. Importantly, this is
-achieved without introducing a third syntax: the Python/C++ interface
-definitions are written in pure C++. This avoids any problems with
-parsing the C++ code to be interfaced to Python, yet the interface
-definitions are concise and maintainable. Freed from most of the
-development-time penalties of crossing a language boundary, software
-designers can take full advantage of two rich and complimentary
-language environments. In practice it turns out that some things are
-very difficult to do with pure Python/C (e.g. an efficient array
-library with an intuitive interface in the compiled language) and
-others are very difficult to do with pure C++ (e.g. serialization).
-If one has the luxury of being able to design a software system as a
-hybrid system from the ground up there are many new ways of avoiding
-road blocks in one language or the other.
-
-.. I'm not ready to give up on all of this quite yet
-
-.. Perhaps one day we'll have a language with the simplicity and
-   expressive power of Python and the compile-time muscle of C++.  Being
-   able to take advantage of all of these facilities without paying the
-   mental and development-time penalties of crossing a language barrier
-   would bring enormous benefits.  Until then, interoperability tools
-   like Boost.Python can help lower the barrier and make the benefits of
-   both languages more accessible to both communities.
-
-===========
- Footnotes
-===========
-
-.. [#mi] For hard-core new-style class/extension module writers it is
-   worth noting that the normal requirement that all extension classes
-   with data form a layout-compatible single-inheritance chain is
-   lifted for Boost.Python extension classes.  Clearly, either
-   ``Base1`` or ``Base2`` has to occupy a different offset in the
-   ``Derived`` class instance.  This is possible because the wrapped
-   part of BPL extension class instances is never assumed to have a
-   fixed offset within the wrapper.
-
-===========
- Citations
-===========
-
-.. [VELD1995] T. Veldhuizen, "Expression Templates," C++ Report,
-   Vol. 7 No. 5 June 1995, pp. 26-31.
-   http://osl.iu.edu/~tveldhui/papers/Expression-Templates/exprtmpl.html
diff --git a/doc/PyConDC_2003/default.css b/doc/PyConDC_2003/default.css
deleted file mode 100644
index 2e1fddb9..00000000
--- a/doc/PyConDC_2003/default.css
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-:Author: David Goodger
-:Contact: goodger@users.sourceforge.net
-:date: $Date$
-:version: $Revision$
-:copyright: This stylesheet has been placed in the public domain.
-
-Default cascading style sheet for the HTML output of Docutils.
-*/
-
-.first {
-  margin-top: 0 }
-
-.last {
-  margin-bottom: 0 }
-
-a.toc-backref {
-  text-decoration: none ;
-  color: black }
-
-dd {
-  margin-bottom: 0.5em }
-
-div.abstract {
-  margin: 2em 5em }
-
-div.abstract p.topic-title {
-  font-weight: bold ;
-  text-align: center }
-
-div.attention, div.caution, div.danger, div.error, div.hint,
-div.important, div.note, div.tip, div.warning {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em }
-
-div.attention p.admonition-title, div.caution p.admonition-title,
-div.danger p.admonition-title, div.error p.admonition-title,
-div.warning p.admonition-title {
-  color: red ;
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.hint p.admonition-title, div.important p.admonition-title,
-div.note p.admonition-title, div.tip p.admonition-title {
-  font-weight: bold ;
-  font-family: sans-serif }
-
-div.dedication {
-  margin: 2em 5em ;
-  text-align: center ;
-  font-style: italic }
-
-div.dedication p.topic-title {
-  font-weight: bold ;
-  font-style: normal }
-
-div.figure {
-  margin-left: 2em }
-
-div.footer, div.header {
-  font-size: smaller }
-
-div.system-messages {
-  margin: 5em }
-
-div.system-messages h1 {
-  color: red }
-
-div.system-message {
-  border: medium outset ;
-  padding: 1em }
-
-div.system-message p.system-message-title {
-  color: red ;
-  font-weight: bold }
-
-div.topic {
-  margin: 2em }
-
-h1.title {
-  text-align: center }
-
-h2.subtitle {
-  text-align: center }
-
-hr {
-  width: 75% }
-
-ol.simple, ul.simple {
-  margin-bottom: 1em }
-
-ol.arabic {
-  list-style: decimal }
-
-ol.loweralpha {
-  list-style: lower-alpha }
-
-ol.upperalpha {
-  list-style: upper-alpha }
-
-ol.lowerroman {
-  list-style: lower-roman }
-
-ol.upperroman {
-  list-style: upper-roman }
-
-p.caption {
-  font-style: italic }
-
-p.credits {
-  font-style: italic ;
-  font-size: smaller }
-
-p.label {
-  white-space: nowrap }
-
-p.topic-title {
-  font-weight: bold }
-
-pre.address {
-  margin-bottom: 0 ;
-  margin-top: 0 ;
-  font-family: serif ;
-  font-size: 100% }
-
-pre.line-block {
-  font-family: serif ;
-  font-size: 100% }
-
-pre.literal-block, pre.doctest-block {
-  margin-left: 2em ;
-  margin-right: 2em ;
-  background-color: #eeeeee }
-
-span.classifier {
-  font-family: sans-serif ;
-  font-style: oblique }
-
-span.classifier-delimiter {
-  font-family: sans-serif ;
-  font-weight: bold }
-
-span.interpreted {
-  font-family: sans-serif }
-
-span.option-argument {
-  font-style: italic }
-
-span.pre {
-  white-space: pre }
-
-span.problematic {
-  color: red }
-
-table {
-  margin-top: 0.5em ;
-  margin-bottom: 0.5em }
-
-table.citation {
-  border-left: solid thin gray ;
-  padding-left: 0.5ex }
-
-table.docinfo {
-  margin: 2em 4em }
-
-table.footnote {
-  border-left: solid thin black ;
-  padding-left: 0.5ex }
-
-td, th {
-  padding-left: 0.5em ;
-  padding-right: 0.5em ;
-  vertical-align: top }
-
-th.docinfo-name, th.field-name {
-  font-weight: bold ;
-  text-align: left ;
-  white-space: nowrap }
-
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
-  font-size: 100% }
-
-tt {
-  background-color: #eeeeee }
-
-ul.auto-toc {
-  list-style-type: none }
diff --git a/doc/PyConDC_2003/python_cpp_mix.jpg b/doc/PyConDC_2003/python_cpp_mix.jpg
deleted file mode 100755
index 755a9605..00000000
Binary files a/doc/PyConDC_2003/python_cpp_mix.jpg and /dev/null differ
diff --git a/doc/PyConDC_2003/python_cpp_mix.png b/doc/PyConDC_2003/python_cpp_mix.png
deleted file mode 100755
index fd74cbb2..00000000
Binary files a/doc/PyConDC_2003/python_cpp_mix.png and /dev/null differ
diff --git a/doc/boost.css b/doc/boost.css
deleted file mode 100644
index cf5c8a97..00000000
--- a/doc/boost.css
+++ /dev/null
@@ -1,59 +0,0 @@
-H1
-{
-    FONT-SIZE: 200%
-    COLOR: #00007f
-}
-H2
-{
-    FONT-SIZE: 150%;
-}
-H3
-{
-    FONT-SIZE: 125%;
-}
-H4
-{
-    FONT-SIZE: 108%;
-}
-BODY
-{
-    FONT-SIZE: 100%;
-    BACKGROUND-COLOR: #ffffff
-}
-PRE
-{
-    MARGIN-LEFT: 2pc;
-    FONT-SIZE: 80%;
-    BACKGROUND-COLOR: #dfffff
-}
-CODE
-{
-    FONT-SIZE: 95%;
-     white-space: pre
-}
-.index
-{
-    TEXT-ALIGN: left
-}
-.page-index
-{
-	TEXT-ALIGN: left
-}
-.definition
-{
-	TEXT-ALIGN: left
-}
-.footnote
-{
-    FONT-SIZE: 66%;
-    VERTICAL-ALIGN: super;
-    TEXT-DECORATION: none
-}
-.function-semantics
-{
-    CLEAR: left
-}
-.metafunction-semantics
-{
-    CLEAR: left
-}
diff --git a/doc/building.html b/doc/building.html
deleted file mode 100644
index 56aca62e..00000000
--- a/doc/building.html
+++ /dev/null
@@ -1,424 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="boost.css">
-
-    <title>Boost.Python - Building and Testing</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Building and Testing</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="Reference">
-      <dt><a href="#requirements">Requirements</a></dt>
-
-      <dt><a href="#building">Building Boost.Python</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="#configuration">Configuration</a></dt>
-
-          <dt><a href="#cygwin_configuration">Configuration for Cygwin GCC
-          from a Windows prompt</a></dt>
-
-          <dt><a href="#results">Results</a></dt>
-
-          <dt><a href="#cygwin">Notes for Cygwin GCC Users</a></dt>
-
-          <dt><a href="#mingw">Notes for MinGW (and Cygwin with -mno-cygwin)
-          GCC Users</a></dt>
-
-          <dt><a href="#testing">Testing</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#building_ext">Building your Extension Module</a></dt>
-
-      <dt><a href="#variants">Build Variants</a></dt>
-
-      <dt><a href="#VisualStudio">Building Using the Microsoft Visual Studio
-      IDE</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="requirements">Requirements</a></h2>
-    <b>Boost.Python</b> version 2 requires <a href=
-    "http://www.python.org/2.2">Python 2.2</a> <i>or <a href=
-    "http://www.python.org">newer</a></i>. An unsupported archive of
-    Boost.Python version 1, which works with versions of Python since 1.5.2,
-    is available <a href="../build/python_v1.zip">here</a>. 
-
-    <h2><a name="building">Building Boost.Python</a></h2>
-
-    <p>Normally, Boost.Python extension modules must be linked with the
-    <code>boost_python</code> shared library. In special circumstances you
-    may want to link to a static version of the <code>boost_python</code>
-    library, but if multiple Boost.Python extension modules are used
-    together, it will prevent sharing of types across extension modules, and
-    consume extra code space. To build <code>boost_python</code>, use <a
-    href="../../../tools/build/index.html">Boost.Build</a> in the usual way
-    from the <code>libs/python/build</code> subdirectory of your boost
-    installation (if you have already built boost from the top level this may
-    have no effect, since the work is already done).</p>
-
-    <h3><a name="configuration">Basic Configuration</a></h3>
-    You may need to configure the following variables to point Boost.Build at
-    your Python installation: 
-
-    <table border="1" summary="build configuration variables">
-      <tr>
-        <th>Variable Name</th>
-
-        <th>Semantics</th>
-
-        <th>Default</th>
-
-        <th>Notes</th>
-      </tr>
-
-      <tr>
-        <td><code>PYTHON_ROOT</code></td>
-
-        <td>The root directory of your Python installation</td>
-
-        <td>Windows:&nbsp;<code>c:/tools/python</code>
-        Unix:&nbsp;<code>/usr/local</code></td>
-
-        <td>On Unix, this is the <code>--with-prefix=</code> directory used
-        to configure Python</td>
-      </tr>
-
-      <tr>
-        <td><code>PYTHON_VERSION</code></td>
-
-        <td>The The 2-part python Major.Minor version number</td>
-
-        <td><code>2.2</code></td>
-
-        <td>Be sure not to include a third number, e.g. <b>not</b>
-        "<code>2.2.1</code>", even if that's the version you have.</td>
-      </tr>
-
-      <tr>
-        <td><code>PYTHON_INCLUDES</code></td>
-
-        <td>path to Python <code>#include</code> directories</td>
-
-        <td>Autoconfigured from <code>PYTHON_ROOT</code>. Try the default
-        before attempting to set it yourself.</td>
-      </tr>
-
-      <tr>
-        <td><code>PYTHON_LIB_PATH</code></td>
-
-        <td>path to Python library object.</td>
-
-        <td>Autoconfigured from <code>PYTHON_ROOT</code>. Try the default
-        before attempting to set it yourself.</td>
-      </tr>
-    </table>
-
-    <h3><a name="cygwin_configuration">Configuration for Cygwin GCC from a
-    Windows prompt</a></h3>
-    The following settings may be useful when building with <a href=
-    "http://www.cygwin.com">Cygwin</a> GCC (not MinGW) from a Windows command
-    shell using a Windows build of <code>bjam</code>. <b>If
-    "<code>bjam&nbsp;-v</code>" does not report "<code>OS=NT</code>", these
-    settings do not apply to you</b>; you should use the <a href=
-    "#configuration">normal configuration</a> variables instead. They are
-    only useful when building and testing with multiple toolsets on Windows
-    using a single build command, since Cygwin GCC requires a different build
-    of Python. 
-
-    <table border="1" summary=
-    "Cygwin GCC under NT build configuration variables">
-      <tr>
-        <th>Variable Name</th>
-
-        <th>Semantics</th>
-
-        <th>Default</th>
-      </tr>
-
-      <tr>
-        <td><code>CYGWIN_PYTHON_[DEBUG_]VERSION</code></td>
-
-        <td>The version of python being used under Cygwin.</td>
-
-        <td>$(PYTHON_VERSION)</td>
-      </tr>
-
-      <tr>
-        <td><code>CYGWIN_PYTHON_[DEBUG_]ROOT</code></td>
-
-        <td>unix-style path containing the <code>include/</code> directory
-        containing
-        <code>python$(CYGWIN_PYTHON_[DEBUG_]VERSION)/python.h</code>.</td>
-
-        <td>$(PYTHON_ROOT)</td>
-      </tr>
-
-      <tr>
-        <td><code>CYGWIN_PYTHON_[DEBUG_]LIB_PATH</code></td>
-
-        <td>path containing the user's Cygwin Python import lib
-        <code>libpython$(CYGWIN_PYTHON_[DEBUG_]VERSION).dll.a</code></td>
-
-        <td>Autoconfigured from <code>CYGWIN_PYTHON_ROOT</code></td>
-      </tr>
-
-      <tr>
-        <td><code>CYGWIN_PYTHON_[DEBUG_]DLL_PATH</code></td>
-
-        <td>path containing the user's Cygwin Python dll
-        (<code>libpython$(CYGWIN_PYTHON_[DEBUG_]VERSION).dll</code>)</td>
-
-        <td><code>/bin</code></td>
-      </tr>
-    </table>
-
-    <h3><a name="cygwin">Notes for Cygwin GCC Users</a></h3>
-
-    <p>If you are using Cygwin GCC to build extension modules, you must use a
-    Cygwin build of Python. The regular Win32 Python installation that you
-    can download from <a href="http://www.python.org">python.org</a> will not
-    work with your compiler because the dynamic linking conventions are
-    different (you can use <a href="http://www.mingw.org/">MinGW</a> GCC if
-    you want to build extension modules which are compatible with a stock
-    Win32 Python). The Cygwin installer may be able to install an appropriate
-    version of Python, or you can follow the traditional <a href=
-    "http://www.python.org/download/download_source.html">Unix installation
-    process</a> to build Python from source.</p>
-
-    <p>The special build configuration variables listed <a href=
-    "#cygwin_configuration">above</a> make it possible to use a regular Win32
-    build of bjam to build and test Boost.Python and Boost.Python extensions
-    using Cygwin GCC and targeting a Cygwin build of Python.</p>
-
-    <h3><a name="mingw">Notes for MinGW (and Cygwin with -mno-cygwin) GCC
-    Users</a></h3>
-
-    <p>You will need to create a MinGW-compatible version of the Python
-    library; the one shipped with Python will only work with a
-    Microsoft-compatible linker. Follow the instructions in the
-    "Non-Microsoft" section of the "Building Extensions: Tips And Tricks"
-    chapter in <a href=
-    "http://www.python.org/doc/current/inst/index.html">Installing Python
-    Modules</a> to create <code>libpythonXX.a</code>, where <code>XX</code>
-    corresponds to the major and minor version numbers of your Python
-    installation.</p>
-
-    <h3><a name="results">Results</a></h3>
-
-    <p>The build process will create a
-    <code>libs/python/build/bin-stage</code> subdirectory of the boost root
-    (or of <code>$(ALL_LOCATE_TARGET)</code>, if you have set that variable),
-    containing the built libraries. The libraries are actually built to
-    unique directories for each toolset and variant elsewhere in the
-    filesystem, and copied to the <code>bin-stage</code> directory as a
-    convenience, so if you build with multiple toolsets at once, the product
-    of later toolsets will overwrite that of earlier toolsets in
-    <code>bin-stage</code>.</p>
-
-    <h3><a name="testing">Testing</a></h3>
-
-    <p>To build and test Boost.Python, start from the
-    <code>libs/python/test</code> directory and invoke</p>
-
-    <blockquote>
-<pre>
-bjam -sTOOLS=<i><a href=
-"../../../tools/build/index.html#Tools">toolset</a></i> test
-</pre>
-    </blockquote>
-    This will update all of the Boost.Python v1 test and example targets. The
-    tests are relatively quiet by default. To get more-verbose output, you
-    might try 
-
-    <blockquote>
-<pre>
-bjam -sTOOLS=<i><a href=
-"../../../tools/build/index.html#Tools">toolset</a></i> -sPYTHON_TEST_ARGS=-v test
-</pre>
-    </blockquote>
-    which will print each test's Python code with the expected output as it
-    passes. 
-
-    <h2><a name="building_ext">Building your Extension Module</a></h2>
-    Though there are other approaches, the smoothest and most reliable
-    way to build an extension module using Boost.Python is with
-    Boost.Build. If you have to use another build system, you should
-    use Boost.Build at least once with the
-    "<code><b>-n</b></code>" option so you can see the command-lines it uses,
-    and replicate them. You are likely to run into compilation or linking
-    problems otherwise. 
-
-    The <code><a href="../example">libs/python/example</a></code>
-    subdirectory of your boost installation contains a small example
-    which builds and tests two extensions. To build your own
-    extensions copy the example subproject and make the following two edits:
-
-<ol>
-<li><code><a
-href="../example/boost-build.jam"><b>boost-build.jam</b></a></code> -
-edit the line which reads
-
-<blockquote>
-<pre>
-boost-build ../../../tools/build ;
-</pre>
-</blockquote>
-
-so that the path refers to the <code>tools/build</code> subdirectory
-of your Boost installation.
-
-
-<li><code><a href="../example/Jamrules"><b>Jamrules</b></a></code> -
-edit the line which reads
-
-<blockquote>
-<pre>
-path-global BOOST_ROOT : ../../.. ;
-</pre>
-</blockquote>
-so that the path refers to the root directory of your Boost installation.
-</ol>
-
-<p>
-    The instructions <a href="#testing">above</a> for testing Boost.Python
-    apply equally to your new extension modules in this subproject. 
-
-    <h2><a name="variants">Build Variants</a></h2>
-    Three <a href=
-    "../../../tools/build/build_system.htm#variants">variant</a>
-    configurations of all python-related targets are supported, and can be
-    selected by setting the <code><a href=
-    "../../../tools/build/build_system.htm#user_globals">BUILD</a></code>
-    variable: 
-
-    <ul>
-      <li><code>release</code> (optimization, <tt>-DNDEBUG</tt>)</li>
-
-      <li><code>debug</code> (no optimization <tt>-D_DEBUG</tt>)</li>
-
-      <li><code>debug-python</code> (no optimization, <tt>-D_DEBUG
-      -DBOOST_DEBUG_PYTHON</tt>)</li>
-    </ul>
-
-    <p>The first two variants of the <code>boost_python</code> library are
-    built by default, and are compatible with the default Python
-    distribution. The <code>debug-python</code> variant corresponds to a
-    specially-built debugging version of Python. On Unix platforms, this
-    python is built by adding <code>--with-pydebug</code> when configuring
-    the Python build. On Windows, the debugging version of Python is
-    generated by the "Win32 Debug" target of the <code>PCBuild.dsw</code>
-    Visual C++ 6.0 project in the <code>PCBuild</code> subdirectory of your
-    Python distribution. Extension modules built with Python debugging
-    enabled are <b>not link-compatible</b> with a non-debug build of Python.
-    Since few people actually have a debug build of Python (it doesn't come
-    with the standard distribution), the normal <code>debug</code> variant
-    builds modules which are compatible with ordinary Python.</p>
-
-    <p>On many windows compilers, when extension modules are built with
-    <tt>-D_DEBUG</tt>, Python defaults to <i>force</i> linking with a special
-    debugging version of the Python DLL. Since this debug DLL isn't supplied
-    with the default Python installation for Windows, Boost.Python uses
-    <tt><a href=
-    "../../../boost/python/detail/wrap_python.hpp">boost/python/detail/wrap_python.hpp</a></tt>
-    to temporarily undefine <tt>_DEBUG</tt> when <tt>Python.h</tt> is
-    <tt>#include</tt>d - unless <code>BOOST_DEBUG_PYTHON</code> is
-    defined.</p>
-
-    <p>If you want the extra runtime checks available with the debugging
-    version of the library, <tt>#define BOOST_DEBUG_PYTHON</tt> to re-enable
-    python debuggin, and link with the <code>debug-python</code> variant of
-    <tt>boost_python</tt>.</p>
-
-    <p>If you do not <tt>#define BOOST_DEBUG_PYTHON</tt>, be sure that any
-    source files in your extension module <tt>#include&nbsp;&lt;<a href=
-    "../../../boost/python/detail/wrap_python.hpp">boost/python/detail/wrap_python.hpp</a>&gt;</tt>
-    instead of the usual <tt>Python.h</tt>, or you will have link
-    incompatibilities.<br>
-    </p>
-
-    <h2><a name="VisualStudio">Building Using the Microsoft Visual Studio
-    IDE</a></h2>
-
-    <p>For the those of you who feel more comfortable in the IDE world, a
-    workspace and project file have been included in the <a href=
-    "../build/VisualStudio">libs/python/build/VisualStudio</a> subdirectory.
-    It builds release and debug versions of the Boost.Python libraries and
-    places them and the same directory as Jamfile build does, though the
-    intermediate object files are placed in a different directory. The files
-    have been created using Microsoft Visual C++ version 6, but they should
-    work for later versions as well. You will need to tell the IDE where to
-    find the Python <code>Include/</code> and <code>Libs/</code> directories.
-    Under <b>Tools&gt;Options&gt;Directories</b>, add an entry for the Python
-    include dir (i.e. <code>c:/Python22/Include</code>), and one for the Lib
-    (i.e. <code>c:/Python/Libs</code>. Make sure it is <code>Libs</code> with
-    an "<code>s</code>" and not just <code>Lib</code>).</p>
-
-    <h3>Using the IDE for your own projects</h3>
-
-    <p>Building your own projects using the IDE is slightly more complicated.
-    Firstly, you need to make sure that the project you create as the right
-    kind. It should be a "Win32 Dynamic-Link Library". The default one that
-    Visual Studio 6 creates needs some modifications: turn on RTTI, and
-    change the debug and release builds to use the respective debug and
-    release Multithreaded DLL versions. You should probably turn off
-    incremental linking too -- I believe it a bit flaky. If you do this, then
-    change the "Debug Info" to "Program Database" to get rid of the Edit and
-    Continue warning.</p>
-
-    <p>You'll need to add the Boost root directory under
-    <b>Tools&gt;Options&gt;Directories</b> to get your code compiling. To
-    make it link, add the above <code>boost_python.dsp</code> file to your
-    workspace, and make your project depend upon it (under
-    <b>Project&gt;Dependencies</b>). You should be able to build now.</p>
-
-    <p>Lastly, go to the <b>Project Settings&gt;Debug</b> Page and add the
-    <code>Python.exe</code> as the executable for the project. Set a startup
-    directory, and make sure that your current project's output dll, the
-    <code>boost_python.dll</code> and the <code>python22.dll</code> are on
-    the current <code>PATH</code>. If you have a python script that tests
-    your dll, then add it in the "Program Arguments". Now, if all went well,
-    you should be able to hit the Run (F5) button, and debug your code.</p>
-
-    <blockquote>
-      <em>The Visual Studio project files are graciously contributed and
-      maintained by <a href="mailto:brett.calcott@paradise.net.nz">Brett
-      Calcott</a></em>.
-    </blockquote>
-    <hr>
-
-    <p>&copy; Copyright David Abrahams 2002. Permission to copy, use, modify,
-    sell and distribute this document is granted provided this copyright
-    notice appears in all copies. This document is provided ``as is'' without
-    express or implied warranty, and with no claim as to its suitability for
-    any purpose.</p>
-
-    <p>Updated: 29 December, 2002 (David Abrahams)</p>
-  </body>
-</html>
-
diff --git a/doc/index.html b/doc/index.html
deleted file mode 100644
index f10493f1..00000000
--- a/doc/index.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="boost.css">
-
-    <title>Boost.Python</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center">Boost.Python</h1>
-
-          <h2 align="center">Index</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Synopsis</h2>
-    Welcome to version 2 of <b>Boost.Python</b>, a C++ library which enables
-    seamless interoperability between C++ and the <a href=
-    "http://www.python.org">Python</a> programming language. The new version
-    has been rewritten from the ground up, with a more convenient and
-    flexible interface, and many new capabilities, including support for: 
-
-    <ul>
-      <li>References and Pointers</li>
-
-      <li>Globally Registered Type Coercions</li>
-
-      <li>Automatic Cross-Module Type Conversions</li>
-
-      <li>Efficient Function Overloading</li>
-
-      <li>C++ to Python Exception Translation</li>
-
-      <li>Default Arguments</li>
-
-      <li>Keyword Arguments</li>
-
-      <li>Manipulating Python objects in C++</li>
-
-      <li>Exporting C++ Iterators as Python Iterators</li>
-
-      <li>Documentation Strings</li>
-    </ul>
-    The development of these features was funded in part by grants to <a
-    href="http://www.boost-consulting.com">Boost Consulting</a> from the <a
-    href="http://www.llnl.gov/">Lawrence Livermore National Laboratories</a>
-    and by the <a href="http://cci.lbl.gov/">Computational Crystallography
-    Initiative</a> at Lawrence Berkeley National Laboratories. 
-
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="index">
-      <dt><a href="tutorial/index.html">Tutorial Introduction</a></dt>
-
-      <dt><a href="building.html">Building and Testing</a></dt>
-
-      <dt><a href="v2/reference.html">Reference Manual</a></dt>
-
-      <dt><a href="v2/configuration.html">Configuration Information</a></dt>
-
-      <dt><a href="v2/platforms.html">Known Working Platforms and
-      Compilers</a></dt>
-
-      <dt><a href="v2/definitions.html">Definitions</a></dt>
-
-      <dt><a href="projects.html">Projects using Boost.Python</a></dt>
-
-      <dt><a href="support.html">Support Resources</a></dt>
-
-      <dt><a href="v2/faq.html">Frequently Asked Questions (FAQs)</a></dt>
-      
-      <dt><a href="../pyste/index.html">Pyste (Boost.Python code generator)</a></dt>
-
-      <dt><a href="internals.html">Internals Documentation</a></dt>
-
-      <dt><a href="news.html">News/Change Log</a></dt>
- 
-      <dt><a href="../todo.html">TODO list</a></dt>
-
-     <dt><a href="v2/progress_reports.html">LLNL Progress Reports</a></dt>
-
-      <dt><a href="v2/acknowledgments.html">Acknowledgments</a></dt>
-    </dl>
-    <hr>
-
-    <h2>Articles</h2>
-
-      &quot;<a href="PyConDC_2003/bpl.html">Building Hybrid
-      Systems With Boost Python</a>&quot;, by Dave Abrahams and Ralf
-      W. Grosse-Kunstleve (<a href="PyConDC_2003/bpl.pdf">PDF</a>)
-
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     26 August, 2003
-    <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href="../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002-2003. All Rights Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/internals.html b/doc/internals.html
deleted file mode 100755
index 4f7984f0..00000000
--- a/doc/internals.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.3.0: http://docutils.sourceforge.net/" />
-<title>Boost.Python Internals Boost</title>
-<link rel="stylesheet" href="../../../rst.css" type="text/css" />
-</head>
-<body>
-<div class="document" id="boost-python-internals-logo">
-<h1 class="title"><a class="reference" href="index.html">Boost.Python</a> Internals <a class="reference" href="../../../index.htm"><img alt="Boost" src="../../../c++boost.gif" /></a></h1>
-<div class="section" id="a-conversation-between-brett-calcott-and-david-abrahams">
-<h1><a name="a-conversation-between-brett-calcott-and-david-abrahams">A conversation between Brett Calcott and David Abrahams</a></h1>
-<table class="field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field"><th class="field-name">copyright:</th><td class="field-body">Copyright David Abrahams and Brett Calcott 2003. See
-accompanying <a class="reference" href="../../../LICENSE">license</a> for terms of use.</td>
-</tr>
-</tbody>
-</table>
-<p>In both of these cases, I'm quite capable of reading code - but the
-thing I don't get from scanning the source is a sense of the
-architecture, both structurally, and temporally (er, I mean in what
-order things go on).</p>
-<ol class="arabic">
-<li><p class="first">What happens when you do the following:</p>
-<pre class="literal-block">
-struct boring {};
-...etc...
-class_&lt;boring&gt;(&quot;boring&quot;)
-    ;
-</pre>
-</li>
-</ol>
-<p>There seems to be a fair bit going on.</p>
-<blockquote>
-<ul class="simple">
-<li>Python needs a new ClassType to be registered.</li>
-<li>We need to construct a new type that can hold our boring struct.</li>
-<li>Inward and outward converters need to be registered for the type.</li>
-</ul>
-</blockquote>
-<p>Can you gesture in the general direction where these things are done?</p>
-<blockquote>
-<p>I only have time for a &quot;off-the-top-of-my-head&quot; answer at the moment;
-I suggest you step through the code with a debugger after reading this
-to see how it works, fill in details, and make sure I didn't forget
-anything.</p>
-<blockquote>
-<p>A new (Python) subclass of Boost.Python.Instance (see
-libs/python/src/object/class.cpp) is created by invoking
-Boost.Python.class, the metatype:</p>
-<pre class="literal-block">
-&gt;&gt;&gt; boring = Boost.Python.class(
-...     'boring'
-...   , bases_tuple       # in this case, just ()
-...   , { 
-...         '__module__' : module_name
-...       , '__doc__' : doc_string # optional
-...     }
-... )
-</pre>
-<p>A handle to this object is stuck in the m_class_object field
-of the registration associated with <tt class="literal"><span class="pre">typeid(boring)</span></tt>.  The
-registry will keep that object alive forever, even if you
-wipe out the 'boring' attribute of the extension module
-(probably not a good thing).</p>
-<p>Because you didn't specify <tt class="literal"><span class="pre">class&lt;boring,</span> <span class="pre">non_copyable,</span>
-<span class="pre">...&gt;</span></tt>, a to-python converter for boring is registered which
-copies its argument into a value_holder held by the the
-Python boring object.</p>
-<p>Because you didn't specify <tt class="literal"><span class="pre">class&lt;boring</span> <span class="pre">...&gt;(no_init)</span></tt>,
-an <tt class="literal"><span class="pre">__init__</span></tt> function object is added to the class
-dictionary which default-constructs a boring in a
-value_holder (because you didn't specify some smart pointer
-or derived wrapper class as a holder) held by the Python
-boring object.</p>
-<p><tt class="literal"><span class="pre">register_class_from_python</span></tt> is used to register a
-from-python converter for <tt class="literal"><span class="pre">shared_ptr&lt;boring&gt;</span></tt>.
-<tt class="literal"><span class="pre">boost::shared_ptr</span></tt>s are special among smart pointers
-because their Deleter argument can be made to manage the
-whole Python object, not just the C++ object it contains, no
-matter how the C++ object is held.</p>
-<p>If there were any <tt class="literal"><span class="pre">bases&lt;&gt;</span></tt>, we'd also be registering the
-relationship between these base classes and boring in the
-up/down cast graph (<tt class="literal"><span class="pre">inheritance.[hpp/cpp]</span></tt>).</p>
-<p>In earlier versions of the code, we'd be registering lvalue
-from-python converters for the class here, but now
-from-python conversion for wrapped classes is handled as a
-special case, before consulting the registry, if the source
-Python object's metaclass is the Boost.Python metaclass.</p>
-<p>Hmm, that from-python converter probably ought to be handled
-the way class converters are, with no explicit conversions
-registered.</p>
-</blockquote>
-</blockquote>
-<ol class="arabic" start="2">
-<li><p class="first">Can you give a brief overview of the data structures that are
-present in the registry</p>
-<blockquote>
-<p>The registry is simple: it's just a map from typeid -&gt;
-registration (see boost/python/converter/registrations.hpp).
-<tt class="literal"><span class="pre">lvalue_chain</span></tt> and <tt class="literal"><span class="pre">rvalue_chain</span></tt> are simple endogenous
-linked lists.</p>
-<p>If you want to know more, just ask.</p>
-<p>If you want to know about the cast graph, ask me something specific in
-a separate message.</p>
-</blockquote>
-<p>and an overview of the process that happens as a type makes its
-way from c++ to python and back again.</p>
-</li>
-</ol>
-<blockquote>
-<p>Big subject.  I suggest some background reading: look for relevant
-info in the LLNL progress reports and the messages they link to.
-Also,</p>
-<blockquote>
-<p><a class="reference" href="http://mail.python.org/pipermail/c++-sig/2002-May/001023.html">http://mail.python.org/pipermail/c++-sig/2002-May/001023.html</a></p>
-<p><a class="reference" href="http://mail.python.org/pipermail/c++-sig/2002-December/003115.html">http://mail.python.org/pipermail/c++-sig/2002-December/003115.html</a></p>
-<p><a class="reference" href="http://aspn.activestate.com/ASPN/Mail/Message/1280898">http://aspn.activestate.com/ASPN/Mail/Message/1280898</a></p>
-<p><a class="reference" href="http://mail.python.org/pipermail/c++-sig/2002-July/001755.html">http://mail.python.org/pipermail/c++-sig/2002-July/001755.html</a></p>
-</blockquote>
-<p>from c++ to python:</p>
-<blockquote>
-<p>It depends on the type and the call policies in use or, for
-<tt class="literal"><span class="pre">call&lt;&gt;(...)</span></tt>, <tt class="literal"><span class="pre">call_method&lt;&gt;(...)</span></tt>, or <tt class="literal"><span class="pre">object(...)</span></tt>, if
-<tt class="literal"><span class="pre">ref</span></tt> or <tt class="literal"><span class="pre">ptr</span></tt> is used.  There are also two basic
-categories to to-python conversion, &quot;return value&quot; conversion
-(for Python-&gt;C++ calls) and &quot;argument&quot; conversion (for
-C++-&gt;Python calls and explicit <tt class="literal"><span class="pre">object()</span></tt> conversions).  The
-behavior of these two categories differs subtly in various ways
-whose details I forget at the moment.  You can probably find
-the answers in the above references, and certainly in the code.</p>
-<p>The &quot;default&quot; case is by-value (copying) conversion, which uses
-to_python_value as a to-python converter.</p>
-<blockquote>
-<p>Since there can sensibly be only one way to convert any type
-to python (disregarding the idea of scoped registries for the
-moment), it makes sense that to-python conversions can be
-handled by specializing a template.  If the type is one of
-the types handled by a built-in conversion
-(builtin_converters.hpp), the corresponding template
-specialization of to_python_value gets used.</p>
-<p>Otherwise, to_python_value uses the <tt class="literal"><span class="pre">m_to_python</span></tt>
-function in the registration for the C++ type.</p>
-</blockquote>
-<p>Other conversions, like by-reference conversions, are only
-available for wrapped classes, and are requested explicitly by
-using <tt class="literal"><span class="pre">ref(...)</span></tt>, <tt class="literal"><span class="pre">ptr(...)</span></tt>, or by specifying different
-CallPolicies for a call, which can cause a different to-python
-converter to be used.  These conversions are never registered
-anywhere, though they do need to use the registration to find
-the Python class corresponding to the C++ type being referred
-to.  They just build a new Python instance and stick the
-appropriate Holder instance in it.</p>
-</blockquote>
-<p>from python to C++:</p>
-<blockquote>
-<p>Once again I think there is a distinction between &quot;return value&quot;
-and &quot;argument&quot; conversions, and I forget exactly what that is.</p>
-<p>What happens depends on whether an lvalue conversion is needed
-(see <a class="reference" href="http://mail.python.org/pipermail/c++-sig/2002-May/001023.html">http://mail.python.org/pipermail/c++-sig/2002-May/001023.html</a>)
-All lvalue conversions are also registered in a type's rvalue
-conversion chain, since when an rvalue will do, an lvalue is
-certainly good enough.</p>
-<p>An lvalue conversion can be done in one step (just get me the
-pointer to the object - it can be <tt class="literal"><span class="pre">NULL</span></tt> if no conversion is
-possible) while an rvalue conversion requires two steps to
-support wrapped function overloading and multiple converters for
-a given C++ target type: first tell me if a conversion is
-possible, then construct the converted object as a second step.</p>
-</blockquote>
-</blockquote>
-</div>
-</div>
-<hr class="footer"/>
-<div class="footer">
-<a class="reference" href="internals.rst">View document source</a>.
-Generated on: 2003-09-12 14:51 UTC.
-Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
-</div>
-</body>
-</html>
diff --git a/doc/internals.rst b/doc/internals.rst
deleted file mode 100755
index f4576853..00000000
--- a/doc/internals.rst
+++ /dev/null
@@ -1,181 +0,0 @@
-===================================
- Boost.Python_ Internals |(logo)|__
-===================================
-
-.. |(logo)| image:: ../../../c++boost.gif
-   :alt: Boost
-
-__ ../../../index.htm
-
-.. _`Boost.Python`: index.html
-
-.. _license: ../../../LICENSE
-
-
--------------------------------------------------------
-A conversation between Brett Calcott and David Abrahams
--------------------------------------------------------
-
-:copyright: Copyright David Abrahams and Brett Calcott 2003. See
-            accompanying license_ for terms of use.
-
-In both of these cases, I'm quite capable of reading code - but the
-thing I don't get from scanning the source is a sense of the
-architecture, both structurally, and temporally (er, I mean in what
-order things go on).
-
-1) What happens when you do the following::
-
-     struct boring {};
-     ...etc...
-     class_<boring>("boring")
-         ;
-
-There seems to be a fair bit going on.
-
- - Python needs a new ClassType to be registered.
- - We need to construct a new type that can hold our boring struct.
- - Inward and outward converters need to be registered for the type.
-
-Can you gesture in the general direction where these things are done?
-
-  I only have time for a "off-the-top-of-my-head" answer at the moment;
-  I suggest you step through the code with a debugger after reading this
-  to see how it works, fill in details, and make sure I didn't forget
-  anything.
-
-          A new (Python) subclass of Boost.Python.Instance (see
-          libs/python/src/object/class.cpp) is created by invoking
-          Boost.Python.class, the metatype::
-
-                >>> boring = Boost.Python.class(
-                ...     'boring'
-                ...   , bases_tuple       # in this case, just ()
-                ...   , { 
-                ...         '__module__' : module_name
-                ...       , '__doc__' : doc_string # optional
-                ...     }
-                ... )
-
-          A handle to this object is stuck in the m_class_object field
-          of the registration associated with ``typeid(boring)``.  The
-          registry will keep that object alive forever, even if you
-          wipe out the 'boring' attribute of the extension module
-          (probably not a good thing).
-
-          Because you didn't specify ``class<boring, non_copyable,
-          ...>``, a to-python converter for boring is registered which
-          copies its argument into a value_holder held by the the
-          Python boring object.
-
-          Because you didn't specify ``class<boring ...>(no_init)``,
-          an ``__init__`` function object is added to the class
-          dictionary which default-constructs a boring in a
-          value_holder (because you didn't specify some smart pointer
-          or derived wrapper class as a holder) held by the Python
-          boring object.
-
-          ``register_class_from_python`` is used to register a
-          from-python converter for ``shared_ptr<boring>``.
-          ``boost::shared_ptr``\ s are special among smart pointers
-          because their Deleter argument can be made to manage the
-          whole Python object, not just the C++ object it contains, no
-          matter how the C++ object is held.
-
-          If there were any ``bases<>``, we'd also be registering the
-          relationship between these base classes and boring in the
-          up/down cast graph (``inheritance.[hpp/cpp]``).
-
-          In earlier versions of the code, we'd be registering lvalue
-          from-python converters for the class here, but now
-          from-python conversion for wrapped classes is handled as a
-          special case, before consulting the registry, if the source
-          Python object's metaclass is the Boost.Python metaclass.
-
-          Hmm, that from-python converter probably ought to be handled
-          the way class converters are, with no explicit conversions
-          registered.
-
-2) Can you give a brief overview of the data structures that are
-   present in the registry
-
-        The registry is simple: it's just a map from typeid ->
-        registration (see boost/python/converter/registrations.hpp).
-        ``lvalue_chain`` and ``rvalue_chain`` are simple endogenous
-        linked lists.
-
-        If you want to know more, just ask.
-
-        If you want to know about the cast graph, ask me something specific in
-        a separate message.
-
-   and an overview of the process that happens as a type makes its
-   way from c++ to python and back again.
-
-  Big subject.  I suggest some background reading: look for relevant
-  info in the LLNL progress reports and the messages they link to.
-  Also, 
-
-        http://mail.python.org/pipermail/c++-sig/2002-May/001023.html
-
-        http://mail.python.org/pipermail/c++-sig/2002-December/003115.html
-
-        http://aspn.activestate.com/ASPN/Mail/Message/1280898
-
-        http://mail.python.org/pipermail/c++-sig/2002-July/001755.html
-
-  from c++ to python:
-
-       It depends on the type and the call policies in use or, for
-       ``call<>(...)``, ``call_method<>(...)``, or ``object(...)``, if
-       ``ref`` or ``ptr`` is used.  There are also two basic
-       categories to to-python conversion, "return value" conversion
-       (for Python->C++ calls) and "argument" conversion (for
-       C++->Python calls and explicit ``object()`` conversions).  The
-       behavior of these two categories differs subtly in various ways
-       whose details I forget at the moment.  You can probably find
-       the answers in the above references, and certainly in the code.
-
-       The "default" case is by-value (copying) conversion, which uses
-       to_python_value as a to-python converter.
-
-           Since there can sensibly be only one way to convert any type
-           to python (disregarding the idea of scoped registries for the
-           moment), it makes sense that to-python conversions can be
-           handled by specializing a template.  If the type is one of
-           the types handled by a built-in conversion
-           (builtin_converters.hpp), the corresponding template
-           specialization of to_python_value gets used.
-
-           Otherwise, to_python_value uses the ``m_to_python``
-           function in the registration for the C++ type.
-
-       Other conversions, like by-reference conversions, are only
-       available for wrapped classes, and are requested explicitly by
-       using ``ref(...)``, ``ptr(...)``, or by specifying different
-       CallPolicies for a call, which can cause a different to-python
-       converter to be used.  These conversions are never registered
-       anywhere, though they do need to use the registration to find
-       the Python class corresponding to the C++ type being referred
-       to.  They just build a new Python instance and stick the
-       appropriate Holder instance in it.
-
-
-  from python to C++:
-
-       Once again I think there is a distinction between "return value"
-       and "argument" conversions, and I forget exactly what that is.
-
-       What happens depends on whether an lvalue conversion is needed
-       (see http://mail.python.org/pipermail/c++-sig/2002-May/001023.html)
-       All lvalue conversions are also registered in a type's rvalue
-       conversion chain, since when an rvalue will do, an lvalue is
-       certainly good enough.
-
-       An lvalue conversion can be done in one step (just get me the
-       pointer to the object - it can be ``NULL`` if no conversion is
-       possible) while an rvalue conversion requires two steps to
-       support wrapped function overloading and multiple converters for
-       a given C++ target type: first tell me if a conversion is
-       possible, then construct the converted object as a second step.
-
diff --git a/doc/new-conversions.html b/doc/new-conversions.html
deleted file mode 100644
index a5fe0c73..00000000
--- a/doc/new-conversions.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>A New Type Conversion Mechanism for Boost.Python</title>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-<p><img border="0" src="../../../c++boost.gif" width="277" height="86"
-alt="boost logo"></p>
-
-<h1>A New Type Conversion Mechanism for Boost.Python</h1>
-
-<p>By <a href="../../../people/dave_abrahams.htm">David Abrahams</a>.
-
-<h2>Introduction</h2>
-
-This document describes a redesign of the mechanism for automatically
-converting objects between C++ and Python. The current implementation
-uses two functions for any type <tt>T</tt>:
-
-<blockquote><pre>
-U from_python(PyObject*, type&lt;T&gt;);
-void to_python(V);
-</pre></blockquote>
-
-where U is convertible to T and T is convertible to V. These functions
-are at the heart of C++/Python interoperability in Boost.Python, so
-why would we want to change them? There are many reasons:
-
-<h3>Bugs</h3>
-<p>Firstly, the current mechanism relies on a common C++ compiler
-bug. This is not just embarrassing: as compilers get to be more
-conformant, the library stops working. The issue, in detail, is the
-use of inline friend functions in templates to generate
-conversions. It is a very powerful, and legal technique as long as
-it's used correctly:
-
-<blockquote><pre>
-template &lt;class Derived&gt;
-struct add_some_functions
-{
-     friend <i>return-type</i> some_function1(..., Derived <i>cv-*-&amp;-opt</i>, ...);
-     friend <i>return-type</i> some_function2(..., Derived <i>cv-*-&amp;-opt</i>, ...);
-};
-
-template &lt;class T&gt;
-struct some_template : add_some_functions&lt;some_template&lt;T&gt; &gt;
-{
-};
-</pre></blockquote>
-
-The <tt>add_some_functions</tt> template generates free functions
-which operate on <tt>Derived</tt>, or on related types. Strictly
-speaking the related types are not just cv-qualified <tt>Derived</tt>
-values, pointers and/or references. Section 3.4.2 in the standard
-describes exactly which types you must use as parameters to these
-functions if you want the functions to be found
-(there is also a less-technical description in section 11.5.1 of
-C++PL3 <a href="#ref_1">[1]</a>). Suffice it to say that
-with the current design, the <tt>from_python</tt> and
-<tt>to_python</tt> functions are not supposed to be callable under any
-conditions!
-
-<h3>Compilation and Linking Time</h3>
-
-The conversion functions generated for each wrapped class using the
-above technique are not function templates, but regular functions. The
-upshot is that they must <i>all</i> be generated regardless of whether
-they are actually used. Generating all of those functions can slow
-down module compilation, and resolving the references can slow down
-linking.
-
-<h3>Efficiency</h3>
-
-The conversion functions are primarily used in (member) function
-wrappers to convert the arguments and return values. Being functions,
-converters have no interface which allows us to ask &quot;will the
-conversion succeed?&quot; without calling the function. Since the
-return value of the function must be the object to be passed as an
-argument, Boost.Python currently uses C++ exception-handling to detect
-an unsuccessful conversion. It's not a particularly good use of
-exception-handling, since the failure is not handled very far from
-where it occurred. More importantly, it means that C++ exceptions are
-thrown during overload resolution as we seek an overload that matches
-the arguments passed. Depending on the implementation, this approach
-can result in significant slowdowns.
-
-<p>It is also unclear that the current library generates a minimal
-amount of code for any type conversion. Many of the conversion
-functions are nontrivial, and partly because of compiler limitations,
-they are declared <tt>inline</tt>. Also, we could have done a better
-job separating the type-specific conversion code from the code which
-is type-independent.
-
-<h3>Cross-module Support</h3>
-
-The current strategy requires every module to contain the definition
-of conversions it uses. In general, a new module can never supply
-conversion code which is used by another module. Ralf Grosse-Kunstleve
-designed a clever system which imports conversions directly from one
-library into another using some explicit declarations, but it has some
-disadvantages also:
-
-<ol>
-<li>The system Ullrich Koethe designed for implicit conversion between
-wrapped classes related through inheritance does not currently work if
-the classes are defined in separate modules.
-
-<li>The writer of the importing module is required to know the name of
-the module supplying the imported conversions.
-
-<li>There can be only one way to extract any given C++ type from a
-Python object in a given module.
-</ol>
-
-The first item might be addressed by moving Boost.Python into a shared
-library, but the other two cannot. Ralf turned the limitation in item
-two into a feature: the required module is loaded implicitly when a
-conversion it defines is invoked. We will probably want to provide
-that functionality anyway, but it's not clear that we should require
-the declaration of all such conversions. The final item is a more
-serious limitation. If, for example, new numeric types are defined in
-separate modules, and these types can all be converted to
-<tt>double</tt>s, we have to choose just one conversion method.
-
-<h3>Ease-of-use</h3>
-
-One persistent source of confusion for users of Boost.Python has been
-the fact that conversions for a class are not be visible at
-compile-time until the declaration of that class has been seen. When
-the user tries to expose a (member) function operating on or returning
-an instance of the class in question, compilation fails...even though
-the user goes on to expose the class in the same translation unit!
-
-<p>
-The new system lifts all compile-time checks for the existence of
-particular type conversions and replaces them with runtime checks, in
-true Pythonic style. While this might seem cavalier, the compile-time
-checks are actually not much use in the current system if many classes
-are wrapped in separate modules, since the checks are based only on
-the user's declaration that the conversions exist.
-
-<h2>The New Design</h2>
-
-<h3>Motivation</h3>
-
-The new design was heavily influenced by a desire to generate as
-little code as possible in extension modules. Some of Boost.Python's
-clients are enormous projects where link time is proportional to the
-amount of object code, and there are many Python extension modules. As
-such, we try to keep type-specific conversion code out of modules
-other than the one the converters are defined in, and rely as much as
-possible on centralized control through a shared library.
-
-<h3>The Basics</h3>
-
-The library contains a <tt>registry</tt> which maps runtime type
-identifiers (actually an extension of <tt>std::type_info</tt> which
-preserves references and constness) to entries containing type
-converters. An <tt>entry</tt> can contain only one converter from C++ to Python
-(<tt>wrapper</tt>), but many converters from Python to C++
-(<tt>unwrapper</tt>s). <font color="#ff0000">What should happen if
-multiple modules try to register wrappers for the same type?</font>. Wrappers
-and unwrappers are known as <tt>body</tt> objects, and are accessed
-by the user and the library (in its function-wrapping code) through
-corresponding <tt>handle</tt> (<tt>wrap&lt;T&gt;</tt> and
-<tt>unwrap&lt;T&gt;</tt>) objects. The <tt>handle</tt> objects are
-extremely lightweight, and delegate <i>all</i> of their operations to
-the corresponding <tt>body</tt>.
-
-<p>
-When a <tt>handle</tt> object is constructed, it accesses the
-registry to find a corresponding <tt>body</tt> that can convert the
-handle's constructor argument. Actually the registry record for any
-type
-<tt>T</tt>used in a module is looked up only once and stored in a
-static <tt>registration&lt;T&gt;</tt> object for efficiency. For
-example, if the handle is an <tt>unwrap&lt;Foo&amp;&gt;</tt> object,
-the <tt>entry</tt> for <tt>Foo&amp;</tt> is looked up in the
-<tt>registry</tt>, and each <tt>unwrapper</tt> it contains is queried
-to determine if it can convert the
-<tt>PyObject*</tt> with which the <tt>unwrap</tt> was constructed. If
-a body object which can perform the conversion is found, a pointer to
-it is stored in the handle. A body object may at any point store
-additional data in the handle to speed up the conversion process.
-
-<p>
-Now that the handle has been constructed, the user can ask it whether
-the conversion can be performed. All handles can be tested as though
-they were convertible to <tt>bool</tt>; a <tt>true</tt> value
-indicates success. If the user forges ahead and tries to do the
-conversion without checking when no conversion is possible, an
-exception will be thrown as usual. The conversion itself is performed
-by the body object. 
-
-<h3>Handling complex conversions</h3>
-
-<p>Some conversions may require a dynamic allocation. For example,
-when a Python tuple is converted to a <tt>std::vector&lt;double&gt;
-const&amp;</tt>, we need some storage into which to construct the
-vector so that a reference to it can be formed. Furthermore, multiple
-conversions of the same type may need to be &quot;active&quot;
-simultaneously, so we can't keep a single copy of the storage
-anywhere. We could keep the storage in the <tt>body</tt> object, and
-have the body clone itself in case the storage is used, but in that
-case the storage in the body which lives in the registry is never
-used. If the storage was actually an object of the target type (the
-safest way in C++), we'd have to find a way to construct one for the
-body in the registry, since it may not have a default constructor.
-
-<p>
-The most obvious way out of this quagmire is to allocate the object using a
-<i>new-expression</i>, and store a pointer to it in the handle. Since
-the <tt>body</tt> object knows everything about the data it needs to
-allocate (if any), it is also given responsibility for destroying that
-data. When the <tt>handle</tt> is destroyed it asks the <tt>body</tt>
-object to tear down any data it may have stored there. In many ways,
-you can think of the <tt>body</tt> as a &quot;dynamically-determined
-vtable&quot; for the handle.
-
-<h3>Eliminating Redundancy</h3>
-
-If you look at the current Boost.Python code, you'll see that there
-are an enormous number of conversion functions generated for each
-wrapped class. For a given class <tt>T</tt>, functions are generated
-to extract the following types <tt>from_python</tt>:
-
-<blockquote><pre>
-T*
-T const*
-T const* const&amp;
-T* const&amp;
-T&amp;
-T const&amp;
-T
-std::auto_ptr&lt;T&gt;&amp;
-std::auto_ptr&lt;T&gt;
-std::auto_ptr&lt;T&gt; const&amp;
-boost::shared_ptr&lt;T&gt;&amp;
-boost::shared_ptr&lt;T&gt;
-boost::shared_ptr&lt;T&gt; const&amp;
-</pre></blockquote>
-
-Most of these are implemented in terms of just a few conversions, and
-<t>if you're lucky</t>, they will be inlined and cause no extra
-overhead. In the new system, however, a significant amount of data
-will be associated with each type that needs to be converted. We
-certainly don't want to register a separate unwrapper object for all
-of the above types.
-
-<p>Fortunately, much of the redundancy can be eliminated. For example,
-if we generate an unwrapper for <tt>T&</tt>, we don't need an
-unwrapper for <tt>T const&</tt> or <tt>T</tt>. Accordingly, the user's
-request to wrap/unwrap a given type is translated at compile-time into
-a request which helps to eliminate redundancy. The rules used to
-<tt>unwrap</tt> a type are:
-
-<ol>
-<li> Treat built-in types specially: when unwrapping a value or
-   constant reference to one of these, use a value for the target
-   type. It will bind to a const reference if neccessary, and more
-   importantly, avoids having to dynamically allocate room for
-   an lvalue of types which can be cheaply copied.
-<li>
- Reduce everything else to a reference to an un-cv-qualified type
-   where possible. Since cv-qualification is lost on Python
-   anyway, there's no point in trying to convert to a
-   <tt>const&amp;</tt>. <font color="#ff0000">What about conversions
-   to values like the tuple-&gt;vector example above? It seems to me
-   that we don't want to make a <tt>vector&lt;double&gt;&amp;</tt>
-   (non-const) converter available for that case. We may need to
-   rethink this slightly.</font>
-</ol>
-
-<p>To handle the problem described above in item 2, we modify the
-procedure slightly. To unwrap any non-scalar <tt>T</tt>, we seek an
-unwrapper for <tt>add_reference&lt;T&gt;::type</tt>. Unwrappers for
-<tt>T&nbsp;const&amp;</tt> always return <tt>T&amp;</tt>, and are
-registered under both <tt>T&nbsp;&amp;</tt> and
-<tt>T&nbsp;const&amp;</tt>.
-
-<p>For compilers not supporting partial specialization, unwrappers for
-<tt>T&nbsp;const&amp;</tt> must return <tt>T&nbsp;const&amp;</tt>
-(since constness can't be stripped), but a separate unwrapper object
-need to be registered for <tt>T&nbsp;&amp;</tt> and
-<tt>T&nbsp;const&amp;</tt> anyway, for the same reasons.
-
-<font color="#ff0000">We may want to make it possible to compile as
-though partial specialization were unavailable even on compilers where
-it is available, in case modules could be compiled by different
-compilers with compatible ABIs (e.g. Intel C++ and MSVC6).</font>
-
-<h3>Efficient Argument Conversion</h3>
-
-Since type conversions are primarily used in function wrappers, an
-optimization is provided for the case where a group of conversions are
-used together. Each <tt>handle</tt> class has a corresponding
-&quot;<tt>_more</tt>&quot; class which does the same job, but has a
-trivial destructor. Instead of asking each &quot;<tt>_more</tt>&quot;
-handle to destroy its own body, it is linked into an endogenous list
-managed by the first (ordinary) handle. The <tt>wrap</tt> and
-<tt>unwrap</tt> destructors are responsible for traversing that list
-and asking each <tt>body</tt> class to tear down its
-<tt>handle</tt>. This mechanism is also used to determine if all of
-the argument/return-value conversions can succeed with a single
-function call in the function wrapping code. <font color="#ff0000">We
-might need to handle return values in a separate step for Python
-callbacks, since the availablility of a conversion won't be known
-until the result object is retrieved.</font>
-
-<br>
-<hr>
-<h2>References</h2>
-
-<p><a name="ref_1">[1]</a>B. Stroustrup, The C++ Programming Language
-Special Edition Addison-Wesley, ISBN 0-201-70073-5.
-
-<hr>
-<p>Revised <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="31283" --></p>
-<p>© Copyright David Abrahams, 2001</p>
-
-</body>
-
-</html>
diff --git a/doc/new-conversions.txt b/doc/new-conversions.txt
deleted file mode 100644
index 1540e199..00000000
--- a/doc/new-conversions.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-This hierarchy contains converter handle classes.
-
-
-                +-------------+
-                | noncopyable |
-                +-------------+
-                      ^
-                      |            A common base class used so that
-             +--------+--------+   conversions can be linked into a
-             | conversion_base |   chain for efficient argument
-             +-----------------+   conversion
-                      ^
-                      |
-            +---------+-----------+
-            |                     |
-+-----------+----+         +------+-------+  only used for
-| unwrap_more<T> |         | wrap_more<T> |  chaining, and don't manage any
-+----------------+         +--------------+  resources.
-         ^                         ^
-         |                         |
-   +-----+-----+           +-------+-+  These converters are what users
-   | unwrap<T> |           | wrap<T> |  actually touch, but they do so
-   +-----------+           +---------+  through a type generator which
-                                        minimizes the number of converters
-                                        that must be generated, so they
-
-
-Each unwrap<T>, unwrap_more<T>, wrap<T>, wrap_more<T> converter holds
-a reference to an appropriate converter object
-
-This hierarchy contains converter body classes
-
-                                          Exposes use/release which
-                                          are needed in case the converter
-                           +-----------+  in the registry needs to be
-                           | converter |  cloned. That occurs when a
-                           +-----------+  unwrap target type is not
-                                 ^        contained within the Python object.
-                                 |
-              +------------------+-----+
-              |                        |
-     +--------+-------+ Exposes        |
-     | unwrapper_base | convertible()  |
-     +----------------+                |
-              ^                        |
-              |                        |
-     +--------+----+             +-----+-----+
-     | unwrapper<T>|             | wrapper<T>|
-     +-------------+             +-----------+
- Exposes T convert(PyObject*)    Exposes PyObject* convert(T)
-
-
-unwrap:
-
-    constructed with a PyObject*, whose reference count is
-    incremented.
-
-    find the registry entry for the target type
-
-    look in the collection of converters for one which claims to be
-    able to convert the PyObject to the target type.
-
-    stick a pointer to the unwrapper in the unwrap object
-
-    when unwrap is queried for convertibility, it checks to see
-    if it has a pointer to an unwrapper.
-
-    on conversion, the unwrapper is asked to allocate an
-    implementation if the unwrap object isn't already holding
-    one. The unwrap object "takes ownership" of the unwrapper's
-    implementation. No memory allocation will actually take place
-    unless this is a value conversion.
-
-    on destruction, the unwrapper is asked to free any implementation
-    held by the unwrap object. No memory deallocation actually
-    takes place unless this is a value conversion
-
-    on destruction, the reference count on the held PyObject is
-    decremented.
-
-    We need to make sure that by default, you can't instantiate
-    callback<> for reference and pointer return types: although the
-    unwrappers may exist, they may convert by-value, which would cause
-    the referent to be destroyed upon return.
-
-wrap:
-
-    find the registry entry for the source type
-
-    see if there is a converter. If found, stick a pointer to it in
-    the wrap object.
-
-    when queried for convertibility, it checks to see if it has a
-    pointer to a converter.
-
-    on conversion, a reference to the target PyObject is held by the
-    converter. Generally, the PyObject will have been created by the
-    converter, but in certain cases it may be a pre-existing object,
-    whose reference count will have been incremented.
-
-    when a wrap<T> x is used to return from a C++ function,
-    x.release() is returned so that x no longer holds a reference to
-    the PyObject when destroyed.
-
-    Otherwise, on destruction, any PyObject still held has its
-    reference-count decremented.
-
-
-When a converter is created by the user, the appropriate element must
-be added to the registry; when it is destroyed, it must be removed
-from the registry.
diff --git a/doc/news.html b/doc/news.html
deleted file mode 100644
index 571788ae..00000000
--- a/doc/news.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="boost.css">
-
-    <title>Boost.Python - News/Change Log</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="index.html">Boost.Python</a></h1>
-
-          <h2 align="center">News/Change Log</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <dl class="page-index">
-      <dt>11 Sept 2003</dt>
-
-      <dd>
-        <ul>
-          <li>Changed the response to multiple to-python converters being
-          registered for the same type from a hard error into warning;
-          Boost.Python now reports the offending type in the message.</li>
-
-          <li>Added builtin <code>std::wstring</code> conversions</li>
-
-          <li>Added <code>std::out_of_range</code> =&gt; Python
-          <code>IndexError</code> exception conversion, thanks to <a href=
-          "mailto:RaoulGough-at-yahoo.co.uk">Raoul Gough</a></li>
-        </ul>
-      </dd>
-
-      <dt>9 Sept 2003</dt>
-
-      <dd>Added new <code><a href="v2/str.html#str-spec">str</a></code></dd>
-
-      <dt>constructors which take a range of characters, allowing strings
-      containing nul (<code>'\0'</code>) characters.</dt>
-
-      <dt>8 Sept 2003</dt>
-
-      <dd>Added the ability to create methods from function objects (with an
-      <code>operator()</code>); see the <a href=
-      "v2/make_function.html#make_function-spec">make_function</a> docs for
-      more info.</dd>
-
-      <dt>10 August 2003</dt>
-
-      <dd>Added the new <code>properties</code> unit tests contributed by <a
-      href="mailto:romany-at-actimize.com">Roman Yakovenko</a> and documented
-      <code>add_static_property</code> at his urging.</dd>
-
-      <dt>1 August 2003</dt>
-
-      <dd>
-        Added the new <code>arg</code> class contributed by <a href=
-        "mailto:nickm-at-sitius.com">Nikolay Mladenov</a> which supplies the
-        ability to wrap functions that can be called with ommitted arguments
-        in the middle: 
-<pre>
-void f(int x = 0, double y = 3.14, std::string z = std::string("foo"));
-
-BOOST_PYTHON_MODULE(test)
-{
-   def("f", f
-       , (arg("x", 0), arg("y", 3.14), arg("z", "foo")));
-}
- 
-</pre>
-        And in Python: 
-<pre>
-&gt;&gt;&gt; import test
-&gt;&gt;&gt; f(0, z = "bar")
-&gt;&gt;&gt; f(z = "bar", y = 0.0)
-</pre>
-        Thanks, Nikolay!
-      </dd>
-
-      <dt>22 July 2003</dt>
-
-      <dd>Killed the dreaded "bad argument type for builtin operation" error.
-      Argument errors now show the actual and expected argument types!</dd>
-
-      <dt>19 July 2003</dt>
-
-      <dd>Added the new <code><a href=
-      "v2/return_arg.html">return_arg</a></code> policy from <a href=
-      "mailto:nickm-at-sitius.com">Nikolay Mladenov</a>. Thanks,
-      Nikolay!</dd>
-
-      <dt>18 March, 2003</dt>
-
-      <dd><a href="mailto:Gottfried.Ganssauge-at-haufe.de">Gottfried
-      Gan&szlig;auge</a> has contributed <a href=
-      "v2/opaque_pointer_converter.html">opaque pointer support</a>.<br>
-       <a href="nicodemus-at-globalite.com.br">Bruno da Silva de Oliveira</a>
-      has contributed the exciting <a href="../pyste/index.html">Pyste</a>
-      ("Pie-steh") package.</dd>
-
-      <dt>24 February 2003</dt>
-
-      <dd>Finished improved support for <code>boost::shared_ptr</code>. Now
-      any wrapped object of C++ class <code>X</code> can be converted
-      automatically to <code>shared_ptr&lt;X&gt;</code>, regardless of how it
-      was wrapped. The <code>shared_ptr</code> will manage the lifetime of
-      the Python object which supplied the <code>X</code>, rather than just
-      the <code>X</code> object itself, and when such a
-      <code>shared_ptr</code> is converted back to Python, the original
-      Python object will be returned.</dd>
-
-      <dt>19 January 2003</dt>
-
-      <dd>Integrated <code>staticmethod</code> support from <a href=
-      "mailto:nickm-at-sitius.com">Nikolay Mladenov</a>. Thanks,
-      Nikolay!</dd>
-
-      <dt>29 December 2002</dt>
-
-      <dd>Added Visual Studio project file and instructions from Brett
-      Calcott. Thanks, Brett!</dd>
-
-      <dt>20 December 2002</dt>
-
-      <dd>Added automatic downcasting for pointers, references, and smart
-      pointers to polymorphic class types upon conversion to python</dd>
-
-      <dt>18 December 2002</dt>
-
-      <dd>Optimized from_python conversions for wrapped classes by putting
-      the conversion logic in the shared library instead of registering
-      separate converters for each class in each extension module</dd>
-
-      <dt>19 November 2002</dt>
-
-      <dd>Removed the need for users to cast base class member function
-      pointers when used as arguments to <a href=
-      "v2/class.html#class_-spec-modifiers">add_property</a></dd>
-
-      <dt>13 December 2002</dt>
-
-      <dd>Allow exporting of <a href=
-      "v2/enum.html#enum_-spec"><code>enum_</code></a> values into enclosing
-      <a href="v2/scope.html#scope-spec"><code>scope</code></a>.<br>
-       Fixed unsigned integer conversions to deal correctly with numbers that
-      are out-of-range of <code>signed long</code>.</dd>
-
-      <dt>14 November 2002</dt>
-
-      <dd>Auto-detection of class data members wrapped with <a href=
-      "v2/data_members.html#make_getter-spec"><code>make_getter</code></a></dd>
-
-      <dt>13 November 2002</dt>
-
-      <dd>Full Support for <code>std::auto_ptr&lt;&gt;</code> added.</dd>
-
-      <dt>October 2002</dt>
-
-      <dd>Ongoing updates and improvements to tutorial documentation</dd>
-
-      <dt>10 October 2002</dt>
-
-      <dd>Boost.Python V2 is released!</dd>
-    </dl>
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     11 September 2003 
-    <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href="../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002-2003. All Rights Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/polymorphism.txt b/doc/polymorphism.txt
deleted file mode 100644
index c6f89416..00000000
--- a/doc/polymorphism.txt
+++ /dev/null
@@ -1,217 +0,0 @@
-How Runtime Polymorphism is expressed in Boost.Python:
------------------------------------------------------
-
-   struct A { virtual std::string f(); virtual ~A(); };
-
-   std::string call_f(A& x) { return x.f(); }
-
-   struct B { virtual std::string f() { return "B"; } };
-
-   struct Bcb : B
-   { 
-      Bcb(PyObject* self) : m_self(self) {}
-
-      virtual std::string f() { return call_method<std::string>(m_sef, "f"); }
-      static std::string f_default(B& b) { return b.B::f(); }
-
-      PyObject* m_self;
-   };
-
-   struct C : B
-   {
-      virtual std::string f() { return "C"; }
-   };
-
-   >>> class D(B):
-   ...     def f():
-   ...         return 'D'
-   ...
-   >>> class E(B): pass
-   ...
-
-
-When we write, "invokes B::f non-virtually", we mean:
-
-  void g(B& x) { x.B::f(); }
-
-This will call B::f() regardless of the dynamic type of x. Any other
-way of invoking B::f, including through a function pointer, is a
-"virtual invocation", and will call the most-derived override of f().
-
-Case studies
-
-   C++\Python class
-       \___A_____B_____C_____D____E___
-       |
-   A   |   1
-       |
-   B   |   2     3
-       |
-   Bcb |         4           5    6
-       |
-   C   |         7     8
-       |
-
-
-1. Simple case
-
-2. Python A holds a B*. Probably won't happen once we have forced
-   downcasting. 
-
-   Requires:
-         x.f() -> 'B'
-         call_f(x) -> 'B'
-
-   Implies: A.f invokes A::f() (virtually or otherwise)
-
-3. Python B holds a B*. 
-
-   Requires:
-        x.f() -> 'B'
-        call_f(x) -> 'B'
-   
-   Implies: B.f invokes B::f (virtually or otherwise)
-
-
-4. B constructed from Python
-
-   Requires:
-
-        x.f() -> 'B'
-        call_f(x) -> 'B'
-
-   Implies: B.f invokes B::f non-virtually. Bcb::f invokes B::f
-            non-virtually.
-
-   Question: Does it help if we arrange for Python B construction to
-   build a true B object? Then this case doesn't arise.
-
-
-5. D is a Python class derived from B
-
-   Requires:
-
-        x.f() -> 'D'
-        call_f(x) -> 'D'
-
-   Implies: Bcb::f must invoke call_method to look up the Python
-            method override, otherwise call_f wouldn't work.
-
-6. E is like D, but doesn't override f
-
-   Requires:
-
-        x.f() -> 'B'
-        call_f(x) -> 'B'
-
-   Implies: B.f invokes B::f non-virtually. If it were virtual, x.f()
-            would cause infinite recursion, because we've already
-            determined that Bcb::f must invoke call_method to look up
-            the Python method override.
-
-7. Python B object holds a C*
-
-   Requires:
-        
-        x.f() -> 'C'
-        call_f(x) -> 'C'
-
-   Implies: B.f invokes B::f virtually. 
-
-8. C object constructed from Python
-
-   Requires:
-
-        x.f() -> 'C'
-        call_f(x) -> 'C'
-
-   Implies: nothing new.
-
-------
-
-Total implications:
-
-2: A.f invokes A::f() (virtually or otherwise)
-3: B.f invokes B::f (virtually or otherwise)
-4: B.f invokes B::f non-virtually. Bcb::f invokes B::f non-virtually
-6: B.f invokes B::f non-virtually. 
-7: B.f invokes B::f virtually. 
-
-5: Bcb::f invokes call_method to look up the Python method
-
-Though (4) is avoidable, clearly 6 and 7 are not, and they
-conflict. The implication is that B.f must choose its behavior
-according to the type of the contained C++ object. If it is Bcb, a
-non-virtual call to B::f must occur. Otherwise, a virtual call to B::f
-must occur. This is essentially the same scheme we had with
-Boost.Python v1.
-
-Note: in early versions of Boost.Python v1, we solved this problem by
-introducing a new Python class in the hierarchy, so that D and E
-actually derive from a B', and B'.f invokes B::f non-virtually, while
-B.f invokes B::f virtually. However, people complained about the
-artificial class in the hierarchy, which was revealed when they tried
-to do normal kinds of Python introspection.
-
--------
-
-Assumption: we will have a function which builds a virtual function
-dispatch callable Python object.
-
-     make_virtual_function(pvmf, default_impl, call_policies, dispatch_type)
-
-Pseudocode:
-
-     Get first argument from Python arg tuple
-     if it contains dispatch_type
-        call default_impl
-     else
-        call through pvmf
-
-
-Open questions:
-
-   1. What about Python multiple inheritance? Do we have the right
-      check in the if clause above?
-      
-      A: Not quite. The correct test looks like:
-
-      Deduce target type of pvmf, i.e. T in R(T::*)(A1...AN).
-      Find holder in first argument which holds T
-      if it holds dispatch_type...
-
-   2. Can we make this more efficient?
-     
-     The current "returning" mechanism will look up a holder for T
-     again. I don't know if we know how to avoid that.
-
-
-  OK, the solution involves reworking the call mechanism. This is
-  neccesary anyway in order to enable wrapping of function objects.
-
-  It can result in a reduction in the overall amount of source code,
-  because returning<> won't need to be specialized for every
-  combination of function and member function... though it will still
-  need a void specialization. We will still need a way to dispatch to
-  member functions through a regular function interface. mem_fn is
-  almost the right tool, but it only goes up to 8
-  arguments. Forwarding is tricky if you don't want to incur copies.
-  I think the trick is to use arg_from_python<T>::result_type for each
-  argument to the forwarder.
-
-  Another option would be to use separate function, function object,
-  and member function dispatchers. Once you know you have a member
-  function, you don't need cv-qualified overloads to call it.
-
-  Hmm, while we're at this, maybe we should solve the write-back
-  converter problem. Can we do it? Maybe not. Ralf doesn't want to
-  write special write-back functions here, does he? He wants the
-  converter to do the work automatically. We could add
-  cleanup/destructor registration. That would relieve the client from
-  having accessible destructors for types which are being converted by
-  rvalue. I'm not sure that this will really save any code,
-  however. It rather depends on the linker, doesn't it? I wonder if
-  this can be done in a backwards-compatible fashion by generating the
-  delete function when it's not supplied?
-
-  
diff --git a/doc/projects.html b/doc/projects.html
deleted file mode 100644
index a877cfe0..00000000
--- a/doc/projects.html
+++ /dev/null
@@ -1,344 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="boost.css">
-
-    <title>Boost.Python - Projects using Boost.Python</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Projects using Boost.Python</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Introduction</h2>
-
-    <p>This is a partial list of projects using Boost.Python. If you are
-    using Boost.Python as your Python/C++ binding solution, we'd be proud to
-    list your project on this page. Just <a href=
-    "mailto:c++-sig@python.org">post</a> a short description of your project
-    and how Boost.Python helps you get the job done, and we'll add it to this
-    page .</p>
-    <hr>
-
-    <h3>Data Analysis</h3>
-
-    <dl class="page-index">
-      <dt><b><a href=
-      "http://www.neuralynx.com/neuralab/index.htm">NeuraLab</a></b></dt>
-
-      <dd>Neuralab is a data analysis environment specifically tailored for
-      neural data from <a href="http://www.neuralynx.com">Neuralynx</a>
-      acquisition systems. Neuralab combines presentation quality graphics, a
-      numerical analysis library, and the <a href=
-      "http://www.python.org">Python</a> scripting engine in a single
-      application. With Neuralab, Neuralynx users can perform common analysis
-      tasks with just a few mouse clicks. More advanced users can create
-      custom Python scripts, which can optionally be assigned to menus and
-      mouse clicks.</dd>
-    </dl>
-
-    <dl class="page-index">
-      <dt><b>TSLib</b> - <a href="http://www.fortressinv.com">Fortress
-      Investment Group LLC</a></dt>
-
-      <dd>
-        Fortress Investment Group has contracted <a href=
-        "http://www.boost-consulting.com">Boost Consulting</a> to develop
-        core internal financial analysis tools in C++ and to prepare Python
-        bindings for them using Boost.Python. 
-
-        <p>Tom Barket of Fortress writes:</p>
-
-        <blockquote>
-          We have a large C++ analytical library specialized for research in
-          finance and economics, built for speed and mission critical
-          stability. Yet Python offers us the flexibility to test out new
-          ideas quickly and increase the productivity of our time versus
-          working in C++. There are several key features which make Python
-          stand out. Its elegance, stability, and breadth of resources on the
-          web are all valuable, but the most important is its extensibility,
-          due to its open source transparency. Boost.Python makes Python
-          extensibility extremely simple and straightforward, yet preserves a
-          great deal of power and control.
-        </blockquote>
-      </dd>
-    </dl>
-
-    <h3>Educational</h3>
-
-    <dl class="page-index">
-      <dt><a href="http://edu.kde.org/kig"><b>Kig</b></a></dt>
-
-      <dd>
-        <p>KDE Interactive Geometry is a high-school level educational tool,
-        built for the KDE desktop. It is a nice tool to let students work
-        with geometrical constructions. It is meant to be the most intuitive,
-        yet featureful application of its kind.</p>
-
-        <p>Versions after 0.6.x (will) support objects built by the user
-        himself in the Python language. The exporting of the relevant
-        internal API's were done using Boost.Python, which made the process
-        very easy.</p>
-      </dd>
-    </dl>
-
-    <h3>Enterprise Software</h3>
-
-    <dl class="page-index">
-      <dt><b><a href="http://openwbem.sourceforge.net">OpenWBEM</a></b></dt>
-
-      <dd>
-        The OpenWBEM project is an effort to develop an open-source
-        implementation of Web Based Enterprise Management suitable for
-        commercial and non-commercial application 
-
-        <p><a href="mailto:dnuffer@sco.com">Dan Nuffer</a> writes:</p>
-
-        <blockquote>
-          I'm using Boost.Python to wrap the client API of OpenWBEM.This will
-          make it easier to do rapid prototyping, testing, and scripting when
-          developing management solutions that use WBEM.
-        </blockquote>
-      </dd>
-
-      <dt><b><a href="http://www.transversal.com">Metafaq</a></b></dt>
-
-      <dd>
-        Metafaq, from <a href="http://www.transversal.com">Transversal,
-        Inc.</a>, is an enterprise level online knowledge base management
-        system. 
-
-        <p><a href="mailto:ben.young-at-transversal.com">Ben Young</a>
-        writes:</p>
-
-        <blockquote>
-          Boost.Python is used in an automated process to generate python
-          bindings to our api which is exposed though multiple backends and
-          frontends. This allows us to write quick tests and bespoke scripts
-          to perform one off tasks without having to go through the full
-          compilation cycle.
-        </blockquote>
-      </dd>
-    </dl>
-
-    <h3>Graphics</h3>
-
-    <dl class="page-index">
-      <dt><b><a href="http://sourceforge.net/projects/pyosg">OpenSceneGraph
-      Bindings</a></b></dt>
-
-      <dd><a href="mailto:gideon@computer.org">Gideon May</a> has created a
-      set of bindings for <a href=
-      "http://www.openscenegraph.org">OpenSceneGraph</a>, a cross-platform
-      C++/OpenGL library for the real-time visualization.<br>
-       &nbsp;</dd>
-
-      <dt><a href=
-      "http://www.procoders.net/pythonmagick"><b>PythonMagick</b></a></dt>
-
-      <dd>PythonMagick binds the <a href=
-      "http://www.graphicsmagick.org">GraphicsMagick</a> image manipulation
-      library to Python.<br>
-       &nbsp;</dd>
-
-      <dt><b><a href=
-      "http://www.slac.stanford.edu/grp/ek/hippodraw/index.html">HippoDraw</a></b></dt>
-
-      <dd>
-        HippoDraw is a data analysis environment consisting of a canvas upon
-        which graphs such as histograms, scattter plots, etc, are prsented.
-        It has a highly interactive GUI interface, but some things you need
-        to do with scripts. HippoDraw can be run as Python extension module
-        so that all the manipulation can be done from either Python or the
-        GUI. 
-
-        <p>Before the web page came online, <a href=
-        "mailto:Paul_Kunz@SLAC.Stanford.EDU">Paul F. Kunz</a> wrote:</p>
-
-        <blockquote>
-          Don't have a web page for the project, but the organization's is <a
-          href=
-          "http://www.slac.stanford.edu">http://www.slac.stanford.edu</a>
-          (the first web server site in America, I installed it).
-        </blockquote>
-        Which was just too cool a piece of trivia to omit.<br>
-         &nbsp;
-      </dd>
-    </dl>
-
-    <h3>Scientific Computing</h3>
-
-    <dl class="page index">
-      <dt><a href="http://camfr.sourceforge.net"><b>CAMFR</b></a></dt>
-
-      <dd>
-        CAMFR is a photonics and electromagnetics modelling tool. Python is
-        used for computational steering. 
-
-        <p><a href="mailto:Peter.Bienstman@rug.ac.be">Peter Bienstman</a>
-        writes:</p>
-
-        <blockquote>
-          Thanks for providing such a great tool!
-        </blockquote>
-      </dd>
-
-      <dt><a href="http://cctbx.sourceforge.net"><b>cctbx - Computational
-      Crystallography Toolbox</b></a></dt>
-
-      <dd>
-        Computational Crystallography is concerned with the derivation of
-        atomic models of crystal structures, given experimental X-ray
-        diffraction data. The cctbx is an open-source library of fundamental
-        algorithms for crystallographic computations. The core algorithms are
-        implemented in C++ and accessed through higher-level Python
-        interfaces. 
-
-        <p>The cctbx grew together with Boost.Python and is designed from the
-        ground up as a hybrid Python/C++ system. With one minor exception,
-        run-time polymorphism is completely handled by Python. C++
-        compile-time polymorphism is used to implement performance critical
-        algorithms. The Python and C++ layers are seamlessly integrated using
-        Boost.Python.</p>
-
-        <p>The SourceForge cctbx project is organized in modules to
-        facilitate use in non-crystallographic applications. The scitbx
-        module implements a general purpose array family for scientific
-        applications and pure C++ ports of FFTPACK and the LBFGS conjugate
-        gradient minimizer.</p>
-      </dd>
-
-      <dt><a href="http://www.llnl.gov/CASC/emsolve"><b>EMSolve</b></a></dt>
-
-      <dd>EMSolve is a provably stable, charge conserving, and energy
-      conserving solver for Maxwell's equations.<br>
-       &nbsp;</dd>
-
-      <dt><b><a href="http://cern.ch/gaudi">Gaudi</a></b> and <b><a href=
-      "http://cern.ch/Gaudi/RootPython/">RootPython</a></b></dt>
-
-      <dd>
-        Gaudi is a framework for particle physics collision data processing
-        applications developed in the context of the LHCb and ATLAS
-        experiments at CERN. 
-
-        <p><a href="mailto:Pere.Mato@cern.ch">Pere Mato Vila</a> writes:</p>
-
-        <blockquote>
-          We are using Boost.Python to provide scripting/interactive
-          capability to our framework. We have a module called "GaudiPython"
-          implemented using Boost.Python that allows the interaction with any
-          framework service or algorithm from python. RootPython also uses
-          Boost.Python to provide a generic "gateway" between the <a href=
-          "http://root.cern.ch">ROOT</a> framework and python 
-
-          <p>Boost.Python is great. We managed very quickly to interface our
-          framework to python, which is great language. We are trying to
-          facilitate to our physicists (end-users) a rapid analysis
-          application development environment based on python. For that,
-          Boost.Python plays and essential role.</p>
-        </blockquote>
-      </dd>
-
-      <dt><b><a href="http://www.esss.com.br">ESSS</a></b></dt>
-
-      <dd>
-        ESSS (Engineering Simulation and Scientific Software) is a company
-        that provides engineering solutions and acts in the brazilian and
-        south-american market providing products and services related to
-        Computational Fluid Dynamics and Image Analysis. 
-
-        <p><a href="mailto:bruno@esss.com.br">Bruno da Silva de Oliveira</a>
-        writes:</p>
-
-        <blockquote>
-          Recently we moved our work from working exclusively with C++ to an
-          hybrid-language approach, using Python and C++, with Boost.Python
-          providing the layer between the two. The results are great so far!
-        </blockquote>
-
-        <p>Two projects have been developed so far with this technology:</p>
-
-        <p><b><a href="http://www.esss.com.br/dev_simba.phtml">Simba</a></b>
-        provides 3D visualization of geological formations gattered from the
-        simulation of the evolution of oil systems, allowing the user to
-        analyse various aspects of the simulation, like deformation, pressure
-        and fluids, along the time of the simulation.</p>
-
-        <p><b><a href="http://www.esss.com.br/dev_aero.phtml">Aero</a></b>
-        aims to construct a CFD with brazilian technology, which involves
-        various companies and universities. ESSS is responsible for various
-        of the application modules, including GUI and post-processing of
-        results.</p>
-      </dd>
-
-      <dt><b><a href="http://www.rationaldiscovery.com">Rational Discovery
-      LLC</a></b></dt>
-
-      <dd>
-        Rational Discovery provides computational modeling, combinatorial
-        library design and custom software development services to the
-        pharmaceutical, biotech and chemical industries. We do a substantial
-        amount of internal research to develop new approaches for applying
-        machine-learning techniques to solve chemical problems. Because we're
-        a small organization and chemistry is a large and complex field, it
-        is essential that we be able to quickly and easily prototype and test
-        new algorithms. 
-
-        <p>For our internal software, we implement core data structures in C
-        and expose them to Python using Boost.Python. Algorithm development
-        is done in Python and then translated to C if required (often it's
-        not). This hybrid development approach not only greatly increases our
-        productivity, but it also allows "non-developers" (people without C
-        experience) to take part in method development. Learning C is a
-        daunting task, but "Python fits your brain." (Thanks to Bruce Eckel
-        for the quote.)</p>
-      </dd>
-    </dl>
-
-    <h3>Tools</h3>
-
-    <dl>
-      <dt><a href="http://www.jayacard.org"><b>Jayacard</b></a></dt>
-
-      <dd>
-        Jayacard aims at developing a secure portable open source operating
-        system for contactless smart cards and a complete suite of high
-        quality development tools to ease smart card OS and application
-        development. 
-
-        <p>The core of the smart card reader management is written in C++ but
-        all the development tools are written in the friendly Python
-        language. Boost plays the fundamental role of binding the tools to
-        our core smart card reader library.</p>
-      </dd>
-    </dl>
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     15 July, 2003</p>
-
-    <p><i>&copy; Copyright <a href="../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002-2003. All Rights Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/support.html b/doc/support.html
deleted file mode 100644
index b5c2e87b..00000000
--- a/doc/support.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="boost.css">
-
-    <title>Boost.Python - Support Resources</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Support Resources</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Synopsis</h2>
-
-    <p>This is a list of available resources for support with Boost.Python
-    problems and feature requests. <b>Please try to resist emailing the
-    Boost.Python developers directly for support.</b> Use the following
-    resources instead; the developers are listening!</p>
-    <hr>
-
-    <dl class="page-index">
-      <dt><b><a href="http://www.boost-consulting.com">Boost
-      Consulting</a></b> - Commercial support, development, training, and
-      distribution for all the Boost libraries, from the people who brought
-      you Boost.Python.<br>
-       &nbsp;</dt>
-
-      <dt><b><a href=
-      "http://www.boost.org/more/mailing_lists.htm#cplussig">The Python
-      C++-sig</a></b> mailing list is a forum for discussing Python/C++
-      interoperability, and Boost.Python in particular. Post your
-      Boost.Python questions here.<br>
-       &nbsp;</dt>
-
-      <dt>The <b>Boost.Python <a href=
-      "http://www.python.org/cgi-bin/moinmoin/boost_2epython">Wiki
-      Pages</a></b> established by Mike Rovner as part of the <a href=
-      "http://www.python.org/cgi-bin/moinmoin">PythonInfo Wiki</a> serves as
-      a forum to gather peoples' experience and as a cookbook.<br>
-       &nbsp;</dt>
-    </dl>
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     12 Sept, 2003 <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href="../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2003.</i></p>
-  </body>
-</html>
-
diff --git a/doc/tutorial/doc/auto_overloading.html b/doc/tutorial/doc/auto_overloading.html
deleted file mode 100644
index d478eeae..00000000
--- a/doc/tutorial/doc/auto_overloading.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Auto-Overloading</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="default_arguments.html">
-<link rel="next" href="object_interface.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Auto-Overloading</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="default_arguments.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="object_interface.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-It was mentioned in passing in the previous section that
-<tt>BOOST_PYTHON_FUNCTION_OVERLOADS</tt> and <tt>BOOST_PYTHON_FUNCTION_OVERLOADS</tt>
-can also be used for overloaded functions and member functions with a
-common sequence of initial arguments. Here is an example:</p>
-<code><pre>
-     <span class=keyword>void </span><span class=identifier>foo</span><span class=special>()
-     {
-        /*...*/
-     }
-
-     </span><span class=keyword>void </span><span class=identifier>foo</span><span class=special>(</span><span class=keyword>bool </span><span class=identifier>a</span><span class=special>)
-     {
-        /*...*/
-     }
-
-     </span><span class=keyword>void </span><span class=identifier>foo</span><span class=special>(</span><span class=keyword>bool </span><span class=identifier>a</span><span class=special>, </span><span class=keyword>int </span><span class=identifier>b</span><span class=special>)
-     {
-        /*...*/
-     }
-
-     </span><span class=keyword>void </span><span class=identifier>foo</span><span class=special>(</span><span class=keyword>bool </span><span class=identifier>a</span><span class=special>, </span><span class=keyword>int </span><span class=identifier>b</span><span class=special>, </span><span class=keyword>char </span><span class=identifier>c</span><span class=special>)
-     {
-        /*...*/
-     }
-</span></pre></code>
-<p>
-Like in the previous section, we can generate thin wrappers for these
-overloaded functions in one-shot:</p>
-<code><pre>
-    <span class=identifier>BOOST_PYTHON_FUNCTION_OVERLOADS</span><span class=special>(</span><span class=identifier>foo_overloads</span><span class=special>, </span><span class=identifier>foo</span><span class=special>, </span><span class=number>0</span><span class=special>, </span><span class=number>3</span><span class=special>)
-</span></pre></code>
-<p>
-Then...</p>
-<code><pre>
-    <span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;foo&quot;</span><span class=special>, </span><span class=identifier>foo</span><span class=special>, </span><span class=identifier>foo_overloads</span><span class=special>());
-</span></pre></code>
-<p>
-Notice though that we have a situation now where we have a minimum of zero
-(0) arguments and a maximum of 3 arguments.</p>
-<a name="manual_wrapping"></a><h2>Manual Wrapping</h2><p>
-It is important to emphasize however that <b>the overloaded functions must
-have a common sequence of initial arguments</b>. Otherwise, our scheme above
-will not work. If this is not the case, we have to wrap our functions
-<a href="overloading.html">
-manually</a>.</p>
-<p>
-Actually, we can mix and match manual wrapping of overloaded functions and
-automatic wrapping through <tt>BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</tt> and
-its sister, <tt>BOOST_PYTHON_FUNCTION_OVERLOADS</tt>. Following up on our example
-presented in the section <a href="overloading.html">
-on overloading</a>, since the
-first 4 overload functins have a common sequence of initial arguments, we
-can use <tt>BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</tt> to automatically wrap the
-first three of the <tt>def</tt>s and manually wrap just the last. Here's
-how we'll do this:</p>
-<code><pre>
-    <span class=identifier>BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</span><span class=special>(</span><span class=identifier>xf_overloads</span><span class=special>, </span><span class=identifier>f</span><span class=special>, </span><span class=number>1</span><span class=special>, </span><span class=number>4</span><span class=special>)
-</span></pre></code>
-<p>
-Create a member function pointers as above for both X::f overloads:</p>
-<code><pre>
-    <span class=keyword>bool    </span><span class=special>(</span><span class=identifier>X</span><span class=special>::*</span><span class=identifier>fx1</span><span class=special>)(</span><span class=keyword>int</span><span class=special>, </span><span class=keyword>double</span><span class=special>, </span><span class=keyword>char</span><span class=special>)    = &amp;</span><span class=identifier>X</span><span class=special>::</span><span class=identifier>f</span><span class=special>;
-    </span><span class=keyword>int     </span><span class=special>(</span><span class=identifier>X</span><span class=special>::*</span><span class=identifier>fx2</span><span class=special>)(</span><span class=keyword>int</span><span class=special>, </span><span class=keyword>int</span><span class=special>, </span><span class=keyword>int</span><span class=special>)        = &amp;</span><span class=identifier>X</span><span class=special>::</span><span class=identifier>f</span><span class=special>;
-</span></pre></code>
-<p>
-Then...</p>
-<code><pre>
-    <span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>fx1</span><span class=special>, </span><span class=identifier>xf_overloads</span><span class=special>());
-    .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>fx2</span><span class=special>)
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="default_arguments.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="object_interface.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/basic_interface.html b/doc/tutorial/doc/basic_interface.html
deleted file mode 100644
index 8165b121..00000000
--- a/doc/tutorial/doc/basic_interface.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Basic Interface</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="object_interface.html">
-<link rel="next" href="derived_object_types.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Basic Interface</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="object_interface.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="derived_object_types.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Class <tt>object</tt> wraps <tt>PyObject*</tt>. All the intricacies of dealing with
-<tt>PyObject</tt>s such as managing reference counting are handled by the
-<tt>object</tt> class. C++ object interoperability is seamless. Boost.Python C++
-<tt>object</tt>s can in fact be explicitly constructed from any C++ object.</p>
-<p>
-To illustrate, this Python code snippet:</p>
-<code><pre>
-    <span class=identifier>def </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>x</span><span class=special>, </span><span class=identifier>y</span><span class=special>):
-         </span><span class=keyword>if </span><span class=special>(</span><span class=identifier>y </span><span class=special>== </span><span class=literal>'foo'</span><span class=special>):
-             </span><span class=identifier>x</span><span class=special>[</span><span class=number>3</span><span class=special>:</span><span class=number>7</span><span class=special>] = </span><span class=literal>'bar'
-         </span><span class=keyword>else</span><span class=special>:
-             </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>items </span><span class=special>+= </span><span class=identifier>y</span><span class=special>(</span><span class=number>3</span><span class=special>, </span><span class=identifier>x</span><span class=special>)
-         </span><span class=keyword>return </span><span class=identifier>x
-
-    </span><span class=identifier>def </span><span class=identifier>getfunc</span><span class=special>():
-       </span><span class=keyword>return </span><span class=identifier>f</span><span class=special>;
-</span></pre></code>
-<p>
-Can be rewritten in C++ using Boost.Python facilities this way:</p>
-<code><pre>
-    <span class=identifier>object </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>object </span><span class=identifier>x</span><span class=special>, </span><span class=identifier>object </span><span class=identifier>y</span><span class=special>) {
-         </span><span class=keyword>if </span><span class=special>(</span><span class=identifier>y </span><span class=special>== </span><span class=string>&quot;foo&quot;</span><span class=special>)
-             </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>slice</span><span class=special>(</span><span class=number>3</span><span class=special>,</span><span class=number>7</span><span class=special>) = </span><span class=string>&quot;bar&quot;</span><span class=special>;
-         </span><span class=keyword>else
-             </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>attr</span><span class=special>(</span><span class=string>&quot;items&quot;</span><span class=special>) += </span><span class=identifier>y</span><span class=special>(</span><span class=number>3</span><span class=special>, </span><span class=identifier>x</span><span class=special>);
-         </span><span class=keyword>return </span><span class=identifier>x</span><span class=special>;
-    }
-    </span><span class=identifier>object </span><span class=identifier>getfunc</span><span class=special>() {
-        </span><span class=keyword>return </span><span class=identifier>object</span><span class=special>(</span><span class=identifier>f</span><span class=special>);
-    }
-</span></pre></code>
-<p>
-Apart from cosmetic differences due to the fact that we are writing the
-code in C++, the look and feel should be immediately apparent to the Python
-coder.</p>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="object_interface.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="derived_object_types.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/building_hello_world.html b/doc/tutorial/doc/building_hello_world.html
deleted file mode 100644
index 5e1bf4e7..00000000
--- a/doc/tutorial/doc/building_hello_world.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Building Hello World</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="quickstart.html">
-<link rel="next" href="exposing_classes.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Building Hello World</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="quickstart.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="exposing_classes.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<a name="from_start_to_finish"></a><h2>From Start To Finish</h2><p>
-Now the first thing you'd want to do is to build the Hello World module and
-try it for yourself in Python. In this section, we shall outline the steps
-necessary to achieve that. We shall use the build tool that comes bundled
-with every boost distribution: <b>bjam</b>.</p>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-<p><img src="theme/lens.gif"></img> <b>Building without bjam</b><br>
-        <br>
-        Besides bjam, there are of course other ways to get your module built. 
-        What's written here should not be taken as &quot;the one and only way&quot;. 
-        There are of course other build tools apart from <tt>bjam</tt>. </p>
-      <p>Take note however that the preferred build tool for Boost.Python is <tt>bjam</tt>. 
-        There are so many ways to set up the build incorrectly. Experience shows 
-        that 90% of the &quot;I can't build Boost.Python&quot; problems come from 
-        people who had to use a different tool<tt></tt>.</p></td>
-  </tr>
-</table>
-<p>
-We shall skip over the details. Our objective will be to simply create the
-hello world module and run it in Python. For a complete reference to
-building Boost.Python, check out: <a href="../../building.html">
-building.html</a>.
-After this brief <i>bjam</i> tutorial, we should have built two DLLs:</p>
-<ul><li>boost_python.dll</li><li>hello.pyd</li></ul><p>
-if you are on Windows, and</p>
-<ul><li>libboost_python.so</li><li>hello.so</li></ul><p>
-if you are on Unix.</p>
-<p>
-The tutorial example can be found in the directory:
-<tt>libs/python/example/tutorial</tt>. There, you can find:</p>
-<ul><li>hello.cpp</li><li>Jamfile</li></ul><p>
-The <tt>hello.cpp</tt> file is our C++ hello world example. The <tt>Jamfile</tt> is a
-minimalist <i>bjam</i> script that builds the DLLs for us.</p>
-<p>
-Before anything else, you should have the bjam executable in your boost
-directory or somewhere in your path such that <tt>bjam</tt> can be executed in
-the command line. Pre-built Boost.Jam executables are available for most
-platforms. For example, a pre-built Microsoft Windows bjam executable can
-be downloaded <a href="http://boost.sourceforge.net/jam-executables/bin.ntx86/bjam.zip">
-here</a>.
-The complete list of bjam pre-built
-executables can be found <a href="../../../../../tools/build/index.html#Jam">
-here</a>.</p>
-<a name="lets_jam_"></a><h2>Lets Jam!</h2><p>
-<img src="theme/jam.png"></img></p>
-<p>
-Here is our minimalist Jamfile:</p>
-<code><pre>
-    subproject libs/python/example/tutorial ;
-
-    SEARCH on python.jam = $(BOOST_BUILD_PATH) ;
-    include python.jam ;
-
-    extension hello                     # Declare a Python extension called hello
-    :   hello.cpp                       # source
-        &lt;dll&gt;../../build/boost_python   # dependencies
-        ;
-</pre></code><p>
-First, we need to specify our location in the boost project hierarchy.
-It so happens that the tutorial example is located in <tt>/libs/python/example/tutorial</tt>.
-Thus:</p>
-<code><pre>
-    subproject libs/python/example/tutorial ;
-</pre></code><p>
-Then we will include the definitions needed by Python modules:</p>
-<code><pre>
-    SEARCH on python.jam = $(BOOST_BUILD_PATH) ;
-    include python.jam ;
-</pre></code><p>
-Finally we declare our <tt>hello</tt> extension:</p>
-<code><pre>
-    extension hello                     # Declare a Python extension called hello
-    :   hello.cpp                       # source
-        &lt;dll&gt;../../build/boost_python   # dependencies
-        ;
-</pre></code><a name="running_bjam"></a><h2>Running bjam</h2><p>
-<i>bjam</i> is run using your operating system's command line interpreter.</p>
-<blockquote><p>Start it up.</p></blockquote><p>
-Make sure that the environment is set so that we can invoke the C++
-compiler. With MSVC, that would mean running the <tt>Vcvars32.bat</tt> batch
-file. For instance:</p>
-<code><pre>
-    <span class=identifier>C</span><span class=special>:\</span><span class=identifier>Program </span><span class=identifier>Files</span><span class=special>\</span><span class=identifier>Microsoft </span><span class=identifier>Visual </span><span class=identifier>Studio</span><span class=special>\</span><span class=identifier>VC98</span><span class=special>\</span><span class=identifier>bin</span><span class=special>\</span><span class=identifier>Vcvars32</span><span class=special>.</span><span class=identifier>bat
-</span></pre></code>
-<p>
-Some environment variables will have to be setup for proper building of our
-Python modules. Example:</p>
-<code><pre>
-    <span class=identifier>set </span><span class=identifier>PYTHON_ROOT</span><span class=special>=</span><span class=identifier>c</span><span class=special>:/</span><span class=identifier>dev</span><span class=special>/</span><span class=identifier>tools</span><span class=special>/</span><span class=identifier>python
-    </span><span class=identifier>set </span><span class=identifier>PYTHON_VERSION</span><span class=special>=</span><span class=number>2.2
-</span></pre></code>
-<p>
-The above assumes that the Python installation is in <tt>c:/dev/tools/python</tt>
-and that we are using Python version 2.2. You'll have to tweak this path
-appropriately. <img src="theme/note.gif"></img> Be sure not to include a third number, e.g. <b>not</b>  &quot;2.2.1&quot;,
-even if that's the version you have.</p>
-<p>
-Now we are ready... Be sure to <tt>cd</tt> to <tt>libs/python/example/tutorial</tt>
-where the tutorial <tt>&quot;hello.cpp&quot;</tt> and the <tt>&quot;Jamfile&quot;</tt> is situated.</p>
-<p>
-Finally:</p>
-<code><pre>
-    <span class=identifier>bjam </span><span class=special>-</span><span class=identifier>sTOOLS</span><span class=special>=</span><span class=identifier>msvc
-</span></pre></code>
-<p>
-We are again assuming that we are using Microsoft Visual C++ version 6. If
-not, then you will have to specify the appropriate tool. See
-<a href="../../../../../tools/build/index.html">
-Building Boost Libraries</a> for
-further details.</p>
-<p>
-It should be building now:</p>
-<code><pre>
-    cd C:\dev\boost\libs\python\example\tutorial
-    bjam -sTOOLS=msvc
-    ...patience...
-    ...found 1703 targets...
-    ...updating 40 targets...
-</pre></code><p>
-And so on... Finally:</p>
-<code><pre>
-    vc-C++ ..\..\..\..\libs\python\example\tutorial\bin\hello.pyd\msvc\debug\
-    runtime-link-dynamic\hello.obj
-    hello.cpp
-    vc-Link ..\..\..\..\libs\python\example\tutorial\bin\hello.pyd\msvc\debug\
-    runtime-link-dynamic\hello.pyd ..\..\..\..\libs\python\example\tutorial\bin\
-    hello.pyd\msvc\debug\runtime-link-dynamic\hello.lib
-       Creating library ..\..\..\..\libs\python\example\tutorial\bin\hello.pyd\
-       msvc\debug\runtime-link-dynamic\hello.lib and object ..\..\..\..\libs\python\
-       example\tutorial\bin\hello.pyd\msvc\debug\runtime-link-dynamic\hello.exp
-    ...updated 40 targets...
-</pre></code><p>
-If all is well, you should now have:</p>
-<ul><li>boost_python.dll</li><li>hello.pyd</li></ul><p>
-if you are on Windows, and</p>
-<ul><li>libboost_python.so</li><li>hello.so</li></ul><p>
-if you are on Unix.</p>
-<p>
-<tt>boost_python.dll</tt> can be found somewhere in <tt>libs\python\build\bin</tt>
-while <tt>hello.pyd</tt> can be found somewhere in
-<tt>libs\python\example\tutorial\bin</tt>. After a successful build, you can just
-link in these DLLs with the Python interpreter. In Windows for example, you
-can simply put these libraries inside the directory where the Python
-executable is.</p>
-<p>
-You may now fire up Python and run our hello module:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>import </span><span class=identifier>hello
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>print </span><span class=identifier>hello</span><span class=special>.</span><span class=identifier>greet</span><span class=special>()
-    </span><span class=identifier>hello</span><span class=special>, </span><span class=identifier>world
-</span></pre></code>
-<blockquote><p><b>There you go... Have fun!</b></p></blockquote><table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="quickstart.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="exposing_classes.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/call_policies.html b/doc/tutorial/doc/call_policies.html
deleted file mode 100644
index dc94ea5b..00000000
--- a/doc/tutorial/doc/call_policies.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Call Policies</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="functions.html">
-<link rel="next" href="overloading.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Call Policies</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="functions.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="overloading.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-In C++, we often deal with arguments and return types such as pointers
-and references. Such primitive types are rather, ummmm, low level and
-they really don't tell us much. At the very least, we don't know the
-owner of the pointer or the referenced object. No wonder languages
-such as Java and Python never deal with such low level entities. In
-C++, it's usually considered a good practice to use smart pointers
-which exactly describe ownership semantics. Still, even good C++
-interfaces use raw references and pointers sometimes, so Boost.Python
-must deal with them. To do this, it may need your help. Consider the
-following C++ function:</p>
-<code><pre>
-    <span class=identifier>X</span><span class=special>&amp; </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>Y</span><span class=special>&amp; </span><span class=identifier>y</span><span class=special>, </span><span class=identifier>Z</span><span class=special>* </span><span class=identifier>z</span><span class=special>);
-</span></pre></code>
-<p>
-How should the library wrap this function? A naive approach builds a
-Python X object around result reference. This strategy might or might
-not work out. Here's an example where it didn't</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>x </span><span class=special>= </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>y</span><span class=special>, </span><span class=identifier>z</span><span class=special>) </span>##<span class=identifier>x </span><span class=identifier>refers </span><span class=identifier>to </span><span class=identifier>some </span><span class=identifier>C</span><span class=special>++ </span><span class=identifier>X
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>del </span><span class=identifier>y
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>some_method</span><span class=special>() </span>##<span class=identifier>CRASH</span><span class=special>!
-</span></pre></code>
-<p>
-What's the problem?</p>
-<p>
-Well, what if f() was implemented as shown below:</p>
-<code><pre>
-    <span class=identifier>X</span><span class=special>&amp; </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>Y</span><span class=special>&amp; </span><span class=identifier>y</span><span class=special>, </span><span class=identifier>Z</span><span class=special>* </span><span class=identifier>z</span><span class=special>)
-    {
-        </span><span class=identifier>y</span><span class=special>.</span><span class=identifier>z </span><span class=special>= </span><span class=identifier>z</span><span class=special>;
-        </span><span class=keyword>return </span><span class=identifier>y</span><span class=special>.</span><span class=identifier>x</span><span class=special>;
-    }
-</span></pre></code>
-<p>
-The problem is that the lifetime of result X&amp; is tied to the lifetime
-of y, because the f() returns a reference to a member of the y
-object. This idiom is is not uncommon and perfectly acceptable in the
-context of C++. However, Python users should not be able to crash the
-system just by using our C++ interface. In this case deleting y will
-invalidate the reference to X. We have a dangling reference.</p>
-<p>
-Here's what's happening:</p>
-<ol><li><tt>f</tt> is called passing in a reference to <tt>y</tt> and a pointer to <tt>z</tt></li><li>A reference to <tt>y.x</tt> is returned</li><li><tt>y</tt> is deleted. <tt>x</tt> is a dangling reference</li><li><tt>x.some_method()</tt> is called</li><li><b>BOOM!</b></li></ol><p>
-We could copy result into a new object:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>y</span><span class=special>, </span><span class=identifier>z</span><span class=special>).</span><span class=identifier>set</span><span class=special>(</span><span class=number>42</span><span class=special>) </span>##<span class=identifier>Result </span><span class=identifier>disappears
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>y</span><span class=special>.</span><span class=identifier>x</span><span class=special>.</span><span class=identifier>get</span><span class=special>()       </span>##<span class=identifier>No </span><span class=identifier>crash</span><span class=special>, </span><span class=identifier>but </span><span class=identifier>still </span><span class=identifier>bad
-    </span><span class=number>3.14
-</span></pre></code>
-<p>
-This is not really our intent of our C++ interface. We've broken our
-promise that the Python interface should reflect the C++ interface as
-closely as possible.</p>
-<p>
-Our problems do not end there. Suppose Y is implemented as follows:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>Y
-    </span><span class=special>{
-        </span><span class=identifier>X </span><span class=identifier>x</span><span class=special>; </span><span class=identifier>Z</span><span class=special>* </span><span class=identifier>z</span><span class=special>;
-        </span><span class=keyword>int </span><span class=identifier>z_value</span><span class=special>() { </span><span class=keyword>return </span><span class=identifier>z</span><span class=special>-&gt;</span><span class=identifier>value</span><span class=special>(); }
-    };
-</span></pre></code>
-<p>
-Notice that the data member <tt>z</tt> is held by class Y using a raw
-pointer. Now we have a potential dangling pointer problem inside Y:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>x </span><span class=special>= </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>y</span><span class=special>, </span><span class=identifier>z</span><span class=special>) </span>##<span class=identifier>y </span><span class=identifier>refers </span><span class=identifier>to </span><span class=identifier>z
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>del </span><span class=identifier>z       </span>##<span class=identifier>Kill </span><span class=identifier>the </span><span class=identifier>z </span><span class=identifier>object
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>y</span><span class=special>.</span><span class=identifier>z_value</span><span class=special>() </span>##<span class=identifier>CRASH</span><span class=special>!
-</span></pre></code>
-<p>
-For reference, here's the implementation of <tt>f</tt> again:</p>
-<code><pre>
-    <span class=identifier>X</span><span class=special>&amp; </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>Y</span><span class=special>&amp; </span><span class=identifier>y</span><span class=special>, </span><span class=identifier>Z</span><span class=special>* </span><span class=identifier>z</span><span class=special>)
-    {
-        </span><span class=identifier>y</span><span class=special>.</span><span class=identifier>z </span><span class=special>= </span><span class=identifier>z</span><span class=special>;
-        </span><span class=keyword>return </span><span class=identifier>y</span><span class=special>.</span><span class=identifier>x</span><span class=special>;
-    }
-</span></pre></code>
-<p>
-Here's what's happening:</p>
-<ol><li><tt>f</tt> is called passing in a reference to <tt>y</tt> and a pointer to <tt>z</tt></li><li>A pointer to <tt>z</tt> is held by <tt>y</tt></li><li>A reference to <tt>y.x</tt> is returned</li><li><tt>z</tt> is deleted. <tt>y.z</tt> is a dangling pointer</li><li><tt>y.z_value()</tt> is called</li><li><tt>z-&gt;value()</tt> is called</li><li><b>BOOM!</b></li></ol><a name="call_policies"></a><h2>Call Policies</h2><p>
-Call Policies may be used in situations such as the example detailed above.
-In our example, <tt>return_internal_reference</tt> and <tt>with_custodian_and_ward</tt>
-are our friends:</p>
-<code><pre>
-    <span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>f</span><span class=special>,
-        </span><span class=identifier>return_internal_reference</span><span class=special>&lt;</span><span class=number>1</span><span class=special>,
-            </span><span class=identifier>with_custodian_and_ward</span><span class=special>&lt;</span><span class=number>1</span><span class=special>, </span><span class=number>2</span><span class=special>&gt; &gt;());
-</span></pre></code>
-<p>
-What are the <tt>1</tt> and <tt>2</tt> parameters, you ask?</p>
-<code><pre>
-    <span class=identifier>return_internal_reference</span><span class=special>&lt;</span><span class=number>1
-</span></pre></code>
-<p>
-Informs Boost.Python that the first argument, in our case <tt>Y&amp; y</tt>, is the
-owner of the returned reference: <tt>X&amp;</tt>. The &quot;<tt>1</tt>&quot; simply specifies the
-first argument. In short: &quot;return an internal reference <tt>X&amp;</tt> owned by the
-1st argument <tt>Y&amp; y</tt>&quot;.</p>
-<code><pre>
-    <span class=identifier>with_custodian_and_ward</span><span class=special>&lt;</span><span class=number>1</span><span class=special>, </span><span class=number>2</span><span class=special>&gt;
-</span></pre></code>
-<p>
-Informs Boost.Python that the lifetime of the argument indicated by ward
-(i.e. the 2nd argument: <tt>Z* z</tt>) is dependent on the lifetime of the
-argument indicated by custodian (i.e. the 1st argument: <tt>Y&amp; y</tt>).</p>
-<p>
-It is also important to note that we have defined two policies above. Two
-or more policies can be composed by chaining. Here's the general syntax:</p>
-<code><pre>
-    <span class=identifier>policy1</span><span class=special>&lt;</span><span class=identifier>args</span><span class=special>...,
-        </span><span class=identifier>policy2</span><span class=special>&lt;</span><span class=identifier>args</span><span class=special>...,
-            </span><span class=identifier>policy3</span><span class=special>&lt;</span><span class=identifier>args</span><span class=special>...&gt; &gt; &gt;
-</span></pre></code>
-<p>
-Here is the list of predefined call policies. A complete reference detailing
-these can be found <a href="../../v2/reference.html#models_of_call_policies">
-here</a>.</p>
-<ul><li><b>with_custodian_and_ward</b><br> Ties lifetimes of the arguments</li><li><b>with_custodian_and_ward_postcall</b><br> Ties lifetimes of the arguments and results</li><li><b>return_internal_reference</b><br> Ties lifetime of one argument to that of result</li><li><b>return_value_policy&lt;T&gt; with T one of:</b><br></li><li><b>reference_existing_object</b><br>naïve (dangerous) approach</li><li><b>copy_const_reference</b><br>Boost.Python v1 approach</li><li><b>copy_non_const_reference</b><br></li><li><b>manage_new_object</b><br> Adopt a pointer and hold the instance</li></ul><table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-<img src="theme/smiley.gif"></img> <b>Remember the Zen, Luke:</b><br><br>
-&quot;Explicit is better than implicit&quot;<br>
-&quot;In the face of ambiguity, refuse the temptation to guess&quot;<br>    </td>
-  </tr>
-</table>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="functions.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="overloading.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/class_data_members.html b/doc/tutorial/doc/class_data_members.html
deleted file mode 100644
index b43bf83c..00000000
--- a/doc/tutorial/doc/class_data_members.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Class Data Members</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="constructors.html">
-<link rel="next" href="class_properties.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Class Data Members</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="constructors.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="class_properties.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Data members may also be exposed to Python so that they can be
-accessed as attributes of the corresponding Python class. Each data
-member that we wish to be exposed may be regarded as <b>read-only</b> or
-<b>read-write</b>.  Consider this class <tt>Var</tt>:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>Var
-    </span><span class=special>{
-        </span><span class=identifier>Var</span><span class=special>(</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>name</span><span class=special>) : </span><span class=identifier>name</span><span class=special>(</span><span class=identifier>name</span><span class=special>), </span><span class=identifier>value</span><span class=special>() {}
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=keyword>const </span><span class=identifier>name</span><span class=special>;
-        </span><span class=keyword>float </span><span class=identifier>value</span><span class=special>;
-    };
-</span></pre></code>
-<p>
-Our C++ <tt>Var</tt> class and its data members can be exposed to Python:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>Var</span><span class=special>&gt;(</span><span class=string>&quot;Var&quot;</span><span class=special>, </span><span class=identifier>init</span><span class=special>&lt;</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string</span><span class=special>&gt;())
-        .</span><span class=identifier>def_readonly</span><span class=special>(</span><span class=string>&quot;name&quot;</span><span class=special>, &amp;</span><span class=identifier>Var</span><span class=special>::</span><span class=identifier>name</span><span class=special>)
-        .</span><span class=identifier>def_readwrite</span><span class=special>(</span><span class=string>&quot;value&quot;</span><span class=special>, &amp;</span><span class=identifier>Var</span><span class=special>::</span><span class=identifier>value</span><span class=special>);
-</span></pre></code>
-<p>
-Then, in Python, assuming we have placed our Var class inside the namespace
-hello as we did before:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>x </span><span class=special>= </span><span class=identifier>hello</span><span class=special>.</span><span class=identifier>Var</span><span class=special>(</span><span class=literal>'pi'</span><span class=special>)
-    &gt;&gt;&gt; </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>value </span><span class=special>= </span><span class=number>3.14
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>print </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>name</span><span class=special>, </span><span class=literal>'is around'</span><span class=special>, </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>value
-    </span><span class=identifier>pi </span><span class=identifier>is </span><span class=identifier>around </span><span class=number>3.14
-</span></pre></code>
-<p>
-Note that <tt>name</tt> is exposed as <b>read-only</b> while <tt>value</tt> is exposed
-as <b>read-write</b>.</p>
-<code><pre>
-    &gt;&gt;&gt; x.name = 'e' # can't change name
-    Traceback (most recent call last):
-      File &quot;&lt;stdin&gt;&quot;, line 1, in ?
-    AttributeError: can't set attribute
-</pre></code><table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="constructors.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="class_properties.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/class_operators_special_functions.html b/doc/tutorial/doc/class_operators_special_functions.html
deleted file mode 100644
index ce7aab66..00000000
--- a/doc/tutorial/doc/class_operators_special_functions.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Class Operators/Special Functions</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="virtual_functions_with_default_implementations.html">
-<link rel="next" href="functions.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Class Operators/Special Functions</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="virtual_functions_with_default_implementations.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="functions.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<a name="python_operators"></a><h2>Python Operators</h2><p>
-C is well known for the abundance of operators. C++ extends this to the
-extremes by allowing operator overloading. Boost.Python takes advantage of
-this and makes it easy to wrap C++ operator-powered classes.</p>
-<p>
-Consider a file position class <tt>FilePos</tt> and a set of operators that take
-on FilePos instances:</p>
-<code><pre>
-    <span class=keyword>class </span><span class=identifier>FilePos </span><span class=special>{ /*...*/ };
-
-    </span><span class=identifier>FilePos     </span><span class=keyword>operator</span><span class=special>+(</span><span class=identifier>FilePos</span><span class=special>, </span><span class=keyword>int</span><span class=special>);
-    </span><span class=identifier>FilePos     </span><span class=keyword>operator</span><span class=special>+(</span><span class=keyword>int</span><span class=special>, </span><span class=identifier>FilePos</span><span class=special>);
-    </span><span class=keyword>int         </span><span class=keyword>operator</span><span class=special>-(</span><span class=identifier>FilePos</span><span class=special>, </span><span class=identifier>FilePos</span><span class=special>);
-    </span><span class=identifier>FilePos     </span><span class=keyword>operator</span><span class=special>-(</span><span class=identifier>FilePos</span><span class=special>, </span><span class=keyword>int</span><span class=special>);
-    </span><span class=identifier>FilePos</span><span class=special>&amp;    </span><span class=keyword>operator</span><span class=special>+=(</span><span class=identifier>FilePos</span><span class=special>&amp;, </span><span class=keyword>int</span><span class=special>);
-    </span><span class=identifier>FilePos</span><span class=special>&amp;    </span><span class=keyword>operator</span><span class=special>-=(</span><span class=identifier>FilePos</span><span class=special>&amp;, </span><span class=keyword>int</span><span class=special>);
-    </span><span class=keyword>bool        </span><span class=keyword>operator</span><span class=special>&lt;(</span><span class=identifier>FilePos</span><span class=special>, </span><span class=identifier>FilePos</span><span class=special>);
-</span></pre></code>
-<p>
-The class and the various operators can be mapped to Python rather easily
-and intuitively:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>FilePos</span><span class=special>&gt;(</span><span class=string>&quot;FilePos&quot;</span><span class=special>)
-        .</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>self </span><span class=special>+ </span><span class=keyword>int</span><span class=special>())          // </span><span class=identifier>__add__
-        </span><span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=keyword>int</span><span class=special>() + </span><span class=identifier>self</span><span class=special>)          // </span><span class=identifier>__radd__
-        </span><span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>self </span><span class=special>- </span><span class=identifier>self</span><span class=special>)           // </span><span class=identifier>__sub__
-        </span><span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>self </span><span class=special>- </span><span class=keyword>int</span><span class=special>())          // </span><span class=identifier>__sub__
-        </span><span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>self </span><span class=special>+= </span><span class=keyword>int</span><span class=special>())         // </span><span class=identifier>__iadd__
-        </span><span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>self </span><span class=special>-= </span><span class=identifier>other</span><span class=special>&lt;</span><span class=keyword>int</span><span class=special>&gt;())
-        .</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>self </span><span class=special>&lt; </span><span class=identifier>self</span><span class=special>);          // </span><span class=identifier>__lt__
-</span></pre></code>
-<p>
-The code snippet above is very clear and needs almost no explanation at
-all. It is virtually the same as the operators' signatures. Just take
-note that <tt>self</tt> refers to FilePos object. Also, not every class <tt>T</tt> that
-you might need to interact with in an operator expression is (cheaply)
-default-constructible. You can use <tt>other&lt;T&gt;()</tt> in place of an actual
-<tt>T</tt> instance when writing &quot;self expressions&quot;.</p>
-<a name="special_methods"></a><h2>Special Methods</h2><p>
-Python has a few more <i>Special Methods</i>. Boost.Python supports all of the
-standard special method names supported by real Python class instances. A
-similar set of intuitive interfaces can also be used to wrap C++ functions
-that correspond to these Python <i>special functions</i>. Example:</p>
-<code><pre>
-    <span class=keyword>class </span><span class=identifier>Rational
-    </span><span class=special>{ </span><span class=keyword>operator </span><span class=keyword>double</span><span class=special>() </span><span class=keyword>const</span><span class=special>; };
-
-    </span><span class=identifier>Rational </span><span class=identifier>pow</span><span class=special>(</span><span class=identifier>Rational</span><span class=special>, </span><span class=identifier>Rational</span><span class=special>);
-    </span><span class=identifier>Rational </span><span class=identifier>abs</span><span class=special>(</span><span class=identifier>Rational</span><span class=special>);
-    </span><span class=identifier>ostream</span><span class=special>&amp; </span><span class=keyword>operator</span><span class=special>&lt;&lt;(</span><span class=identifier>ostream</span><span class=special>&amp;,</span><span class=identifier>Rational</span><span class=special>);
-
-    </span><span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>Rational</span><span class=special>&gt;()
-        .</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>float_</span><span class=special>(</span><span class=identifier>self</span><span class=special>))                  // </span><span class=identifier>__float__
-        </span><span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>pow</span><span class=special>(</span><span class=identifier>self</span><span class=special>, </span><span class=identifier>other</span><span class=special>&lt;</span><span class=identifier>Rational</span><span class=special>&gt;))    // </span><span class=identifier>__pow__
-        </span><span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>abs</span><span class=special>(</span><span class=identifier>self</span><span class=special>))                     // </span><span class=identifier>__abs__
-        </span><span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>str</span><span class=special>(</span><span class=identifier>self</span><span class=special>))                     // </span><span class=identifier>__str__
-        </span><span class=special>;
-</span></pre></code>
-<p>
-Need we say more?</p>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-<img src="theme/lens.gif"></img> What is the business of <tt>operator&lt;&lt;</tt> <tt>.def(str(self))</tt>?
-Well, the method <tt>str</tt> requires the <tt>operator&lt;&lt;</tt> to do its work (i.e.
-<tt>operator&lt;&lt;</tt> is used by the method defined by def(str(self)).    </td>
-  </tr>
-</table>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="virtual_functions_with_default_implementations.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="functions.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/class_properties.html b/doc/tutorial/doc/class_properties.html
deleted file mode 100644
index 99f340c4..00000000
--- a/doc/tutorial/doc/class_properties.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Class Properties</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="class_data_members.html">
-<link rel="next" href="inheritance.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Class Properties</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="class_data_members.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="inheritance.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-In C++, classes with public data members are usually frowned
-upon. Well designed classes that take advantage of encapsulation hide
-the class' data members. The only way to access the class' data is
-through access (getter/setter) functions. Access functions expose class
-properties. Here's an example:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>Num
-    </span><span class=special>{
-        </span><span class=identifier>Num</span><span class=special>();
-        </span><span class=keyword>float </span><span class=identifier>get</span><span class=special>() </span><span class=keyword>const</span><span class=special>;
-        </span><span class=keyword>void </span><span class=identifier>set</span><span class=special>(</span><span class=keyword>float </span><span class=identifier>value</span><span class=special>);
-        ...
-    };
-</span></pre></code>
-<p>
-However, in Python attribute access is fine; it doesn't neccessarily break
-encapsulation to let users handle attributes directly, because the
-attributes can just be a different syntax for a method call. Wrapping our
-<tt>Num</tt> class using Boost.Python:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>Num</span><span class=special>&gt;(</span><span class=string>&quot;Num&quot;</span><span class=special>)
-        .</span><span class=identifier>add_property</span><span class=special>(</span><span class=string>&quot;rovalue&quot;</span><span class=special>, &amp;</span><span class=identifier>Num</span><span class=special>::</span><span class=identifier>get</span><span class=special>)
-        .</span><span class=identifier>add_property</span><span class=special>(</span><span class=string>&quot;value&quot;</span><span class=special>, &amp;</span><span class=identifier>Num</span><span class=special>::</span><span class=identifier>get</span><span class=special>, &amp;</span><span class=identifier>Num</span><span class=special>::</span><span class=identifier>set</span><span class=special>);
-</span></pre></code>
-<p>
-And at last, in Python:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>x </span><span class=special>= </span><span class=identifier>Num</span><span class=special>()
-    &gt;&gt;&gt; </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>value </span><span class=special>= </span><span class=number>3.14
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>value</span><span class=special>, </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>rovalue
-    </span><span class=special>(</span><span class=number>3.14</span><span class=special>, </span><span class=number>3.14</span><span class=special>)
-    &gt;&gt;&gt; </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>rovalue </span><span class=special>= </span><span class=number>2.17 </span>##<span class=identifier>error</span><span class=special>!
-</span></pre></code>
-<p>
-Take note that the class property <tt>rovalue</tt> is exposed as <b>read-only</b>
-since the <tt>rovalue</tt> setter member function is not passed in:</p>
-<code><pre>
-    <span class=special>.</span><span class=identifier>add_property</span><span class=special>(</span><span class=string>&quot;rovalue&quot;</span><span class=special>, &amp;</span><span class=identifier>Num</span><span class=special>::</span><span class=identifier>get</span><span class=special>)
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="class_data_members.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="inheritance.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/class_virtual_functions.html b/doc/tutorial/doc/class_virtual_functions.html
deleted file mode 100644
index 37ce60ce..00000000
--- a/doc/tutorial/doc/class_virtual_functions.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Class Virtual Functions</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="inheritance.html">
-<link rel="next" href="deriving_a_python_class.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Class Virtual Functions</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="inheritance.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="deriving_a_python_class.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-In this section, we shall learn how to make functions behave
-polymorphically through virtual functions. Continuing our example, let us
-add a virtual function to our <tt>Base</tt> class:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>Base
-    </span><span class=special>{
-        </span><span class=keyword>virtual </span><span class=keyword>int </span><span class=identifier>f</span><span class=special>() = </span><span class=number>0</span><span class=special>;
-    };
-</span></pre></code>
-<p>
-Since <tt>f</tt> is a pure virtual function, <tt>Base</tt> is now an abstract
-class. Given an instance of our class, the free function <tt>call_f</tt>
-calls some implementation of this virtual function in a concrete
-derived class:</p>
-<code><pre>
-    <span class=keyword>int </span><span class=identifier>call_f</span><span class=special>(</span><span class=identifier>Base</span><span class=special>&amp; </span><span class=identifier>b</span><span class=special>) { </span><span class=keyword>return </span><span class=identifier>b</span><span class=special>.</span><span class=identifier>f</span><span class=special>(); }
-</span></pre></code>
-<p>
-To allow this function to be implemented in a Python derived class, we
-need to create a class wrapper:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>BaseWrap </span><span class=special>: </span><span class=identifier>Base
-    </span><span class=special>{
-        </span><span class=identifier>BaseWrap</span><span class=special>(</span><span class=identifier>PyObject</span><span class=special>* </span><span class=identifier>self_</span><span class=special>)
-            : </span><span class=identifier>self</span><span class=special>(</span><span class=identifier>self_</span><span class=special>) {}
-        </span><span class=keyword>int </span><span class=identifier>f</span><span class=special>() { </span><span class=keyword>return </span><span class=identifier>call_method</span><span class=special>&lt;</span><span class=keyword>int</span><span class=special>&gt;(</span><span class=identifier>self</span><span class=special>, </span><span class=string>&quot;f&quot;</span><span class=special>); }
-        </span><span class=identifier>PyObject</span><span class=special>* </span><span class=identifier>self</span><span class=special>;
-    };
-</span></pre></code>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-<img src="theme/lens.gif"></img> <b>member function and methods</b><br><br> Python, like
-many object oriented languages uses the term <b>methods</b>.  Methods
-correspond roughly to C++'s <b>member functions</b>    </td>
-  </tr>
-</table>
-<p>
-Our class wrapper <tt>BaseWrap</tt> is derived from <tt>Base</tt>. Its overridden
-virtual member function <tt>f</tt> in effect calls the corresponding method
-of the Python object <tt>self</tt>, which is a pointer back to the Python
-<tt>Base</tt> object holding our <tt>BaseWrap</tt> instance.</p>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-<img src="theme/note.gif"></img> <b>Why do we need BaseWrap?</b><br><br>
-
-<i>You may ask</i>, &quot;Why do we need the <tt>BaseWrap</tt> derived class? This could
-have been designed so that everything gets done right inside of
-Base.&quot;<br><br>
-
-One of the goals of Boost.Python is to be minimally intrusive on an
-existing C++ design. In principle, it should be possible to expose the
-interface for a 3rd party library without changing it. To unintrusively
-hook into the virtual functions so that a Python override may be called, we
-must use a derived class.<br><br>
-
-Note however that you don't need to do this to get methods overridden
-in Python to behave virtually when called <i>from</i> <b>Python</b>. The only
-time you need to do the <tt>BaseWrap</tt> dance is when you have a virtual
-function that's going to be overridden in Python and called
-polymorphically <i>from</i> <b>C++</b>.    </td>
-  </tr>
-</table>
-<p>
-Wrapping <tt>Base</tt> and the free function <tt>call_f</tt>:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>Base</span><span class=special>, </span><span class=identifier>BaseWrap</span><span class=special>, </span><span class=identifier>boost</span><span class=special>::</span><span class=identifier>noncopyable</span><span class=special>&gt;(</span><span class=string>&quot;Base&quot;</span><span class=special>, </span><span class=identifier>no_init</span><span class=special>)
-        ;
-    </span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;call_f&quot;</span><span class=special>, </span><span class=identifier>call_f</span><span class=special>);
-</span></pre></code>
-<p>
-Notice that we parameterized the <tt>class_</tt> template with <tt>BaseWrap</tt> as the
-second parameter. What is <tt>noncopyable</tt>? Without it, the library will try
-to create code for converting Base return values of wrapped functions to
-Python. To do that, it needs Base's copy constructor... which isn't
-available, since Base is an abstract class.</p>
-<p>
-In Python, let us try to instantiate our <tt>Base</tt> class:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>base </span><span class=special>= </span><span class=identifier>Base</span><span class=special>()
-    </span><span class=identifier>RuntimeError</span><span class=special>: </span><span class=identifier>This </span><span class=keyword>class </span><span class=identifier>cannot </span><span class=identifier>be </span><span class=identifier>instantiated </span><span class=identifier>from </span><span class=identifier>Python
-</span></pre></code>
-<p>
-Why is it an error? <tt>Base</tt> is an abstract class. As such it is advisable
-to define the Python wrapper with <tt>no_init</tt> as we have done above. Doing
-so will disallow abstract base classes such as <tt>Base</tt> to be instantiated.</p>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="inheritance.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="deriving_a_python_class.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/constructors.html b/doc/tutorial/doc/constructors.html
deleted file mode 100644
index 809bfee3..00000000
--- a/doc/tutorial/doc/constructors.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Constructors</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="exposing_classes.html">
-<link rel="next" href="class_data_members.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Constructors</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="exposing_classes.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="class_data_members.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Our previous example didn't have any explicit constructors.
-Since <tt>World</tt> is declared as a plain struct, it has an implicit default
-constructor. Boost.Python exposes the default constructor by default,
-which is why we were able to write</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>planet </span><span class=special>= </span><span class=identifier>hello</span><span class=special>.</span><span class=identifier>World</span><span class=special>()
-</span></pre></code>
-<p>
-We may wish to wrap a class with a non-default constructor. Let us
-build on our previous example:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>World
-    </span><span class=special>{
-        </span><span class=identifier>World</span><span class=special>(</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>): </span><span class=identifier>msg</span><span class=special>(</span><span class=identifier>msg</span><span class=special>) {} // </span><span class=identifier>added </span><span class=identifier>constructor
-        </span><span class=keyword>void </span><span class=identifier>set</span><span class=special>(</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>) { </span><span class=keyword>this</span><span class=special>-&gt;</span><span class=identifier>msg </span><span class=special>= </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>greet</span><span class=special>() { </span><span class=keyword>return </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>;
-    };
-</span></pre></code>
-<p>
-This time <tt>World</tt> has no default constructor; our previous
-wrapping code would fail to compile when the library tried to expose
-it. We have to tell <tt>class_&lt;World&gt;</tt> about the constructor we want to
-expose instead.</p>
-<code><pre>
-    <span class=preprocessor>#include </span><span class=special>&lt;</span><span class=identifier>boost</span><span class=special>/</span><span class=identifier>python</span><span class=special>.</span><span class=identifier>hpp</span><span class=special>&gt;
-    </span><span class=keyword>using </span><span class=keyword>namespace </span><span class=identifier>boost</span><span class=special>::</span><span class=identifier>python</span><span class=special>;
-
-    </span><span class=identifier>BOOST_PYTHON_MODULE</span><span class=special>(</span><span class=identifier>hello</span><span class=special>)
-    {
-        </span><span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>World</span><span class=special>&gt;(</span><span class=string>&quot;World&quot;</span><span class=special>, </span><span class=identifier>init</span><span class=special>&lt;</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string</span><span class=special>&gt;())
-            .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;greet&quot;</span><span class=special>, &amp;</span><span class=identifier>World</span><span class=special>::</span><span class=identifier>greet</span><span class=special>)
-            .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;set&quot;</span><span class=special>, &amp;</span><span class=identifier>World</span><span class=special>::</span><span class=identifier>set</span><span class=special>)
-        ;
-    }
-</span></pre></code>
-<p>
-<tt>init&lt;std::string&gt;()</tt> exposes the constructor taking in a
-<tt>std::string</tt> (in Python, constructors are spelled
-&quot;<tt>&quot;__init__&quot;</tt>&quot;).</p>
-<p>
-We can expose additional constructors by passing more <tt>init&lt;...&gt;</tt>s to
-the <tt>def()</tt> member function. Say for example we have another World
-constructor taking in two doubles:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>World</span><span class=special>&gt;(</span><span class=string>&quot;World&quot;</span><span class=special>, </span><span class=identifier>init</span><span class=special>&lt;</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string</span><span class=special>&gt;())
-        .</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>init</span><span class=special>&lt;</span><span class=keyword>double</span><span class=special>, </span><span class=keyword>double</span><span class=special>&gt;())
-        .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;greet&quot;</span><span class=special>, &amp;</span><span class=identifier>World</span><span class=special>::</span><span class=identifier>greet</span><span class=special>)
-        .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;set&quot;</span><span class=special>, &amp;</span><span class=identifier>World</span><span class=special>::</span><span class=identifier>set</span><span class=special>)
-    ;
-</span></pre></code>
-<p>
-On the other hand, if we do not wish to expose any constructors at
-all, we may use <tt>no_init</tt> instead:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>Abstract</span><span class=special>&gt;(</span><span class=string>&quot;Abstract&quot;</span><span class=special>, </span><span class=identifier>no_init</span><span class=special>)
-</span></pre></code>
-<p>
-This actually adds an <tt>__init__</tt> method which always raises a
-Python RuntimeError exception.</p>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="exposing_classes.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="class_data_members.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/default_arguments.html b/doc/tutorial/doc/default_arguments.html
deleted file mode 100644
index 2fbebd23..00000000
--- a/doc/tutorial/doc/default_arguments.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Default Arguments</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="overloading.html">
-<link rel="next" href="auto_overloading.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Default Arguments</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="overloading.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="auto_overloading.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Boost.Python wraps (member) function pointers. Unfortunately, C++ function
-pointers carry no default argument info. Take a function <tt>f</tt> with default
-arguments:</p>
-<code><pre>
-    <span class=keyword>int </span><span class=identifier>f</span><span class=special>(</span><span class=keyword>int</span><span class=special>, </span><span class=keyword>double </span><span class=special>= </span><span class=number>3.14</span><span class=special>, </span><span class=keyword>char </span><span class=keyword>const</span><span class=special>* = </span><span class=string>&quot;hello&quot;</span><span class=special>);
-</span></pre></code>
-<p>
-But the type of a pointer to the function <tt>f</tt> has no information
-about its default arguments:</p>
-<code><pre>
-    <span class=keyword>int</span><span class=special>(*</span><span class=identifier>g</span><span class=special>)(</span><span class=keyword>int</span><span class=special>,</span><span class=keyword>double</span><span class=special>,</span><span class=keyword>char </span><span class=keyword>const</span><span class=special>*) = </span><span class=identifier>f</span><span class=special>;    // </span><span class=identifier>defaults </span><span class=identifier>lost</span><span class=special>!
-</span></pre></code>
-<p>
-When we pass this function pointer to the <tt>def</tt> function, there is no way
-to retrieve the default arguments:</p>
-<code><pre>
-    <span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>f</span><span class=special>);                            // </span><span class=identifier>defaults </span><span class=identifier>lost</span><span class=special>!
-</span></pre></code>
-<p>
-Because of this, when wrapping C++ code, we had to resort to manual
-wrapping as outlined in the <a href="overloading.html">
-previous section</a>, or
-writing thin wrappers:</p>
-<code><pre>
-    <span class=comment>// write &quot;thin wrappers&quot;
-    </span><span class=keyword>int </span><span class=identifier>f1</span><span class=special>(</span><span class=keyword>int </span><span class=identifier>x</span><span class=special>) { </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>x</span><span class=special>); }
-    </span><span class=keyword>int </span><span class=identifier>f2</span><span class=special>(</span><span class=keyword>int </span><span class=identifier>x</span><span class=special>, </span><span class=keyword>double </span><span class=identifier>y</span><span class=special>) { </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>x</span><span class=special>,</span><span class=identifier>y</span><span class=special>); }
-
-    /*...*/
-
-        // </span><span class=identifier>in </span><span class=identifier>module </span><span class=identifier>init
-        </span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>f</span><span class=special>);  // </span><span class=identifier>all </span><span class=identifier>arguments
-        </span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>f2</span><span class=special>); // </span><span class=identifier>two </span><span class=identifier>arguments
-        </span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>f1</span><span class=special>); // </span><span class=identifier>one </span><span class=identifier>argument
-</span></pre></code>
-<p>
-When you want to wrap functions (or member functions) that either:</p>
-<ul><li>have default arguments, or</li><li>are overloaded with a common sequence of initial arguments</li></ul><a name="boost_python_function_overloads"></a><h2>BOOST_PYTHON_FUNCTION_OVERLOADS</h2><p>
-Boost.Python now has a way to make it easier. For instance, given a function:</p>
-<code><pre>
-    <span class=keyword>int </span><span class=identifier>foo</span><span class=special>(</span><span class=keyword>int </span><span class=identifier>a</span><span class=special>, </span><span class=keyword>char </span><span class=identifier>b </span><span class=special>= </span><span class=number>1</span><span class=special>, </span><span class=keyword>unsigned </span><span class=identifier>c </span><span class=special>= </span><span class=number>2</span><span class=special>, </span><span class=keyword>double </span><span class=identifier>d </span><span class=special>= </span><span class=number>3</span><span class=special>)
-    {
-        /*...*/
-    }
-</span></pre></code>
-<p>
-The macro invocation:</p>
-<code><pre>
-    <span class=identifier>BOOST_PYTHON_FUNCTION_OVERLOADS</span><span class=special>(</span><span class=identifier>foo_overloads</span><span class=special>, </span><span class=identifier>foo</span><span class=special>, </span><span class=number>1</span><span class=special>, </span><span class=number>4</span><span class=special>)
-</span></pre></code>
-<p>
-will automatically create the thin wrappers for us. This macro will create
-a class <tt>foo_overloads</tt> that can be passed on to <tt>def(...)</tt>. The third
-and fourth macro argument are the minimum arguments and maximum arguments,
-respectively. In our <tt>foo</tt> function the minimum number of arguments is 1
-and the maximum number of arguments is 4. The <tt>def(...)</tt> function will
-automatically add all the foo variants for us:</p>
-<code><pre>
-    <span class=identifier>def</span><span class=special>(</span><span class=string>&quot;foo&quot;</span><span class=special>, </span><span class=identifier>foo</span><span class=special>, </span><span class=identifier>foo_overloads</span><span class=special>());
-</span></pre></code>
-<a name="boost_python_member_function_overloads"></a><h2>BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</h2><p>
-Objects here, objects there, objects here there everywhere. More frequently
-than anything else, we need to expose member functions of our classes to
-Python. Then again, we have the same inconveniences as before when default
-arguments or overloads with a common sequence of initial arguments come
-into play. Another macro is provided to make this a breeze.</p>
-<p>
-Like <tt>BOOST_PYTHON_FUNCTION_OVERLOADS</tt>,
-<tt>BOOST_PYTHON_FUNCTION_OVERLOADS</tt> may be used to automatically create
-the thin wrappers for wrapping member functions. Let's have an example:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>george
-    </span><span class=special>{
-        </span><span class=keyword>void
-        </span><span class=identifier>wack_em</span><span class=special>(</span><span class=keyword>int </span><span class=identifier>a</span><span class=special>, </span><span class=keyword>int </span><span class=identifier>b </span><span class=special>= </span><span class=number>0</span><span class=special>, </span><span class=keyword>char </span><span class=identifier>c </span><span class=special>= </span><span class=literal>'x'</span><span class=special>)
-        {
-            /*...*/
-        }
-    };
-</span></pre></code>
-<p>
-The macro invocation:</p>
-<code><pre>
-    <span class=identifier>BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</span><span class=special>(</span><span class=identifier>george_overloads</span><span class=special>, </span><span class=identifier>wack_em</span><span class=special>, </span><span class=number>1</span><span class=special>, </span><span class=number>3</span><span class=special>)
-</span></pre></code>
-<p>
-will generate a set of thin wrappers for george's <tt>wack_em</tt> member function
-accepting a minimum of 1 and a maximum of 3 arguments (i.e. the third and
-fourth macro argument). The thin wrappers are all enclosed in a class named
-<tt>george_overloads</tt> that can then be used as an argument to <tt>def(...)</tt>:</p>
-<code><pre>
-    <span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;wack_em&quot;</span><span class=special>, &amp;</span><span class=identifier>george</span><span class=special>::</span><span class=identifier>wack_em</span><span class=special>, </span><span class=identifier>george_overloads</span><span class=special>());
-</span></pre></code>
-<p>
-See the <a href="../../v2/overloads.html#BOOST_PYTHON_FUNCTION_OVERLOADS-spec">
-overloads reference</a>
-for details.</p>
-<a name="init_and_optional"></a><h2>init and optional</h2><p>
-A similar facility is provided for class constructors, again, with
-default arguments or a sequence of overloads. Remember <tt>init&lt;...&gt;</tt>? For example,
-given a class X with a constructor:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>X
-    </span><span class=special>{
-        </span><span class=identifier>X</span><span class=special>(</span><span class=keyword>int </span><span class=identifier>a</span><span class=special>, </span><span class=keyword>char </span><span class=identifier>b </span><span class=special>= </span><span class=literal>'D'</span><span class=special>, </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>c </span><span class=special>= </span><span class=string>&quot;constructor&quot;</span><span class=special>, </span><span class=keyword>double </span><span class=identifier>d </span><span class=special>= </span><span class=number>0.0</span><span class=special>);
-        /*...*/
-    }
-</span></pre></code>
-<p>
-You can easily add this constructor to Boost.Python in one shot:</p>
-<code><pre>
-    <span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>init</span><span class=special>&lt;</span><span class=keyword>int</span><span class=special>, </span><span class=identifier>optional</span><span class=special>&lt;</span><span class=keyword>char</span><span class=special>, </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string</span><span class=special>, </span><span class=keyword>double</span><span class=special>&gt; &gt;())
-</span></pre></code>
-<p>
-Notice the use of <tt>init&lt;...&gt;</tt> and <tt>optional&lt;...&gt;</tt> to signify the default
-(optional arguments).</p>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="overloading.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="auto_overloading.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/derived_object_types.html b/doc/tutorial/doc/derived_object_types.html
deleted file mode 100644
index fbe44584..00000000
--- a/doc/tutorial/doc/derived_object_types.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Derived Object types</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="basic_interface.html">
-<link rel="next" href="extracting_c___objects.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Derived Object types</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="basic_interface.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="extracting_c___objects.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Boost.Python comes with a set of derived <tt>object</tt> types corresponding to
-that of Python's:</p>
-<ul><li>list</li><li>dict</li><li>tuple</li><li>str</li><li>long_</li><li>enum</li></ul><p>
-These derived <tt>object</tt> types act like real Python types. For instance:</p>
-<code><pre>
-    <span class=identifier>str</span><span class=special>(</span><span class=number>1</span><span class=special>) ==&gt; </span><span class=string>&quot;1&quot;
-</span></pre></code>
-<p>
-Wherever appropriate, a particular derived <tt>object</tt> has corresponding
-Python type's methods. For instance, <tt>dict</tt> has a <tt>keys()</tt> method:</p>
-<code><pre>
-    <span class=identifier>d</span><span class=special>.</span><span class=identifier>keys</span><span class=special>()
-</span></pre></code>
-<p>
-<tt>make_tuple</tt> is provided for declaring <i>tuple literals</i>. Example:</p>
-<code><pre>
-    <span class=identifier>make_tuple</span><span class=special>(</span><span class=number>123</span><span class=special>, </span><span class=literal>'D'</span><span class=special>, </span><span class=string>&quot;Hello, World&quot;</span><span class=special>, </span><span class=number>0.0</span><span class=special>);
-</span></pre></code>
-<p>
-In C++, when Boost.Python <tt>object</tt>s are used as arguments to functions,
-subtype matching is required. For example, when a function <tt>f</tt>, as
-declared below, is wrapped, it will only accept instances of Python's
-<tt>str</tt> type and subtypes.</p>
-<code><pre>
-    <span class=keyword>void </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>str </span><span class=identifier>name</span><span class=special>)
-    {
-        </span><span class=identifier>object </span><span class=identifier>n2 </span><span class=special>= </span><span class=identifier>name</span><span class=special>.</span><span class=identifier>attr</span><span class=special>(</span><span class=string>&quot;upper&quot;</span><span class=special>)();   // </span><span class=identifier>NAME </span><span class=special>= </span><span class=identifier>name</span><span class=special>.</span><span class=identifier>upper</span><span class=special>()
-        </span><span class=identifier>str </span><span class=identifier>NAME </span><span class=special>= </span><span class=identifier>name</span><span class=special>.</span><span class=identifier>upper</span><span class=special>();            // </span><span class=identifier>better
-        </span><span class=identifier>object </span><span class=identifier>msg </span><span class=special>= </span><span class=string>&quot;%s is bigger than %s&quot; </span><span class=special>% </span><span class=identifier>make_tuple</span><span class=special>(</span><span class=identifier>NAME</span><span class=special>,</span><span class=identifier>name</span><span class=special>);
-    }
-</span></pre></code>
-<p>
-In finer detail:</p>
-<code><pre>
-    <span class=identifier>str </span><span class=identifier>NAME </span><span class=special>= </span><span class=identifier>name</span><span class=special>.</span><span class=identifier>upper</span><span class=special>();
-</span></pre></code>
-<p>
-Illustrates that we provide versions of the str type's methods as C++
-member functions.</p>
-<code><pre>
-    <span class=identifier>object </span><span class=identifier>msg </span><span class=special>= </span><span class=string>&quot;%s is bigger than %s&quot; </span><span class=special>% </span><span class=identifier>make_tuple</span><span class=special>(</span><span class=identifier>NAME</span><span class=special>,</span><span class=identifier>name</span><span class=special>);
-</span></pre></code>
-<p>
-Demonstrates that you can write the C++ equivalent of <tt>&quot;format&quot; % x,y,z</tt>
-in Python, which is useful since there's no easy way to do that in std C++.</p>
-<p>
-<img src="theme/alert.gif"></img> <b>Beware</b> the common pitfall of forgetting that the constructors
-of most of Python's mutable types make copies, just as in Python.</p>
-<p>
-Python:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>d </span><span class=special>= </span><span class=identifier>dict</span><span class=special>(</span><span class=identifier>x</span><span class=special>.</span><span class=identifier>__dict__</span><span class=special>)     </span>##<span class=identifier>copies </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>__dict__
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>d</span><span class=special>[</span><span class=literal>'whatever'</span><span class=special>]            </span>##<span class=identifier>modifies </span><span class=identifier>the </span><span class=identifier>copy
-</span></pre></code>
-<p>
-C++:</p>
-<code><pre>
-    <span class=identifier>dict </span><span class=identifier>d</span><span class=special>(</span><span class=identifier>x</span><span class=special>.</span><span class=identifier>attr</span><span class=special>(</span><span class=string>&quot;__dict__&quot;</span><span class=special>));  </span>##<span class=identifier>copies </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>__dict__
-    </span><span class=identifier>d</span><span class=special>[</span><span class=literal>'whatever'</span><span class=special>] = </span><span class=number>3</span><span class=special>;           </span>##<span class=identifier>modifies </span><span class=identifier>the </span><span class=identifier>copy
-</span></pre></code>
-<a name="class__lt_t_gt__as_objects"></a><h2>class_&lt;T&gt; as objects</h2><p>
-Due to the dynamic nature of Boost.Python objects, any <tt>class_&lt;T&gt;</tt> may
-also be one of these types! The following code snippet wraps the class
-(type) object.</p>
-<p>
-We can use this to create wrapped instances. Example:</p>
-<code><pre>
-    <span class=identifier>object </span><span class=identifier>vec345 </span><span class=special>= (
-        </span><span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>Vec2</span><span class=special>&gt;(</span><span class=string>&quot;Vec2&quot;</span><span class=special>, </span><span class=identifier>init</span><span class=special>&lt;</span><span class=keyword>double</span><span class=special>, </span><span class=keyword>double</span><span class=special>&gt;())
-            .</span><span class=identifier>def_readonly</span><span class=special>(</span><span class=string>&quot;length&quot;</span><span class=special>, &amp;</span><span class=identifier>Point</span><span class=special>::</span><span class=identifier>length</span><span class=special>)
-            .</span><span class=identifier>def_readonly</span><span class=special>(</span><span class=string>&quot;angle&quot;</span><span class=special>, &amp;</span><span class=identifier>Point</span><span class=special>::</span><span class=identifier>angle</span><span class=special>)
-        )(</span><span class=number>3.0</span><span class=special>, </span><span class=number>4.0</span><span class=special>);
-
-    </span><span class=identifier>assert</span><span class=special>(</span><span class=identifier>vec345</span><span class=special>.</span><span class=identifier>attr</span><span class=special>(</span><span class=string>&quot;length&quot;</span><span class=special>) == </span><span class=number>5.0</span><span class=special>);
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="basic_interface.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="extracting_c___objects.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/deriving_a_python_class.html b/doc/tutorial/doc/deriving_a_python_class.html
deleted file mode 100644
index 5c268371..00000000
--- a/doc/tutorial/doc/deriving_a_python_class.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Deriving a Python Class</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="class_virtual_functions.html">
-<link rel="next" href="virtual_functions_with_default_implementations.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Deriving a Python Class</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="class_virtual_functions.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="virtual_functions_with_default_implementations.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Continuing, we can derive from our base class Base in Python and override
-the virtual function in Python. Before we can do that, we have to set up
-our <tt>class_</tt> wrapper as:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>Base</span><span class=special>, </span><span class=identifier>BaseWrap</span><span class=special>, </span><span class=identifier>boost</span><span class=special>::</span><span class=identifier>noncopyable</span><span class=special>&gt;(</span><span class=string>&quot;Base&quot;</span><span class=special>)
-        ;
-</span></pre></code>
-<p>
-Otherwise, we have to suppress the Base class' <tt>no_init</tt> by adding an
-<tt>__init__()</tt> method to all our derived classes. <tt>no_init</tt> actually adds
-an <tt>__init__</tt> method that raises a Python RuntimeError exception.</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=keyword>class </span><span class=identifier>Derived</span><span class=special>(</span><span class=identifier>Base</span><span class=special>):
-    ...     </span><span class=identifier>def </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>self</span><span class=special>):
-    ...         </span><span class=keyword>return </span><span class=number>42
-    </span><span class=special>...
-</span></pre></code>
-<p>
-Cool eh? A Python class deriving from a C++ class!</p>
-<p>
-Let's now make an instance of our Python class <tt>Derived</tt>:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>derived </span><span class=special>= </span><span class=identifier>Derived</span><span class=special>()
-</span></pre></code>
-<p>
-Calling <tt>derived.f()</tt>:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>derived</span><span class=special>.</span><span class=identifier>f</span><span class=special>()
-    </span><span class=number>42
-</span></pre></code>
-<p>
-Will yield the expected result. Finally, calling calling the free function
-<tt>call_f</tt> with <tt>derived</tt> as argument:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>call_f</span><span class=special>(</span><span class=identifier>derived</span><span class=special>)
-    </span><span class=number>42
-</span></pre></code>
-<p>
-Will also yield the expected result.</p>
-<p>
-Here's what's happening:</p>
-<ol><li><tt>call_f(derived)</tt> is called in Python</li><li>This corresponds to <tt>def(&quot;call_f&quot;, call_f);</tt>. Boost.Python dispatches this call.</li><li><tt>int call_f(Base&amp; b) { return b.f(); }</tt> accepts the call.</li><li>The overridden virtual function <tt>f</tt> of <tt>BaseWrap</tt> is called.</li><li><tt>call_method&lt;int&gt;(self, &quot;f&quot;);</tt> dispatches the call back to Python.</li><li><tt>def f(self): return 42</tt> is finally called.</li></ol><table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="class_virtual_functions.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="virtual_functions_with_default_implementations.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/embedding.html b/doc/tutorial/doc/embedding.html
deleted file mode 100644
index 8cd1c725..00000000
--- a/doc/tutorial/doc/embedding.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Embedding</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="enums.html">
-<link rel="next" href="using_the_interpreter.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Embedding</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="enums.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="using_the_interpreter.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-By now you should know how to use Boost.Python to call your C++ code from
-Python. However, sometimes you may need to do the reverse: call Python code
-from the C++-side. This requires you to <i>embed</i> the Python interpreter
-into your C++ program.</p>
-<p>
-Currently, Boost.Python does not directly support everything you'll need
-when embedding. Therefore you'll need to use the
-<a href="http://www.python.org/doc/current/api/api.html">
-Python/C API</a> to fill in
-the gaps. However, Boost.Python already makes embedding a lot easier and,
-in a future version, it may become unnecessary to touch the Python/C API at
-all. So stay tuned... <img src="theme/smiley.gif"></img></p>
-<a name="building_embedded_programs"></a><h2>Building embedded programs</h2><p>
-To be able to use embedding in your programs, they have to be linked to
-both Boost.Python's and Python's static link library.</p>
-<p>
-Boost.Python's static link library comes in two variants. Both are located
-in Boost's <tt>/libs/python/build/bin-stage</tt> subdirectory. On Windows, the
-variants are called <tt>boost_python.lib</tt> (for release builds) and
-<tt>boost_python_debug.lib</tt> (for debugging). If you can't find the
-libraries, you probably haven't built Boost.Python yet. See <a
-href="../../building.html">Building and Testing</a> on how to do
-this.</p>
-<p>
-Python's static link library can be found in the <tt>/libs</tt> subdirectory of
-your Python directory. On Windows it is called pythonXY.lib where X.Y is
-your major Python version number.</p>
-<p>
-Additionally, Python's <tt>/include</tt> subdirectory has to be added to your
-include path.</p>
-<p>
-In a Jamfile, all the above boils down to:</p>
-<code><pre>
-    projectroot c:\projects\embedded_program ; # location of the program
-
-    # bring in the rules for python
-    SEARCH on python.jam = $(BOOST_BUILD_PATH) ;
-    include python.jam ;
-
-    exe embedded_program # name of the executable
-      : #sources
-         embedded_program.cpp
-      : # requirements
-         &lt;find-library&gt;boost_python &lt;library-path&gt;c:\boost\libs\python
-      $(PYTHON_PROPERTIES)
-        &lt;library-path&gt;$(PYTHON_LIB_PATH)
-        &lt;find-library&gt;$(PYTHON_EMBEDDED_LIBRARY) ;
-</pre></code><a name="getting_started"></a><h2>Getting started</h2><p>
-Being able to build is nice, but there is nothing to build yet. Embedding
-the Python interpreter into one of your C++ programs requires these 4
-steps:</p>
-<ol><li>#include <tt>&lt;boost/python.hpp&gt;</tt><br><br></li><li>Call <a href="http://www.python.org/doc/current/api/initialization.html#l2h-652">
-Py_Initialize</a>() to start the interpreter and create the <tt>__main__</tt> module.<br><br></li><li>Call other Python C API routines to use the interpreter.<br><br></li><li>Call <a href="http://www.python.org/doc/current/api/initialization.html#l2h-656">
-Py_Finalize</a>() to stop the interpreter and release its resources.</li></ol><p>
-(Of course, there can be other C++ code between all of these steps.)</p>
-<blockquote><p><i><b>Now that we can embed the interpreter in our programs, lets see how to put it to use...</b></i></p></blockquote><table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="enums.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="using_the_interpreter.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 Dirk Gerrits<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/enums.html b/doc/tutorial/doc/enums.html
deleted file mode 100644
index 09632e31..00000000
--- a/doc/tutorial/doc/enums.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Enums</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="extracting_c___objects.html">
-<link rel="next" href="embedding.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Enums</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="extracting_c___objects.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="embedding.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Boost.Python has a nifty facility to capture and wrap C++ enums. While
-Python has no <tt>enum</tt> type, we'll often want to expose our C++ enums to
-Python as an <tt>int</tt>. Boost.Python's enum facility makes this easy while
-taking care of the proper conversions from Python's dynamic typing to C++'s
-strong static typing (in C++, ints cannot be implicitly converted to
-enums). To illustrate, given a C++ enum:</p>
-<code><pre>
-    <span class=keyword>enum </span><span class=identifier>choice </span><span class=special>{ </span><span class=identifier>red</span><span class=special>, </span><span class=identifier>blue </span><span class=special>};
-</span></pre></code>
-<p>
-the construct:</p>
-<code><pre>
-    <span class=identifier>enum_</span><span class=special>&lt;</span><span class=identifier>choice</span><span class=special>&gt;(</span><span class=string>&quot;choice&quot;</span><span class=special>)
-        .</span><span class=identifier>value</span><span class=special>(</span><span class=string>&quot;red&quot;</span><span class=special>, </span><span class=identifier>red</span><span class=special>)
-        .</span><span class=identifier>value</span><span class=special>(</span><span class=string>&quot;blue&quot;</span><span class=special>, </span><span class=identifier>blue</span><span class=special>)
-        ;
-</span></pre></code>
-<p>
-can be used to expose to Python. The new enum type is created in the
-current <tt>scope()</tt>, which is usually the current module. The snippet above
-creates a Python class derived from Python's <tt>int</tt> type which is
-associated with the C++ type passed as its first parameter.</p>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-<img src="theme/lens.gif"></img> <b>what is a scope?</b><br><br> The scope is a class that has an
-associated global Python object which controls the Python namespace in
-which new extension classes and wrapped functions will be defined as
-attributes. Details can be found <a href="../../v2/scope.html">
-here</a>.    </td>
-  </tr>
-</table>
-<p>
-You can access those values in Python as</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>my_module</span><span class=special>.</span><span class=identifier>choice</span><span class=special>.</span><span class=identifier>red
-    </span><span class=identifier>my_module</span><span class=special>.</span><span class=identifier>choice</span><span class=special>.</span><span class=identifier>red
-</span></pre></code>
-<p>
-where my_module is the module where the enum is declared. You can also
-create a new scope around a class:</p>
-<code><pre>
-    <span class=identifier>scope </span><span class=identifier>in_X </span><span class=special>= </span><span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>X</span><span class=special>&gt;(</span><span class=string>&quot;X&quot;</span><span class=special>)
-                    .</span><span class=identifier>def</span><span class=special>( ... )
-                    .</span><span class=identifier>def</span><span class=special>( ... )
-                ;
-
-    // </span><span class=identifier>Expose </span><span class=identifier>X</span><span class=special>::</span><span class=identifier>nested </span><span class=identifier>as </span><span class=identifier>X</span><span class=special>.</span><span class=identifier>nested
-    </span><span class=identifier>enum_</span><span class=special>&lt;</span><span class=identifier>X</span><span class=special>::</span><span class=identifier>nested</span><span class=special>&gt;(</span><span class=string>&quot;nested&quot;</span><span class=special>)
-        .</span><span class=identifier>value</span><span class=special>(</span><span class=string>&quot;red&quot;</span><span class=special>, </span><span class=identifier>red</span><span class=special>)
-        .</span><span class=identifier>value</span><span class=special>(</span><span class=string>&quot;blue&quot;</span><span class=special>, </span><span class=identifier>blue</span><span class=special>)
-        ;
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="extracting_c___objects.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="embedding.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/exception_translation.html b/doc/tutorial/doc/exception_translation.html
deleted file mode 100644
index 51c73560..00000000
--- a/doc/tutorial/doc/exception_translation.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Exception Translation</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="iterators.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Exception Translation</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="iterators.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><img src="theme/r_arr_disabled.gif" border="0"></td>
-   </tr>
-</table>
-<p>
-All C++ exceptions must be caught at the boundary with Python code. This
-boundary is the point where C++ meets Python. Boost.Python provides a
-default exception handler that translates selected standard exceptions,
-then gives up:</p>
-<code><pre>
-    <span class=identifier>raise </span><span class=identifier>RuntimeError</span><span class=special>, </span><span class=literal>'unidentifiable C++ Exception'
-</span></pre></code>
-<p>
-Users may provide custom translation. Here's an example:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>PodBayDoorException</span><span class=special>;
-    </span><span class=keyword>void </span><span class=identifier>translator</span><span class=special>(</span><span class=identifier>PodBayDoorException </span><span class=keyword>const</span><span class=special>&amp; </span><span class=identifier>x</span><span class=special>) {
-        </span><span class=identifier>PyErr_SetString</span><span class=special>(</span><span class=identifier>PyExc_UserWarning</span><span class=special>, </span><span class=string>&quot;I'm sorry Dave...&quot;</span><span class=special>);
-    }
-    </span><span class=identifier>BOOST_PYTHON_MODULE</span><span class=special>(</span><span class=identifier>kubrick</span><span class=special>) {
-         </span><span class=identifier>register_exception_translator</span><span class=special>&lt;
-              </span><span class=identifier>PodBayDoorException</span><span class=special>&gt;(</span><span class=identifier>translator</span><span class=special>);
-         ...
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="iterators.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><img src="theme/r_arr_disabled.gif" border="0"></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/exposing_classes.html b/doc/tutorial/doc/exposing_classes.html
deleted file mode 100644
index 18f2e8d0..00000000
--- a/doc/tutorial/doc/exposing_classes.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Exposing Classes</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="building_hello_world.html">
-<link rel="next" href="constructors.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Exposing Classes</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="building_hello_world.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="constructors.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Now let's expose a C++ class to Python.</p>
-<p>
-Consider a C++ class/struct that we want to expose to Python:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>World
-    </span><span class=special>{
-        </span><span class=keyword>void </span><span class=identifier>set</span><span class=special>(</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>) { </span><span class=keyword>this</span><span class=special>-&gt;</span><span class=identifier>msg </span><span class=special>= </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>greet</span><span class=special>() { </span><span class=keyword>return </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>;
-    };
-</span></pre></code>
-<p>
-We can expose this to Python by writing a corresponding Boost.Python
-C++ Wrapper:</p>
-<code><pre>
-    <span class=preprocessor>#include </span><span class=special>&lt;</span><span class=identifier>boost</span><span class=special>/</span><span class=identifier>python</span><span class=special>.</span><span class=identifier>hpp</span><span class=special>&gt;
-    </span><span class=keyword>using </span><span class=keyword>namespace </span><span class=identifier>boost</span><span class=special>::</span><span class=identifier>python</span><span class=special>;
-
-    </span><span class=identifier>BOOST_PYTHON_MODULE</span><span class=special>(</span><span class=identifier>hello</span><span class=special>)
-    {
-        </span><span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>World</span><span class=special>&gt;(</span><span class=string>&quot;World&quot;</span><span class=special>)
-            .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;greet&quot;</span><span class=special>, &amp;</span><span class=identifier>World</span><span class=special>::</span><span class=identifier>greet</span><span class=special>)
-            .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;set&quot;</span><span class=special>, &amp;</span><span class=identifier>World</span><span class=special>::</span><span class=identifier>set</span><span class=special>)
-        ;
-    }
-</span></pre></code>
-<p>
-Here, we wrote a C++ class wrapper that exposes the member functions
-<tt>greet</tt> and <tt>set</tt>. Now, after building our module as a shared library, we
-may use our class <tt>World</tt> in Python. Here's a sample Python session:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>import </span><span class=identifier>hello
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>planet </span><span class=special>= </span><span class=identifier>hello</span><span class=special>.</span><span class=identifier>World</span><span class=special>()
-    &gt;&gt;&gt; </span><span class=identifier>planet</span><span class=special>.</span><span class=identifier>set</span><span class=special>(</span><span class=literal>'howdy'</span><span class=special>)
-    &gt;&gt;&gt; </span><span class=identifier>planet</span><span class=special>.</span><span class=identifier>greet</span><span class=special>()
-    </span><span class=literal>'howdy'
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="building_hello_world.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="constructors.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/extracting_c___objects.html b/doc/tutorial/doc/extracting_c___objects.html
deleted file mode 100644
index 82096e6d..00000000
--- a/doc/tutorial/doc/extracting_c___objects.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Extracting C++ objects</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="derived_object_types.html">
-<link rel="next" href="enums.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Extracting C++ objects</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="derived_object_types.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="enums.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-At some point, we will need to get C++ values out of object instances. This
-can be achieved with the <tt>extract&lt;T&gt;</tt> function. Consider the following:</p>
-<code><pre>
-    <span class=keyword>double </span><span class=identifier>x </span><span class=special>= </span><span class=identifier>o</span><span class=special>.</span><span class=identifier>attr</span><span class=special>(</span><span class=string>&quot;length&quot;</span><span class=special>); // </span><span class=identifier>compile </span><span class=identifier>error
-</span></pre></code>
-<p>
-In the code above, we got a compiler error because Boost.Python
-<tt>object</tt> can't be implicitly converted to <tt>double</tt>s. Instead, what
-we wanted to do above can be achieved by writing:</p>
-<code><pre>
-    <span class=keyword>double </span><span class=identifier>l </span><span class=special>= </span><span class=identifier>extract</span><span class=special>&lt;</span><span class=keyword>double</span><span class=special>&gt;(</span><span class=identifier>o</span><span class=special>.</span><span class=identifier>attr</span><span class=special>(</span><span class=string>&quot;length&quot;</span><span class=special>));
-    </span><span class=identifier>Vec2</span><span class=special>&amp; </span><span class=identifier>v </span><span class=special>= </span><span class=identifier>extract</span><span class=special>&lt;</span><span class=identifier>Vec2</span><span class=special>&amp;&gt;(</span><span class=identifier>o</span><span class=special>);
-    </span><span class=identifier>assert</span><span class=special>(</span><span class=identifier>l </span><span class=special>== </span><span class=identifier>v</span><span class=special>.</span><span class=identifier>length</span><span class=special>());
-</span></pre></code>
-<p>
-The first line attempts to extract the &quot;length&quot; attribute of the
-Boost.Python <tt>object</tt> <tt>o</tt>. The second line attempts to <i>extract</i> the
-<tt>Vec2</tt> object from held by the Boost.Python <tt>object</tt> <tt>o</tt>.</p>
-<p>
-Take note that we said &quot;attempt to&quot; above. What if the Boost.Python
-<tt>object</tt> <tt>o</tt> does not really hold a <tt>Vec2</tt> type? This is certainly
-a possibility considering the dynamic nature of Python <tt>object</tt>s. To
-be on the safe side, if the C++ type can't be extracted, an
-appropriate exception is thrown. To avoid an exception, we need to
-test for extractibility:</p>
-<code><pre>
-    <span class=identifier>extract</span><span class=special>&lt;</span><span class=identifier>Vec2</span><span class=special>&amp;&gt; </span><span class=identifier>x</span><span class=special>(</span><span class=identifier>o</span><span class=special>);
-    </span><span class=keyword>if </span><span class=special>(</span><span class=identifier>x</span><span class=special>.</span><span class=identifier>check</span><span class=special>()) {
-        </span><span class=identifier>Vec2</span><span class=special>&amp; </span><span class=identifier>v </span><span class=special>= </span><span class=identifier>x</span><span class=special>(); ...
-</span></pre></code>
-<p>
-<img src="theme/bulb.gif"></img> The astute reader might have noticed that the <tt>extract&lt;T&gt;</tt>
-facility in fact solves the mutable copying problem:</p>
-<code><pre>
-    <span class=identifier>dict </span><span class=identifier>d </span><span class=special>= </span><span class=identifier>extract</span><span class=special>&lt;</span><span class=identifier>dict</span><span class=special>&gt;(</span><span class=identifier>x</span><span class=special>.</span><span class=identifier>attr</span><span class=special>(</span><span class=string>&quot;__dict__&quot;</span><span class=special>));
-    </span><span class=identifier>d</span><span class=special>[</span><span class=literal>'whatever'</span><span class=special>] = </span><span class=number>3</span><span class=special>;          </span>##<span class=identifier>modifies </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>__dict__ </span><span class=special>!
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="derived_object_types.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="enums.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/functions.html b/doc/tutorial/doc/functions.html
deleted file mode 100644
index 6a29d89b..00000000
--- a/doc/tutorial/doc/functions.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Functions</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="class_operators_special_functions.html">
-<link rel="next" href="call_policies.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Functions</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="class_operators_special_functions.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="call_policies.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-In this chapter, we'll look at Boost.Python powered functions in closer
-detail. We shall see some facilities to make exposing C++ functions to
-Python safe from potential pifalls such as dangling pointers and
-references. We shall also see facilities that will make it even easier for
-us to expose C++ functions that take advantage of C++ features such as
-overloading and default arguments.</p>
-<blockquote><p><i>Read on...</i></p></blockquote><p>
-But before you do, you might want to fire up Python 2.2 or later and type
-<tt>&gt;&gt;&gt; import this</tt>.</p>
-<code><pre>
-    &gt;&gt;&gt; import this
-    The Zen of Python, by Tim Peters
-    Beautiful is better than ugly.
-    Explicit is better than implicit.
-    Simple is better than complex.
-    Complex is better than complicated.
-    Flat is better than nested.
-    Sparse is better than dense.
-    Readability counts.
-    Special cases aren't special enough to break the rules.
-    Although practicality beats purity.
-    Errors should never pass silently.
-    Unless explicitly silenced.
-    In the face of ambiguity, refuse the temptation to guess.
-    There should be one-- and preferably only one --obvious way to do it
-    Although that way may not be obvious at first unless you're Dutch.
-    Now is better than never.
-    Although never is often better than *right* now.
-    If the implementation is hard to explain, it's a bad idea.
-    If the implementation is easy to explain, it may be a good idea.
-    Namespaces are one honking great idea -- let's do more of those!
-</pre></code><table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="class_operators_special_functions.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="call_policies.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/inheritance.html b/doc/tutorial/doc/inheritance.html
deleted file mode 100644
index acd18942..00000000
--- a/doc/tutorial/doc/inheritance.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Inheritance</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="class_properties.html">
-<link rel="next" href="class_virtual_functions.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Inheritance</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="class_properties.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="class_virtual_functions.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-In the previous examples, we dealt with classes that are not polymorphic.
-This is not often the case. Much of the time, we will be wrapping
-polymorphic classes and class hierarchies related by inheritance. We will
-often have to write Boost.Python wrappers for classes that are derived from
-abstract base classes.</p>
-<p>
-Consider this trivial inheritance structure:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>Base </span><span class=special>{ </span><span class=keyword>virtual </span><span class=special>~</span><span class=identifier>Base</span><span class=special>(); };
-    </span><span class=keyword>struct </span><span class=identifier>Derived </span><span class=special>: </span><span class=identifier>Base </span><span class=special>{};
-</span></pre></code>
-<p>
-And a set of C++ functions operating on <tt>Base</tt> and <tt>Derived</tt> object
-instances:</p>
-<code><pre>
-    <span class=keyword>void </span><span class=identifier>b</span><span class=special>(</span><span class=identifier>Base</span><span class=special>*);
-    </span><span class=keyword>void </span><span class=identifier>d</span><span class=special>(</span><span class=identifier>Derived</span><span class=special>*);
-    </span><span class=identifier>Base</span><span class=special>* </span><span class=identifier>factory</span><span class=special>() { </span><span class=keyword>return </span><span class=keyword>new </span><span class=identifier>Derived</span><span class=special>; }
-</span></pre></code>
-<p>
-We've seen how we can wrap the base class <tt>Base</tt>:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>Base</span><span class=special>&gt;(</span><span class=string>&quot;Base&quot;</span><span class=special>)
-        /*...*/
-        ;
-</span></pre></code>
-<p>
-Now we can inform Boost.Python of the inheritance relationship between
-<tt>Derived</tt> and its base class <tt>Base</tt>.  Thus:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>Derived</span><span class=special>, </span><span class=identifier>bases</span><span class=special>&lt;</span><span class=identifier>Base</span><span class=special>&gt; &gt;(</span><span class=string>&quot;Derived&quot;</span><span class=special>)
-        /*...*/
-        ;
-</span></pre></code>
-<p>
-Doing so, we get some things for free:</p>
-<ol><li>Derived automatically inherits all of Base's Python methods (wrapped C++ member functions)</li><li><b>If</b> Base is polymorphic, <tt>Derived</tt> objects which have been passed to Python via a pointer or reference to <tt>Base</tt> can be passed where a pointer or reference to <tt>Derived</tt> is expected.</li></ol><p>
-Now, we shall expose the C++ free functions <tt>b</tt> and <tt>d</tt> and <tt>factory</tt>:</p>
-<code><pre>
-    <span class=identifier>def</span><span class=special>(</span><span class=string>&quot;b&quot;</span><span class=special>, </span><span class=identifier>b</span><span class=special>);
-    </span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;d&quot;</span><span class=special>, </span><span class=identifier>d</span><span class=special>);
-    </span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;factory&quot;</span><span class=special>, </span><span class=identifier>factory</span><span class=special>);
-</span></pre></code>
-<p>
-Note that free function <tt>factory</tt> is being used to generate new
-instances of class <tt>Derived</tt>. In such cases, we use
-<tt>return_value_policy&lt;manage_new_object&gt;</tt> to instruct Python to adopt
-the pointer to <tt>Base</tt> and hold the instance in a new Python <tt>Base</tt>
-object until the the Python object is destroyed. We shall see more of
-Boost.Python <a href="call_policies.html">
-call policies</a> later.</p>
-<code><pre>
-    <span class=comment>// Tell Python to take ownership of factory's result
-    </span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;factory&quot;</span><span class=special>, </span><span class=identifier>factory</span><span class=special>,
-        </span><span class=identifier>return_value_policy</span><span class=special>&lt;</span><span class=identifier>manage_new_object</span><span class=special>&gt;());
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="class_properties.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="class_virtual_functions.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/iterators.html b/doc/tutorial/doc/iterators.html
deleted file mode 100644
index 585f89b1..00000000
--- a/doc/tutorial/doc/iterators.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Iterators</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="using_the_interpreter.html">
-<link rel="next" href="exception_translation.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Iterators</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="using_the_interpreter.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="exception_translation.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-In C++, and STL in particular, we see iterators everywhere. Python also has
-iterators, but these are two very different beasts.</p>
-<p>
-<b>C++ iterators:</b></p>
-<ul><li>C++ has 5 type categories (random-access, bidirectional, forward, input, output)</li><li>There are 2 Operation categories: reposition, access</li><li>A pair of iterators is needed to represent a (first/last) range.</li></ul><p>
-<b>Python Iterators:</b></p>
-<ul><li>1 category (forward)</li><li>1 operation category (next())</li><li>Raises StopIteration exception at end</li></ul><p>
-The typical Python iteration protocol: <tt><b>for y in x...</b></tt> is as follows:</p>
-<code><pre>
-    <span class=identifier>iter </span><span class=special>= </span><span class=identifier>x</span><span class=special>.</span><span class=identifier>__iter__</span><span class=special>()         </span>##<span class=identifier>get </span><span class=identifier>iterator
-    </span><span class=keyword>try</span><span class=special>:
-        </span><span class=keyword>while </span><span class=number>1</span><span class=special>:
-        </span><span class=identifier>y </span><span class=special>= </span><span class=identifier>iter</span><span class=special>.</span><span class=identifier>next</span><span class=special>()         </span>##<span class=identifier>get </span><span class=identifier>each </span><span class=identifier>item
-        </span><span class=special>...                     </span>##<span class=identifier>process </span><span class=identifier>y
-    </span><span class=identifier>except </span><span class=identifier>StopIteration</span><span class=special>: </span><span class=identifier>pass  </span>##<span class=identifier>iterator </span><span class=identifier>exhausted
-</span></pre></code>
-<p>
-Boost.Python provides some mechanisms to make C++ iterators play along
-nicely as Python iterators. What we need to do is to produce
-appropriate __iter__ function from C++ iterators that is compatible
-with the Python iteration protocol. For example:</p>
-<code><pre>
-    <span class=identifier>object </span><span class=identifier>get_iterator </span><span class=special>= </span><span class=identifier>iterator</span><span class=special>&lt;</span><span class=identifier>vector</span><span class=special>&lt;</span><span class=keyword>int</span><span class=special>&gt; &gt;();
-    </span><span class=identifier>object </span><span class=identifier>iter </span><span class=special>= </span><span class=identifier>get_iterator</span><span class=special>(</span><span class=identifier>v</span><span class=special>);
-    </span><span class=identifier>object </span><span class=identifier>first </span><span class=special>= </span><span class=identifier>iter</span><span class=special>.</span><span class=identifier>next</span><span class=special>();
-</span></pre></code>
-<p>
-Or for use in class_&lt;&gt;:</p>
-<code><pre>
-    <span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;__iter__&quot;</span><span class=special>, </span><span class=identifier>iterator</span><span class=special>&lt;</span><span class=identifier>vector</span><span class=special>&lt;</span><span class=keyword>int</span><span class=special>&gt; &gt;())
-</span></pre></code>
-<p>
-<b>range</b></p>
-<p>
-We can create a Python savvy iterator using the range function:</p>
-<ul><li>range(start, finish)</li><li>range&lt;Policies,Target&gt;(start, finish)</li></ul><p>
-Here, start/finish may be one of:</p>
-<ul><li>member data pointers</li><li>member function pointers</li><li>adaptable function object (use Target parameter)</li></ul><p>
-<b>iterator</b></p>
-<ul><li>iterator&lt;T, Policies&gt;()</li></ul><p>
-Given a container <tt>T</tt>, iterator is a shortcut that simply calls <tt>range</tt>
-with &amp;T::begin, &amp;T::end.</p>
-<p>
-Let's put this into action... Here's an example from some hypothetical
-bogon Particle accelerator code:</p>
-<code><pre>
-    <span class=identifier>f </span><span class=special>= </span><span class=identifier>Field</span><span class=special>()
-    </span><span class=keyword>for </span><span class=identifier>x </span><span class=identifier>in </span><span class=identifier>f</span><span class=special>.</span><span class=identifier>pions</span><span class=special>:
-        </span><span class=identifier>smash</span><span class=special>(</span><span class=identifier>x</span><span class=special>)
-    </span><span class=keyword>for </span><span class=identifier>y </span><span class=identifier>in </span><span class=identifier>f</span><span class=special>.</span><span class=identifier>bogons</span><span class=special>:
-        </span><span class=identifier>count</span><span class=special>(</span><span class=identifier>y</span><span class=special>)
-</span></pre></code>
-<p>
-Now, our C++ Wrapper:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>F</span><span class=special>&gt;(</span><span class=string>&quot;Field&quot;</span><span class=special>)
-        .</span><span class=identifier>property</span><span class=special>(</span><span class=string>&quot;pions&quot;</span><span class=special>, </span><span class=identifier>range</span><span class=special>(&amp;</span><span class=identifier>F</span><span class=special>::</span><span class=identifier>p_begin</span><span class=special>, &amp;</span><span class=identifier>F</span><span class=special>::</span><span class=identifier>p_end</span><span class=special>))
-        .</span><span class=identifier>property</span><span class=special>(</span><span class=string>&quot;bogons&quot;</span><span class=special>, </span><span class=identifier>range</span><span class=special>(&amp;</span><span class=identifier>F</span><span class=special>::</span><span class=identifier>b_begin</span><span class=special>, &amp;</span><span class=identifier>F</span><span class=special>::</span><span class=identifier>b_end</span><span class=special>));
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="using_the_interpreter.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="exception_translation.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/object_interface.html b/doc/tutorial/doc/object_interface.html
deleted file mode 100644
index 1988dcd7..00000000
--- a/doc/tutorial/doc/object_interface.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Object Interface</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="auto_overloading.html">
-<link rel="next" href="basic_interface.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Object Interface</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="auto_overloading.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="basic_interface.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Python is dynamically typed, unlike C++ which is statically typed. Python
-variables may hold an integer, a float, list, dict, tuple, str, long etc.,
-among other things. In the viewpoint of Boost.Python and C++, these
-Pythonic variables are just instances of class <tt>object</tt>. We shall see in
-this chapter how to deal with Python objects.</p>
-<p>
-As mentioned, one of the goals of Boost.Python is to provide a
-bidirectional mapping between C++ and Python while maintaining the Python
-feel. Boost.Python C++ <tt>object</tt>s are as close as possible to Python. This
-should minimize the learning curve significantly.</p>
-<p>
-<img src="theme/python.png"></img></p>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="auto_overloading.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="basic_interface.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/overloading.html b/doc/tutorial/doc/overloading.html
deleted file mode 100644
index f93edcac..00000000
--- a/doc/tutorial/doc/overloading.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Overloading</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="call_policies.html">
-<link rel="next" href="default_arguments.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Overloading</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="call_policies.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="default_arguments.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-The following illustrates a scheme for manually wrapping an overloaded
-member functions. Of course, the same technique can be applied to wrapping
-overloaded non-member functions.</p>
-<p>
-We have here our C++ class:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>X
-    </span><span class=special>{
-        </span><span class=keyword>bool </span><span class=identifier>f</span><span class=special>(</span><span class=keyword>int </span><span class=identifier>a</span><span class=special>)
-        {
-            </span><span class=keyword>return </span><span class=keyword>true</span><span class=special>;
-        }
-
-        </span><span class=keyword>bool </span><span class=identifier>f</span><span class=special>(</span><span class=keyword>int </span><span class=identifier>a</span><span class=special>, </span><span class=keyword>double </span><span class=identifier>b</span><span class=special>)
-        {
-            </span><span class=keyword>return </span><span class=keyword>true</span><span class=special>;
-        }
-
-        </span><span class=keyword>bool </span><span class=identifier>f</span><span class=special>(</span><span class=keyword>int </span><span class=identifier>a</span><span class=special>, </span><span class=keyword>double </span><span class=identifier>b</span><span class=special>, </span><span class=keyword>char </span><span class=identifier>c</span><span class=special>)
-        {
-            </span><span class=keyword>return </span><span class=keyword>true</span><span class=special>;
-        }
-
-        </span><span class=keyword>int </span><span class=identifier>f</span><span class=special>(</span><span class=keyword>int </span><span class=identifier>a</span><span class=special>, </span><span class=keyword>int </span><span class=identifier>b</span><span class=special>, </span><span class=keyword>int </span><span class=identifier>c</span><span class=special>)
-        {
-            </span><span class=keyword>return </span><span class=identifier>a </span><span class=special>+ </span><span class=identifier>b </span><span class=special>+ </span><span class=identifier>c</span><span class=special>;
-        };
-    };
-</span></pre></code>
-<p>
-Class X has 4 overloaded functions. We shall start by introducing some
-member function pointer variables:</p>
-<code><pre>
-    <span class=keyword>bool    </span><span class=special>(</span><span class=identifier>X</span><span class=special>::*</span><span class=identifier>fx1</span><span class=special>)(</span><span class=keyword>int</span><span class=special>)              = &amp;</span><span class=identifier>X</span><span class=special>::</span><span class=identifier>f</span><span class=special>;
-    </span><span class=keyword>bool    </span><span class=special>(</span><span class=identifier>X</span><span class=special>::*</span><span class=identifier>fx2</span><span class=special>)(</span><span class=keyword>int</span><span class=special>, </span><span class=keyword>double</span><span class=special>)      = &amp;</span><span class=identifier>X</span><span class=special>::</span><span class=identifier>f</span><span class=special>;
-    </span><span class=keyword>bool    </span><span class=special>(</span><span class=identifier>X</span><span class=special>::*</span><span class=identifier>fx3</span><span class=special>)(</span><span class=keyword>int</span><span class=special>, </span><span class=keyword>double</span><span class=special>, </span><span class=keyword>char</span><span class=special>)= &amp;</span><span class=identifier>X</span><span class=special>::</span><span class=identifier>f</span><span class=special>;
-    </span><span class=keyword>int     </span><span class=special>(</span><span class=identifier>X</span><span class=special>::*</span><span class=identifier>fx4</span><span class=special>)(</span><span class=keyword>int</span><span class=special>, </span><span class=keyword>int</span><span class=special>, </span><span class=keyword>int</span><span class=special>)    = &amp;</span><span class=identifier>X</span><span class=special>::</span><span class=identifier>f</span><span class=special>;
-</span></pre></code>
-<p>
-With these in hand, we can proceed to define and wrap this for Python:</p>
-<code><pre>
-    <span class=special>.</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>fx1</span><span class=special>)
-    .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>fx2</span><span class=special>)
-    .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>fx3</span><span class=special>)
-    .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, </span><span class=identifier>fx4</span><span class=special>)
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="call_policies.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="default_arguments.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/quickstart.html b/doc/tutorial/doc/quickstart.html
deleted file mode 100644
index 02ba7a1a..00000000
--- a/doc/tutorial/doc/quickstart.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>QuickStart</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="next" href="building_hello_world.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>QuickStart</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><img src="theme/l_arr_disabled.gif" border="0"></td>
-    <td width="20"><a href="building_hello_world.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-The Boost Python Library is a framework for interfacing Python and
-C++. It allows you to quickly and seamlessly expose C++ classes
-functions and objects to Python, and vice-versa, using no special
-tools -- just your C++ compiler. It is designed to wrap C++ interfaces
-non-intrusively, so that you should not have to change the C++ code at
-all in order to wrap it, making Boost.Python ideal for exposing
-3rd-party libraries to Python. The library's use of advanced
-metaprogramming techniques simplifies its syntax for users, so that
-wrapping code takes on the look of a kind of declarative interface
-definition language (IDL).</p>
-<a name="hello_world"></a><h2>Hello World</h2><p>
-Following C/C++ tradition, let's start with the &quot;hello, world&quot;. A C++
-Function:</p>
-<code><pre>
-    <span class=keyword>char </span><span class=keyword>const</span><span class=special>* </span><span class=identifier>greet</span><span class=special>()
-    {
-       </span><span class=keyword>return </span><span class=string>&quot;hello, world&quot;</span><span class=special>;
-    }
-</span></pre></code>
-<p>
-can be exposed to Python by writing a Boost.Python wrapper:</p>
-<code><pre>
-    <span class=preprocessor>#include </span><span class=special>&lt;</span><span class=identifier>boost</span><span class=special>/</span><span class=identifier>python</span><span class=special>.</span><span class=identifier>hpp</span><span class=special>&gt;
-    </span><span class=keyword>using </span><span class=keyword>namespace </span><span class=identifier>boost</span><span class=special>::</span><span class=identifier>python</span><span class=special>;
-
-    </span><span class=identifier>BOOST_PYTHON_MODULE</span><span class=special>(</span><span class=identifier>hello</span><span class=special>)
-    {
-        </span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;greet&quot;</span><span class=special>, </span><span class=identifier>greet</span><span class=special>);
-    }
-</span></pre></code>
-<p>
-That's it. We're done. We can now build this as a shared library. The
-resulting DLL is now visible to Python. Here's a sample Python session:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>import </span><span class=identifier>hello
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>print </span><span class=identifier>hello</span><span class=special>.</span><span class=identifier>greet</span><span class=special>()
-    </span><span class=identifier>hello</span><span class=special>, </span><span class=identifier>world
-</span></pre></code>
-<blockquote><p><i><b>Next stop... Building your Hello World module from start to finish...</b></i></p></blockquote><table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><img src="theme/l_arr_disabled.gif" border="0"></td>
-    <td width="20"><a href="building_hello_world.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/quickstart.txt b/doc/tutorial/doc/quickstart.txt
deleted file mode 100644
index cf75c565..00000000
--- a/doc/tutorial/doc/quickstart.txt
+++ /dev/null
@@ -1,2001 +0,0 @@
-[doc Boost Python Tutorial]
-
-[def __note__       [$theme/note.gif]]
-[def __alert__      [$theme/alert.gif]]
-[def __detail__     [$theme/lens.gif]]
-[def __tip__        [$theme/bulb.gif]]
-[def :-)            [$theme/smiley.gif]]
-
-[page QuickStart]
-
-The Boost Python Library is a framework for interfacing Python and
-C++. It allows you to quickly and seamlessly expose C++ classes
-functions and objects to Python, and vice-versa, using no special
-tools -- just your C++ compiler. It is designed to wrap C++ interfaces
-non-intrusively, so that you should not have to change the C++ code at
-all in order to wrap it, making Boost.Python ideal for exposing
-3rd-party libraries to Python. The library's use of advanced
-metaprogramming techniques simplifies its syntax for users, so that
-wrapping code takes on the look of a kind of declarative interface
-definition language (IDL).
-
-[h2 Hello World]
-
-Following C/C++ tradition, let's start with the "hello, world". A C++
-Function:
-
-    char const* greet()
-    {
-       return "hello, world";
-    }
-
-can be exposed to Python by writing a Boost.Python wrapper:
-
-    #include <boost/python.hpp>
-    using namespace boost::python;
-
-    BOOST_PYTHON_MODULE(hello)
-    {
-        def("greet", greet);
-    }
-
-That's it. We're done. We can now build this as a shared library. The
-resulting DLL is now visible to Python. Here's a sample Python session:
-
-    >>> import hello
-    >>> print hello.greet()
-    hello, world
-
-[:['[*Next stop... Building your Hello World module from start to finish...]]]
-
-[page Building Hello World]
-
-[h2 From Start To Finish]
-
-Now the first thing you'd want to do is to build the Hello World module and
-try it for yourself in Python. In this section, we shall outline the steps
-necessary to achieve that. We shall use the build tool that comes bundled
-with every boost distribution: [*bjam].
-
-[blurb __detail__ [*Building without bjam][br][br]
-
-Besides bjam, there are of course other ways to get your module built.
-What's written here should not be taken as "the one and only way".
-There are of course other build tools apart from [^bjam].
-
-Take note however that the preferred build tool for Boost.Python is bjam. 
-There are so many ways to set up the build incorrectly. Experience shows 
-that 90% of the "I can't build Boost.Python" problems come from people 
-who had to use a different tool.
-]
-
-We shall skip over the details. Our objective will be to simply create the
-hello world module and run it in Python. For a complete reference to
-building Boost.Python, check out: [@../../building.html building.html].
-After this brief ['bjam] tutorial, we should have built two DLLs:
-
-* boost_python.dll
-* hello.pyd
-
-if you are on Windows, and
-
-* libboost_python.so
-* hello.so
-
-if you are on Unix.
-
-The tutorial example can be found in the directory:
-[^libs/python/example/tutorial]. There, you can find:
-
-* hello.cpp
-* Jamfile
-
-The [^hello.cpp] file is our C++ hello world example. The [^Jamfile] is a
-minimalist ['bjam] script that builds the DLLs for us.
-
-Before anything else, you should have the bjam executable in your boost
-directory or somewhere in your path such that [^bjam] can be executed in
-the command line. Pre-built Boost.Jam executables are available for most
-platforms. For example, a pre-built Microsoft Windows bjam executable can
-be downloaded [@http://boost.sourceforge.net/jam-executables/bin.ntx86/bjam.zip here].
-The complete list of bjam pre-built
-executables can be found [@../../../../../tools/build/index.html#Jam here].
-
-[h2 Lets Jam!]
-[$theme/jam.png]
-
-Here is our minimalist Jamfile:
-
-[pre
-    subproject libs/python/example/tutorial ;
-
-    SEARCH on python.jam = $(BOOST_BUILD_PATH) ;
-    include python.jam ;
-
-    extension hello                     # Declare a Python extension called hello
-    :   hello.cpp                       # source
-        <dll>../../build/boost_python   # dependencies
-        ;
-]
-
-First, we need to specify our location in the boost project hierarchy.
-It so happens that the tutorial example is located in [^/libs/python/example/tutorial].
-Thus:
-
-[pre
-    subproject libs/python/example/tutorial ;
-]
-
-Then we will include the definitions needed by Python modules:
-
-[pre
-    SEARCH on python.jam = $(BOOST_BUILD_PATH) ;
-    include python.jam ;
-]
-
-Finally we declare our [^hello] extension:
-
-[pre
-    extension hello                     # Declare a Python extension called hello
-    :   hello.cpp                       # source
-        <dll>../../build/boost_python   # dependencies
-        ;
-]
-
-[h2 Running bjam]
-
-['bjam] is run using your operating system's command line interpreter.
-
-[:Start it up.]
-
-Make sure that the environment is set so that we can invoke the C++
-compiler. With MSVC, that would mean running the [^Vcvars32.bat] batch
-file. For instance:
-
-    C:\Program Files\Microsoft Visual Studio\VC98\bin\Vcvars32.bat
-
-Some environment variables will have to be setup for proper building of our
-Python modules. Example:
-
-    set PYTHON_ROOT=c:/dev/tools/python
-    set PYTHON_VERSION=2.2
-
-The above assumes that the Python installation is in [^c:/dev/tools/python]
-and that we are using Python version 2.2. You'll have to tweak this path
-appropriately. __note__ Be sure not to include a third number, e.g. [*not]  "2.2.1",
-even if that's the version you have.
-
-Now we are ready... Be sure to [^cd] to [^libs/python/example/tutorial]
-where the tutorial [^"hello.cpp"] and the [^"Jamfile"] is situated.
-
-Finally:
-
-    bjam -sTOOLS=msvc
-
-We are again assuming that we are using Microsoft Visual C++ version 6. If
-not, then you will have to specify the appropriate tool. See
-[@../../../../../tools/build/index.html Building Boost Libraries] for
-further details.
-
-It should be building now:
-
-[pre
-    cd C:\dev\boost\libs\python\example\tutorial
-    bjam -sTOOLS=msvc
-    ...patience...
-    ...found 1703 targets...
-    ...updating 40 targets...
-]
-
-And so on... Finally:
-
-[pre
-    vc-C++ ..\..\..\..\libs\python\example\tutorial\bin\hello.pyd\msvc\debug\
-    runtime-link-dynamic\hello.obj
-    hello.cpp
-    vc-Link ..\..\..\..\libs\python\example\tutorial\bin\hello.pyd\msvc\debug\
-    runtime-link-dynamic\hello.pyd ..\..\..\..\libs\python\example\tutorial\bin\
-    hello.pyd\msvc\debug\runtime-link-dynamic\hello.lib
-       Creating library ..\..\..\..\libs\python\example\tutorial\bin\hello.pyd\
-       msvc\debug\runtime-link-dynamic\hello.lib and object ..\..\..\..\libs\python\
-       example\tutorial\bin\hello.pyd\msvc\debug\runtime-link-dynamic\hello.exp
-    ...updated 40 targets...
-]
-
-If all is well, you should now have:
-
-* boost_python.dll
-* hello.pyd
-
-if you are on Windows, and
-
-* libboost_python.so
-* hello.so
-
-if you are on Unix.
-
-[^boost_python.dll] can be found somewhere in [^libs\python\build\bin]
-while [^hello.pyd] can be found somewhere in
-[^libs\python\example\tutorial\bin]. After a successful build, you can just
-link in these DLLs with the Python interpreter. In Windows for example, you
-can simply put these libraries inside the directory where the Python
-executable is.
-
-You may now fire up Python and run our hello module:
-
-    >>> import hello
-    >>> print hello.greet()
-    hello, world
-
-[:[*There you go... Have fun!]]
-
-[page Exposing Classes]
-
-Now let's expose a C++ class to Python.
-
-Consider a C++ class/struct that we want to expose to Python:
-
-    struct World
-    {
-        void set(std::string msg) { this->msg = msg; }
-        std::string greet() { return msg; }
-        std::string msg;
-    };
-
-We can expose this to Python by writing a corresponding Boost.Python
-C++ Wrapper:
-
-    #include <boost/python.hpp>
-    using namespace boost::python;
-
-    BOOST_PYTHON_MODULE(hello)
-    {
-        class_<World>("World")
-            .def("greet", &World::greet)
-            .def("set", &World::set)
-        ;
-    }
-
-Here, we wrote a C++ class wrapper that exposes the member functions
-[^greet] and [^set]. Now, after building our module as a shared library, we
-may use our class [^World] in Python. Here's a sample Python session:
-
-    >>> import hello
-    >>> planet = hello.World()
-    >>> planet.set('howdy')
-    >>> planet.greet()
-    'howdy'
-
-[page:1 Constructors]
-
-Our previous example didn't have any explicit constructors.
-Since [^World] is declared as a plain struct, it has an implicit default
-constructor. Boost.Python exposes the default constructor by default,
-which is why we were able to write
-
-    >>> planet = hello.World()
-
-We may wish to wrap a class with a non-default constructor. Let us
-build on our previous example:
-
-    struct World
-    {
-        World(std::string msg): msg(msg) {} // added constructor
-        void set(std::string msg) { this->msg = msg; }
-        std::string greet() { return msg; }
-        std::string msg;
-    };
-
-This time [^World] has no default constructor; our previous
-wrapping code would fail to compile when the library tried to expose
-it. We have to tell [^class_<World>] about the constructor we want to
-expose instead.
-
-    #include <boost/python.hpp>
-    using namespace boost::python;
-
-    BOOST_PYTHON_MODULE(hello)
-    {
-        class_<World>("World", init<std::string>())
-            .def("greet", &World::greet)
-            .def("set", &World::set)
-        ;
-    }
-
-[^init<std::string>()] exposes the constructor taking in a
-[^std::string] (in Python, constructors are spelled
-"[^"__init__"]").
-
-We can expose additional constructors by passing more [^init<...>]s to
-the [^def()] member function. Say for example we have another World
-constructor taking in two doubles:
-
-    class_<World>("World", init<std::string>())
-        .def(init<double, double>())
-        .def("greet", &World::greet)
-        .def("set", &World::set)
-    ;
-
-On the other hand, if we do not wish to expose any constructors at
-all, we may use [^no_init] instead:
-
-    class_<Abstract>("Abstract", no_init)
-
-This actually adds an [^__init__] method which always raises a
-Python RuntimeError exception.
-
-[page:1 Class Data Members]
-
-Data members may also be exposed to Python so that they can be
-accessed as attributes of the corresponding Python class. Each data
-member that we wish to be exposed may be regarded as [*read-only] or
-[*read-write].  Consider this class [^Var]:
-
-    struct Var
-    {
-        Var(std::string name) : name(name), value() {}
-        std::string const name;
-        float value;
-    };
-
-Our C++ [^Var] class and its data members can be exposed to Python:
-
-    class_<Var>("Var", init<std::string>())
-        .def_readonly("name", &Var::name)
-        .def_readwrite("value", &Var::value);
-
-Then, in Python, assuming we have placed our Var class inside the namespace
-hello as we did before:
-
-    >>> x = hello.Var('pi')
-    >>> x.value = 3.14
-    >>> print x.name, 'is around', x.value
-    pi is around 3.14
-
-Note that [^name] is exposed as [*read-only] while [^value] is exposed
-as [*read-write].
-
-[pre
-    >>> x.name = 'e' # can't change name
-    Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-    AttributeError: can't set attribute
-]
-
-[page:1 Class Properties]
-
-In C++, classes with public data members are usually frowned
-upon. Well designed classes that take advantage of encapsulation hide
-the class' data members. The only way to access the class' data is
-through access (getter/setter) functions. Access functions expose class
-properties. Here's an example:
-
-    struct Num
-    {
-        Num();
-        float get() const;
-        void set(float value);
-        ...
-    };
-
-However, in Python attribute access is fine; it doesn't neccessarily break
-encapsulation to let users handle attributes directly, because the
-attributes can just be a different syntax for a method call. Wrapping our
-[^Num] class using Boost.Python:
-
-    class_<Num>("Num")
-        .add_property("rovalue", &Num::get)
-        .add_property("value", &Num::get, &Num::set);
-
-And at last, in Python:
-
-    >>> x = Num()
-    >>> x.value = 3.14
-    >>> x.value, x.rovalue
-    (3.14, 3.14)
-    >>> x.rovalue = 2.17 # error!
-
-Take note that the class property [^rovalue] is exposed as [*read-only]
-since the [^rovalue] setter member function is not passed in:
-
-    .add_property("rovalue", &Num::get)
-
-[page:1 Inheritance]
-
-In the previous examples, we dealt with classes that are not polymorphic.
-This is not often the case. Much of the time, we will be wrapping
-polymorphic classes and class hierarchies related by inheritance. We will
-often have to write Boost.Python wrappers for classes that are derived from
-abstract base classes.
-
-Consider this trivial inheritance structure:
-
-    struct Base { virtual ~Base(); };
-    struct Derived : Base {};
-
-And a set of C++ functions operating on [^Base] and [^Derived] object
-instances:
-
-    void b(Base*);
-    void d(Derived*);
-    Base* factory() { return new Derived; }
-
-We've seen how we can wrap the base class [^Base]:
-
-    class_<Base>("Base")
-        /*...*/
-        ;
-
-Now we can inform Boost.Python of the inheritance relationship between
-[^Derived] and its base class [^Base].  Thus:
-
-    class_<Derived, bases<Base> >("Derived")
-        /*...*/
-        ;
-
-Doing so, we get some things for free:
-
-# Derived automatically inherits all of Base's Python methods (wrapped C++ member functions)
-# [*If] Base is polymorphic, [^Derived] objects which have been passed to Python via a pointer or reference to [^Base] can be passed where a pointer or reference to [^Derived] is expected.
-
-Now, we shall expose the C++ free functions [^b] and [^d] and [^factory]:
-
-    def("b", b);
-    def("d", d);
-    def("factory", factory);
-
-Note that free function [^factory] is being used to generate new
-instances of class [^Derived]. In such cases, we use
-[^return_value_policy<manage_new_object>] to instruct Python to adopt
-the pointer to [^Base] and hold the instance in a new Python [^Base]
-object until the the Python object is destroyed. We shall see more of
-Boost.Python [@call_policies.html call policies] later.
-
-    // Tell Python to take ownership of factory's result
-    def("factory", factory,
-        return_value_policy<manage_new_object>());
-
-[page:1 Class Virtual Functions]
-
-In this section, we shall learn how to make functions behave
-polymorphically through virtual functions. Continuing our example, let us
-add a virtual function to our [^Base] class:
-
-    struct Base
-    {
-        virtual int f() = 0;
-    };
-
-Since [^f] is a pure virtual function, [^Base] is now an abstract
-class. Given an instance of our class, the free function [^call_f]
-calls some implementation of this virtual function in a concrete
-derived class:
-
-    int call_f(Base& b) { return b.f(); }
-
-To allow this function to be implemented in a Python derived class, we
-need to create a class wrapper:
-
-    struct BaseWrap : Base
-    {
-        BaseWrap(PyObject* self_)
-            : self(self_) {}
-        int f() { return call_method<int>(self, "f"); }
-        PyObject* self;
-    };
-
-[blurb __detail__ [*member function and methods][br][br] Python, like
-many object oriented languages uses the term [*methods].  Methods
-correspond roughly to C++'s [*member functions]]
-
-Our class wrapper [^BaseWrap] is derived from [^Base]. Its overridden
-virtual member function [^f] in effect calls the corresponding method
-of the Python object [^self], which is a pointer back to the Python
-[^Base] object holding our [^BaseWrap] instance.
-
-[blurb __note__ [*Why do we need BaseWrap?][br][br]
-
-['You may ask], "Why do we need the [^BaseWrap] derived class? This could
-have been designed so that everything gets done right inside of
-Base."[br][br]
-
-One of the goals of Boost.Python is to be minimally intrusive on an
-existing C++ design. In principle, it should be possible to expose the
-interface for a 3rd party library without changing it. To unintrusively
-hook into the virtual functions so that a Python override may be called, we
-must use a derived class.[br][br]
-
-Note however that you don't need to do this to get methods overridden
-in Python to behave virtually when called ['from] [*Python]. The only
-time you need to do the [^BaseWrap] dance is when you have a virtual
-function that's going to be overridden in Python and called
-polymorphically ['from] [*C++].]
-
-Wrapping [^Base] and the free function [^call_f]:
-
-    class_<Base, BaseWrap, boost::noncopyable>("Base", no_init)
-        ;
-    def("call_f", call_f);
-
-Notice that we parameterized the [^class_] template with [^BaseWrap] as the
-second parameter. What is [^noncopyable]? Without it, the library will try
-to create code for converting Base return values of wrapped functions to
-Python. To do that, it needs Base's copy constructor... which isn't
-available, since Base is an abstract class.
-
-In Python, let us try to instantiate our [^Base] class:
-
-    >>> base = Base()
-    RuntimeError: This class cannot be instantiated from Python
-
-Why is it an error? [^Base] is an abstract class. As such it is advisable
-to define the Python wrapper with [^no_init] as we have done above. Doing
-so will disallow abstract base classes such as [^Base] to be instantiated.
-
-[page:1 Deriving a Python Class]
-
-Continuing, we can derive from our base class Base in Python and override
-the virtual function in Python. Before we can do that, we have to set up
-our [^class_] wrapper as:
-
-    class_<Base, BaseWrap, boost::noncopyable>("Base")
-        ;
-
-Otherwise, we have to suppress the Base class' [^no_init] by adding an
-[^__init__()] method to all our derived classes. [^no_init] actually adds
-an [^__init__] method that raises a Python RuntimeError exception.
-
-    >>> class Derived(Base):
-    ...     def f(self):
-    ...         return 42
-    ...
-
-Cool eh? A Python class deriving from a C++ class!
-
-Let's now make an instance of our Python class [^Derived]:
-
-    >>> derived = Derived()
-
-Calling [^derived.f()]:
-
-    >>> derived.f()
-    42
-
-Will yield the expected result. Finally, calling calling the free function
-[^call_f] with [^derived] as argument:
-
-    >>> call_f(derived)
-    42
-
-Will also yield the expected result.
-
-Here's what's happening:
-
-# [^call_f(derived)] is called in Python
-# This corresponds to [^def("call_f", call_f);]. Boost.Python dispatches this call.
-# [^int call_f(Base& b) { return b.f(); }] accepts the call.
-# The overridden virtual function [^f] of [^BaseWrap] is called.
-# [^call_method<int>(self, "f");] dispatches the call back to Python.
-# [^def f(self): return 42] is finally called.
-
-[page:1 Virtual Functions with Default Implementations]
-
-Recall that in the [@class_virtual_functions.html previous section], we
-wrapped a class with a pure virtual function that we then implemented in
-C++ or Python classes derived from it. Our base class:
-
-    struct Base
-    {
-        virtual int f() = 0;
-    };
-
-had a pure virtual function [^f]. If, however, its member function [^f] was
-not declared as pure virtual:
-
-    struct Base
-    {
-        virtual int f() { return 0; }
-    };
-
-and instead had a default implementation that returns [^0], as shown above,
-we need to add a forwarding function that calls the [^Base] default virtual
-function [^f] implementation:
-
-    struct BaseWrap : Base
-    {
-        BaseWrap(PyObject* self_)
-            : self(self_) {}
-        int f() { return call_method<int>(self, "f"); }
-        int default_f() { return Base::f(); } // <<=== ***ADDED***
-        PyObject* self;
-    };
-
-Then, Boost.Python needs to keep track of 1) the dispatch function [^f] and
-2) the forwarding function to its default implementation [^default_f].
-There's a special [^def] function for this purpose. Here's how it is
-applied to our example above:
-
-    class_<Base, BaseWrap>("Base")
-        .def("f", &Base::f, &BaseWrap::default_f)
-
-Note that we are allowing [^Base] objects to be instantiated this time,
-unlike before where we specifically defined the [^class_<Base>] with
-[^no_init].
-
-In Python, the results would be as expected:
-
-    >>> base = Base()
-    >>> class Derived(Base):
-    ...     def f(self):
-    ...         return 42
-    ...
-    >>> derived = Derived()
-
-Calling [^base.f()]:
-
-    >>> base.f()
-    0
-
-Calling [^derived.f()]:
-
-    >>> derived.f()
-    42
-
-Calling [^call_f], passing in a [^base] object:
-
-    >>> call_f(base)
-    0
-
-Calling [^call_f], passing in a [^derived] object:
-
-    >>> call_f(derived)
-    42
-
-[page:1 Class Operators/Special Functions]
-
-[h2 Python Operators]
-
-C is well known for the abundance of operators. C++ extends this to the
-extremes by allowing operator overloading. Boost.Python takes advantage of
-this and makes it easy to wrap C++ operator-powered classes.
-
-Consider a file position class [^FilePos] and a set of operators that take
-on FilePos instances:
-
-    class FilePos { /*...*/ };
-
-    FilePos     operator+(FilePos, int);
-    FilePos     operator+(int, FilePos);
-    int         operator-(FilePos, FilePos);
-    FilePos     operator-(FilePos, int);
-    FilePos&    operator+=(FilePos&, int);
-    FilePos&    operator-=(FilePos&, int);
-    bool        operator<(FilePos, FilePos);
-
-The class and the various operators can be mapped to Python rather easily
-and intuitively:
-
-    class_<FilePos>("FilePos")
-        .def(self + int())          // __add__
-        .def(int() + self)          // __radd__
-        .def(self - self)           // __sub__
-        .def(self - int())          // __sub__
-        .def(self += int())         // __iadd__
-        .def(self -= other<int>())
-        .def(self < self);          // __lt__
-
-The code snippet above is very clear and needs almost no explanation at
-all. It is virtually the same as the operators' signatures. Just take
-note that [^self] refers to FilePos object. Also, not every class [^T] that
-you might need to interact with in an operator expression is (cheaply)
-default-constructible. You can use [^other<T>()] in place of an actual
-[^T] instance when writing "self expressions".
-
-[h2 Special Methods]
-
-Python has a few more ['Special Methods]. Boost.Python supports all of the
-standard special method names supported by real Python class instances. A
-similar set of intuitive interfaces can also be used to wrap C++ functions
-that correspond to these Python ['special functions]. Example:
-
-    class Rational
-    { operator double() const; };
-
-    Rational pow(Rational, Rational);
-    Rational abs(Rational);
-    ostream& operator<<(ostream&,Rational);
-
-    class_<Rational>()
-        .def(float_(self))                  // __float__
-        .def(pow(self, other<Rational>))    // __pow__
-        .def(abs(self))                     // __abs__
-        .def(str(self))                     // __str__
-        ;
-
-Need we say more?
-
-[blurb __detail__ What is the business of [^operator<<] [^.def(str(self))]?
-Well, the method [^str] requires the [^operator<<] to do its work (i.e.
-[^operator<<] is used by the method defined by def(str(self)).]
-
-[page Functions]
-
-In this chapter, we'll look at Boost.Python powered functions in closer
-detail. We shall see some facilities to make exposing C++ functions to
-Python safe from potential pifalls such as dangling pointers and
-references. We shall also see facilities that will make it even easier for
-us to expose C++ functions that take advantage of C++ features such as
-overloading and default arguments.
-
-[:['Read on...]]
-
-But before you do, you might want to fire up Python 2.2 or later and type
-[^>>> import this].
-
-[pre
-    >>> import this
-    The Zen of Python, by Tim Peters
-    Beautiful is better than ugly.
-    Explicit is better than implicit.
-    Simple is better than complex.
-    Complex is better than complicated.
-    Flat is better than nested.
-    Sparse is better than dense.
-    Readability counts.
-    Special cases aren't special enough to break the rules.
-    Although practicality beats purity.
-    Errors should never pass silently.
-    Unless explicitly silenced.
-    In the face of ambiguity, refuse the temptation to guess.
-    There should be one-- and preferably only one --obvious way to do it
-    Although that way may not be obvious at first unless you're Dutch.
-    Now is better than never.
-    Although never is often better than *right* now.
-    If the implementation is hard to explain, it's a bad idea.
-    If the implementation is easy to explain, it may be a good idea.
-    Namespaces are one honking great idea -- let's do more of those!
-]
-
-[page:1 Call Policies]
-
-In C++, we often deal with arguments and return types such as pointers
-and references. Such primitive types are rather, ummmm, low level and
-they really don't tell us much. At the very least, we don't know the
-owner of the pointer or the referenced object. No wonder languages
-such as Java and Python never deal with such low level entities. In
-C++, it's usually considered a good practice to use smart pointers
-which exactly describe ownership semantics. Still, even good C++
-interfaces use raw references and pointers sometimes, so Boost.Python
-must deal with them. To do this, it may need your help. Consider the
-following C++ function:
-
-    X& f(Y& y, Z* z);
-
-How should the library wrap this function? A naive approach builds a
-Python X object around result reference. This strategy might or might
-not work out. Here's an example where it didn't
-
-    >>> x = f(y, z) # x refers to some C++ X
-    >>> del y
-    >>> x.some_method() # CRASH!
-
-What's the problem?
-
-Well, what if f() was implemented as shown below:
-
-    X& f(Y& y, Z* z)
-    {
-        y.z = z;
-        return y.x;
-    }
-
-The problem is that the lifetime of result X& is tied to the lifetime
-of y, because the f() returns a reference to a member of the y
-object. This idiom is is not uncommon and perfectly acceptable in the
-context of C++. However, Python users should not be able to crash the
-system just by using our C++ interface. In this case deleting y will
-invalidate the reference to X. We have a dangling reference.
-
-Here's what's happening:
-
-# [^f] is called passing in a reference to [^y] and a pointer to [^z]
-# A reference to [^y.x] is returned
-# [^y] is deleted. [^x] is a dangling reference
-# [^x.some_method()] is called
-# [*BOOM!]
-
-We could copy result into a new object:
-
-    >>> f(y, z).set(42) # Result disappears
-    >>> y.x.get()       # No crash, but still bad
-    3.14
-
-This is not really our intent of our C++ interface. We've broken our
-promise that the Python interface should reflect the C++ interface as
-closely as possible.
-
-Our problems do not end there. Suppose Y is implemented as follows:
-
-    struct Y
-    {
-        X x; Z* z;
-        int z_value() { return z->value(); }
-    };
-
-Notice that the data member [^z] is held by class Y using a raw
-pointer. Now we have a potential dangling pointer problem inside Y:
-
-    >>> x = f(y, z) # y refers to z
-    >>> del z       # Kill the z object
-    >>> y.z_value() # CRASH!
-
-For reference, here's the implementation of [^f] again:
-
-    X& f(Y& y, Z* z)
-    {
-        y.z = z;
-        return y.x;
-    }
-
-Here's what's happening:
-
-# [^f] is called passing in a reference to [^y] and a pointer to [^z]
-# A pointer to [^z] is held by [^y]
-# A reference to [^y.x] is returned
-# [^z] is deleted. [^y.z] is a dangling pointer
-# [^y.z_value()] is called
-# [^z->value()] is called
-# [*BOOM!]
-
-[h2 Call Policies]
-
-Call Policies may be used in situations such as the example detailed above.
-In our example, [^return_internal_reference] and [^with_custodian_and_ward]
-are our friends:
-
-    def("f", f,
-        return_internal_reference<1,
-            with_custodian_and_ward<1, 2> >());
-
-What are the [^1] and [^2] parameters, you ask?
-
-    return_internal_reference<1
-
-Informs Boost.Python that the first argument, in our case [^Y& y], is the
-owner of the returned reference: [^X&]. The "[^1]" simply specifies the
-first argument. In short: "return an internal reference [^X&] owned by the
-1st argument [^Y& y]".
-
-    with_custodian_and_ward<1, 2>
-
-Informs Boost.Python that the lifetime of the argument indicated by ward
-(i.e. the 2nd argument: [^Z* z]) is dependent on the lifetime of the
-argument indicated by custodian (i.e. the 1st argument: [^Y& y]).
-
-It is also important to note that we have defined two policies above. Two
-or more policies can be composed by chaining. Here's the general syntax:
-
-    policy1<args...,
-        policy2<args...,
-            policy3<args...> > >
-
-Here is the list of predefined call policies. A complete reference detailing
-these can be found [@../../v2/reference.html#models_of_call_policies here].
-
-* [*with_custodian_and_ward][br] Ties lifetimes of the arguments
-* [*with_custodian_and_ward_postcall][br] Ties lifetimes of the arguments and results
-* [*return_internal_reference][br] Ties lifetime of one argument to that of result
-* [*return_value_policy<T> with T one of:][br]
-* [*reference_existing_object][br]naïve (dangerous) approach
-* [*copy_const_reference][br]Boost.Python v1 approach
-* [*copy_non_const_reference][br]
-* [*manage_new_object][br] Adopt a pointer and hold the instance
-
-[blurb :-) [*Remember the Zen, Luke:][br][br]
-"Explicit is better than implicit"[br]
-"In the face of ambiguity, refuse the temptation to guess"[br]]
-
-[page:1 Overloading]
-
-The following illustrates a scheme for manually wrapping an overloaded
-member functions. Of course, the same technique can be applied to wrapping
-overloaded non-member functions.
-
-We have here our C++ class:
-
-    struct X
-    {
-        bool f(int a)
-        {
-            return true;
-        }
-
-        bool f(int a, double b)
-        {
-            return true;
-        }
-
-        bool f(int a, double b, char c)
-        {
-            return true;
-        }
-
-        int f(int a, int b, int c)
-        {
-            return a + b + c;
-        };
-    };
-
-Class X has 4 overloaded functions. We shall start by introducing some
-member function pointer variables:
-
-    bool    (X::*fx1)(int)              = &X::f;
-    bool    (X::*fx2)(int, double)      = &X::f;
-    bool    (X::*fx3)(int, double, char)= &X::f;
-    int     (X::*fx4)(int, int, int)    = &X::f;
-
-With these in hand, we can proceed to define and wrap this for Python:
-
-    .def("f", fx1)
-    .def("f", fx2)
-    .def("f", fx3)
-    .def("f", fx4)
-
-[page:1 Default Arguments]
-
-Boost.Python wraps (member) function pointers. Unfortunately, C++ function
-pointers carry no default argument info. Take a function [^f] with default
-arguments:
-
-    int f(int, double = 3.14, char const* = "hello");
-
-But the type of a pointer to the function [^f] has no information
-about its default arguments:
-
-    int(*g)(int,double,char const*) = f;    // defaults lost!
-
-When we pass this function pointer to the [^def] function, there is no way
-to retrieve the default arguments:
-
-    def("f", f);                            // defaults lost!
-
-Because of this, when wrapping C++ code, we had to resort to manual
-wrapping as outlined in the [@overloading.html previous section], or
-writing thin wrappers:
-
-    // write "thin wrappers"
-    int f1(int x) { f(x); }
-    int f2(int x, double y) { f(x,y); }
-
-    /*...*/
-
-        // in module init
-        def("f", f);  // all arguments
-        def("f", f2); // two arguments
-        def("f", f1); // one argument
-
-When you want to wrap functions (or member functions) that either:
-
-* have default arguments, or
-* are overloaded with a common sequence of initial arguments
-
-[h2 BOOST_PYTHON_FUNCTION_OVERLOADS]
-
-Boost.Python now has a way to make it easier. For instance, given a function:
-
-    int foo(int a, char b = 1, unsigned c = 2, double d = 3)
-    {
-        /*...*/
-    }
-
-The macro invocation:
-
-    BOOST_PYTHON_FUNCTION_OVERLOADS(foo_overloads, foo, 1, 4)
-
-will automatically create the thin wrappers for us. This macro will create
-a class [^foo_overloads] that can be passed on to [^def(...)]. The third
-and fourth macro argument are the minimum arguments and maximum arguments,
-respectively. In our [^foo] function the minimum number of arguments is 1
-and the maximum number of arguments is 4. The [^def(...)] function will
-automatically add all the foo variants for us:
-
-    def("foo", foo, foo_overloads());
-
-[h2 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS]
-
-Objects here, objects there, objects here there everywhere. More frequently
-than anything else, we need to expose member functions of our classes to
-Python. Then again, we have the same inconveniences as before when default
-arguments or overloads with a common sequence of initial arguments come
-into play. Another macro is provided to make this a breeze.
-
-Like [^BOOST_PYTHON_FUNCTION_OVERLOADS],
-[^BOOST_PYTHON_FUNCTION_OVERLOADS] may be used to automatically create
-the thin wrappers for wrapping member functions. Let's have an example:
-
-    struct george
-    {
-        void
-        wack_em(int a, int b = 0, char c = 'x')
-        {
-            /*...*/
-        }
-    };
-
-The macro invocation:
-
-    BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(george_overloads, wack_em, 1, 3)
-
-will generate a set of thin wrappers for george's [^wack_em] member function
-accepting a minimum of 1 and a maximum of 3 arguments (i.e. the third and
-fourth macro argument). The thin wrappers are all enclosed in a class named
-[^george_overloads] that can then be used as an argument to [^def(...)]:
-
-    .def("wack_em", &george::wack_em, george_overloads());
-
-See the [@../../v2/overloads.html#BOOST_PYTHON_FUNCTION_OVERLOADS-spec overloads reference]
-for details.
-
-[h2 init and optional]
-
-A similar facility is provided for class constructors, again, with
-default arguments or a sequence of overloads. Remember [^init<...>]? For example,
-given a class X with a constructor:
-
-    struct X
-    {
-        X(int a, char b = 'D', std::string c = "constructor", double d = 0.0);
-        /*...*/
-    }
-
-You can easily add this constructor to Boost.Python in one shot:
-
-    .def(init<int, optional<char, std::string, double> >())
-
-Notice the use of [^init<...>] and [^optional<...>] to signify the default
-(optional arguments).
-
-[page:1 Auto-Overloading]
-
-It was mentioned in passing in the previous section that
-[^BOOST_PYTHON_FUNCTION_OVERLOADS] and [^BOOST_PYTHON_FUNCTION_OVERLOADS]
-can also be used for overloaded functions and member functions with a
-common sequence of initial arguments. Here is an example:
-
-     void foo()
-     {
-        /*...*/
-     }
-
-     void foo(bool a)
-     {
-        /*...*/
-     }
-
-     void foo(bool a, int b)
-     {
-        /*...*/
-     }
-
-     void foo(bool a, int b, char c)
-     {
-        /*...*/
-     }
-
-Like in the previous section, we can generate thin wrappers for these
-overloaded functions in one-shot:
-
-    BOOST_PYTHON_FUNCTION_OVERLOADS(foo_overloads, foo, 0, 3)
-
-Then...
-
-    .def("foo", foo, foo_overloads());
-
-Notice though that we have a situation now where we have a minimum of zero
-(0) arguments and a maximum of 3 arguments.
-
-[h2 Manual Wrapping]
-
-It is important to emphasize however that [*the overloaded functions must
-have a common sequence of initial arguments]. Otherwise, our scheme above
-will not work. If this is not the case, we have to wrap our functions
-[@overloading.html manually].
-
-Actually, we can mix and match manual wrapping of overloaded functions and
-automatic wrapping through [^BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS] and
-its sister, [^BOOST_PYTHON_FUNCTION_OVERLOADS]. Following up on our example
-presented in the section [@overloading.html on overloading], since the
-first 4 overload functins have a common sequence of initial arguments, we
-can use [^BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS] to automatically wrap the
-first three of the [^def]s and manually wrap just the last. Here's
-how we'll do this:
-
-    BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(xf_overloads, f, 1, 4)
-
-Create a member function pointers as above for both X::f overloads:
-
-    bool    (X::*fx1)(int, double, char)    = &X::f;
-    int     (X::*fx2)(int, int, int)        = &X::f;
-
-Then...
-
-    .def("f", fx1, xf_overloads());
-    .def("f", fx2)
-
-[page Object Interface]
-
-Python is dynamically typed, unlike C++ which is statically typed. Python
-variables may hold an integer, a float, list, dict, tuple, str, long etc.,
-among other things. In the viewpoint of Boost.Python and C++, these
-Pythonic variables are just instances of class [^object]. We shall see in
-this chapter how to deal with Python objects.
-
-As mentioned, one of the goals of Boost.Python is to provide a
-bidirectional mapping between C++ and Python while maintaining the Python
-feel. Boost.Python C++ [^object]s are as close as possible to Python. This
-should minimize the learning curve significantly.
-
-[$theme/python.png]
-
-[page:1 Basic Interface]
-
-Class [^object] wraps [^PyObject*]. All the intricacies of dealing with
-[^PyObject]s such as managing reference counting are handled by the
-[^object] class. C++ object interoperability is seamless. Boost.Python C++
-[^object]s can in fact be explicitly constructed from any C++ object.
-
-To illustrate, this Python code snippet:
-
-    def f(x, y):
-         if (y == 'foo'):
-             x[3:7] = 'bar'
-         else:
-             x.items += y(3, x)
-         return x
-
-    def getfunc():
-       return f;
-
-Can be rewritten in C++ using Boost.Python facilities this way:
-
-    object f(object x, object y) {
-         if (y == "foo")
-             x.slice(3,7) = "bar";
-         else
-             x.attr("items") += y(3, x);
-         return x;
-    }
-    object getfunc() {
-        return object(f);
-    }
-
-Apart from cosmetic differences due to the fact that we are writing the
-code in C++, the look and feel should be immediately apparent to the Python
-coder.
-
-[page:1 Derived Object types]
-
-Boost.Python comes with a set of derived [^object] types corresponding to
-that of Python's:
-
-* list
-* dict
-* tuple
-* str
-* long_
-* enum
-
-These derived [^object] types act like real Python types. For instance:
-
-    str(1) ==> "1"
-
-Wherever appropriate, a particular derived [^object] has corresponding
-Python type's methods. For instance, [^dict] has a [^keys()] method:
-
-    d.keys()
-
-[^make_tuple] is provided for declaring ['tuple literals]. Example:
-
-    make_tuple(123, 'D', "Hello, World", 0.0);
-
-In C++, when Boost.Python [^object]s are used as arguments to functions,
-subtype matching is required. For example, when a function [^f], as
-declared below, is wrapped, it will only accept instances of Python's
-[^str] type and subtypes.
-
-    void f(str name)
-    {
-        object n2 = name.attr("upper")();   // NAME = name.upper()
-        str NAME = name.upper();            // better
-        object msg = "%s is bigger than %s" % make_tuple(NAME,name);
-    }
-
-In finer detail:
-
-    str NAME = name.upper();
-
-Illustrates that we provide versions of the str type's methods as C++
-member functions.
-
-    object msg = "%s is bigger than %s" % make_tuple(NAME,name);
-
-Demonstrates that you can write the C++ equivalent of [^"format" % x,y,z]
-in Python, which is useful since there's no easy way to do that in std C++.
-
-__alert__ [*Beware] the common pitfall of forgetting that the constructors
-of most of Python's mutable types make copies, just as in Python.
-
-Python:
-
-    >>> d = dict(x.__dict__)     # copies x.__dict__
-    >>> d['whatever']            # modifies the copy
-
-C++:
-
-    dict d(x.attr("__dict__"));  # copies x.__dict__
-    d['whatever'] = 3;           # modifies the copy
-
-[h2 class_<T> as objects]
-
-Due to the dynamic nature of Boost.Python objects, any [^class_<T>] may
-also be one of these types! The following code snippet wraps the class
-(type) object.
-
-We can use this to create wrapped instances. Example:
-
-    object vec345 = (
-        class_<Vec2>("Vec2", init<double, double>())
-            .def_readonly("length", &Point::length)
-            .def_readonly("angle", &Point::angle)
-        )(3.0, 4.0);
-
-    assert(vec345.attr("length") == 5.0);
-
-[page:1 Extracting C++ objects]
-
-At some point, we will need to get C++ values out of object instances. This
-can be achieved with the [^extract<T>] function. Consider the following:
-
-    double x = o.attr("length"); // compile error
-
-In the code above, we got a compiler error because Boost.Python
-[^object] can't be implicitly converted to [^double]s. Instead, what
-we wanted to do above can be achieved by writing:
-
-    double l = extract<double>(o.attr("length"));
-    Vec2& v = extract<Vec2&>(o);
-    assert(l == v.length());
-
-The first line attempts to extract the "length" attribute of the
-Boost.Python [^object] [^o]. The second line attempts to ['extract] the
-[^Vec2] object from held by the Boost.Python [^object] [^o].
-
-Take note that we said "attempt to" above. What if the Boost.Python
-[^object] [^o] does not really hold a [^Vec2] type? This is certainly
-a possibility considering the dynamic nature of Python [^object]s. To
-be on the safe side, if the C++ type can't be extracted, an
-appropriate exception is thrown. To avoid an exception, we need to
-test for extractibility:
-
-    extract<Vec2&> x(o);
-    if (x.check()) {
-        Vec2& v = x(); ...
-
-__tip__ The astute reader might have noticed that the [^extract<T>]
-facility in fact solves the mutable copying problem:
-
-    dict d = extract<dict>(x.attr("__dict__"));
-    d['whatever'] = 3;          # modifies x.__dict__ !
-
-
-[page:1 Enums]
-
-Boost.Python has a nifty facility to capture and wrap C++ enums. While
-Python has no [^enum] type, we'll often want to expose our C++ enums to
-Python as an [^int]. Boost.Python's enum facility makes this easy while
-taking care of the proper conversions from Python's dynamic typing to C++'s
-strong static typing (in C++, ints cannot be implicitly converted to
-enums). To illustrate, given a C++ enum:
-
-    enum choice { red, blue };
-
-the construct:
-
-    enum_<choice>("choice")
-        .value("red", red)
-        .value("blue", blue)
-        ;
-
-can be used to expose to Python. The new enum type is created in the
-current [^scope()], which is usually the current module. The snippet above
-creates a Python class derived from Python's [^int] type which is
-associated with the C++ type passed as its first parameter.
-
-[blurb __detail__ [*what is a scope?][br][br] The scope is a class that has an
-associated global Python object which controls the Python namespace in
-which new extension classes and wrapped functions will be defined as
-attributes. Details can be found [@../../v2/scope.html here].]
-
-You can access those values in Python as
-
-    >>> my_module.choice.red
-    my_module.choice.red
-
-where my_module is the module where the enum is declared. You can also
-create a new scope around a class:
-
-    scope in_X = class_<X>("X")
-                    .def( ... )
-                    .def( ... )
-                ;
-
-    // Expose X::nested as X.nested
-    enum_<X::nested>("nested")
-        .value("red", red)
-        .value("blue", blue)
-        ;
-
-[def Py_Initialize          [@http://www.python.org/doc/current/api/initialization.html#l2h-652  Py_Initialize]]
-[def Py_Finalize            [@http://www.python.org/doc/current/api/initialization.html#l2h-656  Py_Finalize]]
-[def PyRun_String           [@http://www.python.org/doc/current/api/veryhigh.html#l2h-55         PyRun_String]]
-[def PyRun_File             [@http://www.python.org/doc/current/api/veryhigh.html#l2h-56         PyRun_File]]
-[def Py_eval_input          [@http://www.python.org/doc/current/api/veryhigh.html#l2h-58         Py_eval_input]]
-[def Py_file_input          [@http://www.python.org/doc/current/api/veryhigh.html#l2h-59         Py_file_input]]
-[def Py_single_input        [@http://www.python.org/doc/current/api/veryhigh.html#l2h-60         Py_single_input]]
-[def Py_XINCREF             [@http://www.python.org/doc/current/api/countingRefs.html#l2h-65     Py_XINCREF]]
-[def Py_XDECREF             [@http://www.python.org/doc/current/api/countingRefs.html#l2h-67     Py_XDECREF]]
-[def PyImport_AppendInittab [@http://www.python.org/doc/current/api/importing.html#l2h-137       PyImport_AppendInittab]]
-[def PyImport_AddModule     [@http://www.python.org/doc/current/api/importing.html#l2h-125       PyImport_AddModule]]
-[def PyModule_New           [@http://www.python.org/doc/current/api/moduleObjects.html#l2h-591   PyModule_New]]
-[def PyModule_GetDict       [@http://www.python.org/doc/current/api/moduleObjects.html#l2h-594   PyModule_GetDict]]
-
-[page:0 Embedding]
-
-By now you should know how to use Boost.Python to call your C++ code from
-Python. However, sometimes you may need to do the reverse: call Python code
-from the C++-side. This requires you to ['embed] the Python interpreter
-into your C++ program.
-
-Currently, Boost.Python does not directly support everything you'll need
-when embedding. Therefore you'll need to use the
-[@http://www.python.org/doc/current/api/api.html Python/C API] to fill in
-the gaps. However, Boost.Python already makes embedding a lot easier and,
-in a future version, it may become unnecessary to touch the Python/C API at
-all. So stay tuned... :-)
-
-[h2 Building embedded programs]
-
-To be able to use embedding in your programs, they have to be linked to
-both Boost.Python's and Python's static link library.
-
-Boost.Python's static link library comes in two variants. Both are located
-in Boost's [^/libs/python/build/bin-stage] subdirectory. On Windows, the
-variants are called [^boost_python.lib] (for release builds) and
-[^boost_python_debug.lib] (for debugging). If you can't find the libraries,
-you probably haven't built Boost.Python yet. See [@../../building.html
-Building and Testing] on how to do this.
-
-Python's static link library can be found in the [^/libs] subdirectory of
-your Python directory. On Windows it is called pythonXY.lib where X.Y is
-your major Python version number.
-
-Additionally, Python's [^/include] subdirectory has to be added to your
-include path.
-
-In a Jamfile, all the above boils down to:
-
-[pre
-    projectroot c:\projects\embedded_program ; # location of the program
-
-    # bring in the rules for python
-    SEARCH on python.jam = $(BOOST_BUILD_PATH) ;
-    include python.jam ;
-
-    exe embedded_program # name of the executable
-      : #sources
-         embedded_program.cpp
-      : # requirements
-         <find-library>boost_python <library-path>c:\boost\libs\python
-      $(PYTHON_PROPERTIES)
-        <library-path>$(PYTHON_LIB_PATH)
-        <find-library>$(PYTHON_EMBEDDED_LIBRARY) ;
-]
-
-[h2 Getting started]
-
-Being able to build is nice, but there is nothing to build yet. Embedding
-the Python interpreter into one of your C++ programs requires these 4
-steps:
-
-# '''#include''' [^<boost/python.hpp>][br][br]
-
-# Call Py_Initialize() to start the interpreter and create the [^__main__] module.[br][br]
-
-# Call other Python C API routines to use the interpreter.[br][br]
-
-# Call Py_Finalize() to stop the interpreter and release its resources.
-
-(Of course, there can be other C++ code between all of these steps.)
-
-[:['[*Now that we can embed the interpreter in our programs, lets see how to put it to use...]]]
-
-[page:1 Using the interpreter]
-
-As you probably already know, objects in Python are reference-counted.
-Naturally, the [^PyObject]s of the Python/C API are also reference-counted.
-There is a difference however. While the reference-counting is fully
-automatic in Python, the Python/C API requires you to do it
-[@http://www.python.org/doc/current/api/refcounts.html by hand]. This is
-messy and especially hard to get right in the presence of C++ exceptions.
-Fortunately Boost.Python provides the [@../../v2/handle.html handle] class
-template to automate the process.
-
-[h2 Reference-counting handles]
-
-There are two ways in which a function in the Python/C API can return a
-[^PyObject*]: as a ['borrowed reference] or as a ['new reference]. Which of
-these a function uses, is listed in that function's documentation. The two
-require slightely different approaches to reference-counting but both can
-be 'handled' by Boost.Python.
-
-For a function returning a ['borrowed reference] we'll have to tell the
-[^handle] that the [^PyObject*] is borrowed with the aptly named
-[@../../v2/handle.html#borrowed-spec borrowed] function. Two functions
-returning borrowed references are PyImport_AddModule and PyModule_GetDict.
-The former returns a reference to an already imported module, the latter
-retrieves a module's namespace dictionary. Let's use them to retrieve the
-namespace of the [^__main__] module:
-
-    handle<> main_module(borrowed( PyImport_AddModule("__main__") ));
-    handle<> main_namespace(borrowed( PyModule_GetDict(main_module.get()) ));
-
-Because the Python/C API doesn't know anything about [^handle]s, we used
-the [@../../v2/handle.html#handle-spec-observers get] member function to
-retrieve the [^PyObject*] from which the [^handle] was constructed.
-
-For a function returning a ['new reference] we can just create a [^handle]
-out of the raw [^PyObject*] without wrapping it in a call to borrowed. One
-such function that returns a new reference is PyRun_String which we'll
-discuss in the next section.
-
-[blurb __detail__ [*Handle is a class ['template], so why haven't we been using any template parameters?][br]
-[br]
-[^handle] has a single template parameter specifying the type of the managed object. This type is [^PyObject] 99% of the time, so the parameter was defaulted to [^PyObject] for convenience. Therefore we can use the shorthand [^handle<>] instead of the longer, but equivalent, [^handle<PyObject>].
-]
-
-[h2 Running Python code]
-
-To run Python code from C++ there is a family of functions in the API
-starting with the PyRun prefix. You can find the full list of these
-functions [@http://www.python.org/doc/current/api/veryhigh.html here]. They
-all work similarly so we will look at only one of them, namely:
-
-    PyObject* PyRun_String(char *str, int start, PyObject *globals, PyObject *locals)
-
-PyRun_String takes the code to execute as a null-terminated (C-style)
-string in its [^str] parameter. The function returns a new reference to a
-Python object. Which object is returned depends on the [^start] paramater.
-
-The [^start] parameter is the start symbol from the Python grammar to use
-for interpreting the code. The possible values are:
-
-[table Start symbols
-
-    [Py_eval_input]   [for interpreting isolated expressions]
-    [Py_file_input]   [for interpreting sequences of statements]
-    [Py_single_input] [for interpreting a single statement]
-]
-
-When using Py_eval_input, the input string must contain a single expression
-and its result is returned. When using Py_file_input, the string can
-contain an abitrary number of statements and None is returned.
-Py_single_input works in the same way as Py_file_input but only accepts a
-single statement.
-
-Lastly, the [^globals] and [^locals] parameters are Python dictionaries
-containing the globals and locals of the context in which to run the code.
-For most intents and purposes you can use the namespace dictionary of the
-[^__main__] module for both parameters.
-
-We have already seen how to get the [^__main__] module's namespace so let's
-run some Python code in it:
-
-    handle<> main_module(borrowed( PyImport_AddModule("__main__") ));
-    handle<> main_namespace(borrowed( PyModule_GetDict(main_module.get()) ));
-    handle<>( PyRun_String("hello = file('hello.txt', 'w')\n"
-                           "hello.write('Hello world!')\n"
-                           "hello.close()", Py_file_input,
-                           main_namespace.get(), main_namespace.get()) );
-
-This should create a file called 'hello.txt' in the current directory
-containing a phrase that is well-known in programming circles.
-
-__note__ [*Note] that we wrap the return value of PyRun_String in a
-(nameless) [^handle] even though we are not interested in it. If we didn't
-do this, the the returned object would be kept alive unnecessarily. Unless
-you want to be a Dr. Frankenstein, always wrap [^PyObject*]s in [^handle]s.
-
-[h2 Beyond handles]
-
-It's nice that [^handle] manages the reference counting details for us, but
-other than that it doesn't do much. Often we'd like to have a more useful
-class to manipulate Python objects. But we have already seen such a class
-in the [@object_interface.html previous section]: the aptly named [^object]
-class and it's derivatives. What we haven't seen, is that they can be
-constructed from a [^handle]. The following examples should illustrate this
-fact:
-
-    handle<> main_module(borrowed( PyImport_AddModule("__main__") ));
-    dict main_namespace(handle<>(borrowed( PyModule_GetDict(main_module.get()) )));
-    handle<>( PyRun_String("result = 5 ** 2", Py_file_input,
-                           main_namespace.ptr(), main_namespace.ptr()) );
-    int five_squared = extract<int>( main_namespace["result"] );
-
-Here we create a dictionary object for the [^__main__] module's namespace.
-Then we assign 5 squared to the result variable and read this variable from
-the dictionary. Another way to achieve the same result is to let
-PyRun_String return the result directly with Py_eval_input:
-
-    object result(handle<>( PyRun_String("5 ** 2", Py_eval_input,
-                                         main_namespace.ptr(), main_namespace.ptr()) ));
-    int five_squared = extract<int>(result);
-
-__note__ [*Note] that [^object]'s member function to return the wrapped
-[^PyObject*] is called [^ptr] instead of [^get]. This makes sense if you
-take into account the different functions that [^object] and [^handle]
-perform.
-
-[h2 Exception handling]
-
-If an exception occurs in the execution of some Python code, the PyRun_String function returns a null pointer. Constructing a [^handle] out of this null pointer throws [@../../v2/errors.html#error_already_set-spec error_already_set], so basically, the Python exception is automatically translated into a C++ exception when using [^handle]:
-
-    try
-    {
-        object result(handle<>( PyRun_String("5/0", Py_eval_input,
-                                             main_namespace.ptr(), main_namespace.ptr()) ));
-        // execution will never get here:
-        int five_divided_by_zero = extract<int>(result);
-    }
-    catch(error_already_set)
-    {
-        // handle the exception in some way
-    }
-
-The [^error_already_set] exception class doesn't carry any information in itself. To find out more about the Python exception that occurred, you need to use the [@http://www.python.org/doc/api/exceptionHandling.html exception handling functions] of the Python/C API in your catch-statement. This can be as simple as calling [@http://www.python.org/doc/api/exceptionHandling.html#l2h-70 PyErr_Print()] to print the exception's traceback to the console, or comparing the type of the exception with those of the [@http://www.python.org/doc/api/standardExceptions.html standard exceptions]:
-
-    catch(error_already_set)
-    {
-        if (PyErr_ExceptionMatches(PyExc_ZeroDivisionError))
-        {
-            // handle ZeroDivisionError specially
-        }
-        else
-        {
-            // print all other errors to stderr
-            PyErr_Print();
-        }
-    }
-
-(To retrieve even more information from the exception you can use some of the other exception handling functions listed [@http://www.python.org/doc/api/exceptionHandling.html here].)
-
-If you'd rather not have [^handle] throw a C++ exception when it is constructed, you can use the [@../../v2/handle.html#allow_null-spec allow_null] function in the same way you'd use borrowed:
-
-    handle<> result(allow_null( PyRun_String("5/0", Py_eval_input,
-                                             main_namespace.ptr(), main_namespace.ptr()) ));
-    if (!result)
-        // Python exception occurred
-    else
-        // everything went okay, it's safe to use the result
-
-[page Iterators]
-
-In C++, and STL in particular, we see iterators everywhere. Python also has
-iterators, but these are two very different beasts.
-
-[*C++ iterators:]
-
-* C++ has 5 type categories (random-access, bidirectional, forward, input, output)
-* There are 2 Operation categories: reposition, access
-* A pair of iterators is needed to represent a (first/last) range.
-
-[*Python Iterators:]
-
-* 1 category (forward)
-* 1 operation category (next())
-* Raises StopIteration exception at end
-
-The typical Python iteration protocol: [^[*for y in x...]] is as follows:
-
-    iter = x.__iter__()         # get iterator
-    try:
-        while 1:
-        y = iter.next()         # get each item
-        ...                     # process y
-    except StopIteration: pass  # iterator exhausted
-
-Boost.Python provides some mechanisms to make C++ iterators play along
-nicely as Python iterators. What we need to do is to produce
-appropriate __iter__ function from C++ iterators that is compatible
-with the Python iteration protocol. For example:
-
-    object get_iterator = iterator<vector<int> >();
-    object iter = get_iterator(v);
-    object first = iter.next();
-
-Or for use in class_<>:
-
-    .def("__iter__", iterator<vector<int> >())
-
-[*range]
-
-We can create a Python savvy iterator using the range function:
-
-* range(start, finish)
-* range<Policies,Target>(start, finish)
-
-Here, start/finish may be one of:
-
-* member data pointers
-* member function pointers
-* adaptable function object (use Target parameter)
-
-[*iterator]
-
-* iterator<T, Policies>()
-
-Given a container [^T], iterator is a shortcut that simply calls [^range]
-with &T::begin, &T::end.
-
-Let's put this into action... Here's an example from some hypothetical
-bogon Particle accelerator code:
-
-    f = Field()
-    for x in f.pions:
-        smash(x)
-    for y in f.bogons:
-        count(y)
-
-Now, our C++ Wrapper:
-
-    class_<F>("Field")
-        .property("pions", range(&F::p_begin, &F::p_end))
-        .property("bogons", range(&F::b_begin, &F::b_end));
-
-[page Exception Translation]
-
-All C++ exceptions must be caught at the boundary with Python code. This
-boundary is the point where C++ meets Python. Boost.Python provides a
-default exception handler that translates selected standard exceptions,
-then gives up:
-
-    raise RuntimeError, 'unidentifiable C++ Exception'
-
-Users may provide custom translation. Here's an example:
-
-    struct PodBayDoorException;
-    void translator(PodBayDoorException const& x) {
-        PyErr_SetString(PyExc_UserWarning, "I'm sorry Dave...");
-    }
-    BOOST_PYTHON_MODULE(kubrick) {
-         register_exception_translator<
-              PodBayDoorException>(translator);
-         ...
-
-[page General Techniques]
-
-Here are presented some useful techniques that you can use while wrapping code with Boost.Python.
-
-[page:1 Creating Packages]
-
-A Python package is a collection of modules that provide to the user a certain
-functionality. If you're not familiar on how to create packages, a good
-introduction to them is provided in the
-[@http://www.python.org/doc/current/tut/node8.html Python Tutorial].
-
-But we are wrapping C++ code, using Boost.Python. How can we provide a nice
-package interface to our users? To better explain some concepts, let's work
-with an example.
-
-We have a C++ library that works with sounds: reading and writing various
-formats, applying filters to the sound data, etc. It is named (conveniently)
-[^sounds].  Our library already has a neat C++ namespace hierarchy, like so: 
-
-    sounds::core
-    sounds::io
-    sounds::filters
-
-We would like to present this same hierarchy to the Python user, allowing him
-to write code like this:
-
-    import sounds.filters
-    sounds.filters.echo(...) # echo is a C++ function
-
-The first step is to write the wrapping code. We have to export each module
-separately with Boost.Python, like this:
-
-    /* file core.cpp */
-    BOOST_PYTHON_MODULE(core)
-    {
-        /* export everything in the sounds::core namespace */
-        ...
-    } 
-        
-    /* file io.cpp */
-    BOOST_PYTHON_MODULE(io)
-    {
-        /* export everything in the sounds::io namespace */
-        ...
-    } 
-
-    /* file filters.cpp */
-    BOOST_PYTHON_MODULE(filters)
-    {
-        /* export everything in the sounds::filters namespace */
-        ...
-    } 
-
-Compiling these files will generate the following Python extensions:
-[^core.pyd], [^io.pyd] and [^filters.pyd].
-
-[blurb __note__ The extension [^.pyd] is used for python extension modules, which
-are just shared libraries.  Using the default for your system, like [^.so] for
-Unix and [^.dll] for Windows, works just as well.]
-
-Now, we create this directory structure for our Python package:
-
-[pre
-    sounds/
-        __init__.py
-        core.pyd
-        filters.pyd
-        io.pyd
-]
-
-The file [^__init__.py] is what tells Python that the directory [^sounds/] is
-actually a Python package. It can be a empty file, but can also perform some
-magic, that will be shown later. 
-
-Now our package is ready. All the user has to do is put [^sounds] into his
-[@http://www.python.org/doc/current/tut/node8.html#SECTION008110000000000000000 PYTHONPATH] and fire up the interpreter:
-
-    >>> import sounds.io
-    >>> import sounds.filters
-    >>> sound = sounds.io.open('file.mp3')
-    >>> new_sound = sounds.filters.echo(sound, 1.0)
-
-Nice heh? 
-
-This is the simplest way to create hierarchies of packages, but it is not very
-flexible. What if we want to add a ['pure] Python function to the filters
-package, for instance, one that applies 3 filters in a sound object at once?
-Sure, you can do this in C++ and export it, but why not do so in Python? You
-don't have to recompile the extension modules, plus it will be easier to write
-it.
-
-If we want this flexibility, we will have to complicate our package hierarchy a
-little. First, we will have to change the name of the extension modules:
-
-    /* file core.cpp */
-    BOOST_PYTHON_MODULE(_core)
-    {
-        ...
-        /* export everything in the sounds::core namespace */
-    }  
-
-Note that we added an underscore to the module name. The filename will have to
-be changed to [^_core.pyd] as well, and we do the same to the other extension modules.
-Now, we change our package hierarchy like so:
-
-[pre
-    sounds/
-        __init__.py
-        core/
-            __init__.py
-            _core.pyd
-        filters/
-            __init__.py
-            _filters.pyd
-        io/
-            __init__.py
-            _io.pyd
-]
-
-Note that we created a directory for each extension module, and added a
-__init__.py to each one. But if we leave it that way, the user will have to
-access the functions in the core module with this syntax: 
-
-    >>> import sounds.core._core
-    >>> sounds.core._core.foo(...)
-
-which is not what we want. But here enters the [^__init__.py] magic: everything
-that is brought to the [^__init__.py] namespace can be accessed directly by the
-user.  So, all we have to do is bring the entire namespace from [^_core.pyd]
-to [^core/__init__.py]. So add this line of code to [^sounds/core/__init__.py]:
-
-    from _core import *
-
-We do the same for the other packages. Now the user accesses the functions and
-classes in the extension modules like before:
-
-    >>> import sounds.filters
-    >>> sounds.filters.echo(...)
-
-with the additional benefit that we can easily add pure Python functions to
-any module, in a way that the user can't tell the difference between a C++
-function and a Python function. Let's add a ['pure] Python function,
-[^echo_noise], to the [^filters] package. This function applies both the
-[^echo] and [^noise] filters in sequence in the given [^sound] object. We
-create a file named [^sounds/filters/echo_noise.py] and code our function:
-
-    import _filters
-    def echo_noise(sound):
-        s = _filters.echo(sound)
-        s = _filters.noise(sound)
-        return s
-
-Next, we add this line to [^sounds/filters/__init__.py]:
-
-    from echo_noise import echo_noise
-
-And that's it. The user now accesses this function like any other function
-from the [^filters] package:
-
-    >>> import sounds.filters
-    >>> sounds.filters.echo_noise(...)
-
-[page:1 Extending Wrapped Objects in Python]
-
-Thanks to Python's flexibility, you can easily add new methods to a class,
-even after it was already created:
-
-    >>> class C(object): pass
-    >>>
-    >>> # a regular function
-    >>> def C_str(self): return 'A C instance!'
-    >>>
-    >>> # now we turn it in a member function
-    >>> C.__str__ = C_str   
-    >>>
-    >>> c = C()
-    >>> print c
-    A C instance!
-    >>> C_str(c)
-    A C instance!
-
-Yes, Python rox. :-)
-
-We can do the same with classes that were wrapped with Boost.Python. Suppose
-we have a class [^point] in C++:
-
-    class point {...};
-
-    BOOST_PYTHON_MODULE(_geom)
-    {
-        class_<point>("point")...;
-    }
-
-If we are using the technique from the previous session, [@creating_packages.html 
-Creating Packages], we can code directly into [^geom/__init__.py]:
-
-    from _geom import *
-
-    # a regular function
-    def point_str(self):
-        return str((self.x, self.y))
-        
-    # now we turn it into a member function
-    point.__str__ = point_str
-
-[*All] point instances created from C++ will also have this member function!
-This technique has several advantages:
-
-* Cut down compile times to zero for these additional functions
-* Reduce the memory footprint to virtually zero
-* Minimize the need to recompile
-* Rapid prototyping (you can move the code to C++ if required without changing the interface)
-
-You can even add a little syntactic sugar with the use of metaclasses. Let's
-create a special metaclass that "injects" methods in other classes.
-
-    # The one Boost.Python uses for all wrapped classes. 
-    # You can use here any class exported by Boost instead of "point"
-    BoostPythonMetaclass = point.__class__ 
-
-    class injector(object):
-        class __metaclass__(BoostPythonMetaclass):
-            def __init__(self, name, bases, dict):
-                for b in bases:
-                    if type(b) not in (self, type):
-                        for k,v in dict.items():
-                            setattr(b,k,v)
-                return type.__init__(self, name, bases, dict)
-
-    # inject some methods in the point foo
-    class more_point(injector, point):
-        def __repr__(self):
-            return 'Point(x=%s, y=%s)' % (self.x, self.y)
-        def foo(self):
-            print 'foo!'
-
-Now let's see how it got:
-
-    >>> print point()
-    Point(x=10, y=10)
-    >>> point().foo()
-    foo!
-
-Another useful idea is to replace constructors with factory functions:
-
-    _point = point
-
-    def point(x=0, y=0):
-        return _point(x, y)
-
-In this simple case there is not much gained, but for constructurs with
-many overloads and/or arguments this is often a great simplification, again
-with virtually zero memory footprint and zero compile-time overhead for
-the keyword support.
-
-[page:1 Reducing Compiling Time]
-
-If you have ever exported a lot of classes, you know that it takes quite a good
-time to compile the Boost.Python wrappers. Plus the memory consumption can
-easily become too high. If this is causing you problems, you can split the
-class_ definitions in multiple files:
-
-    /* file point.cpp */
-    #include <point.h>
-    #include <boost/python.hpp>
-    
-    void export_point()
-    {
-        class_<point>("point")...;    
-    }
-
-    /* file triangle.cpp */
-    #include <triangle.h>
-    #include <boost/python.hpp>
-
-    void export_triangle()
-    {
-        class_<triangle>("triangle")...;
-    }
-
-Now you create a file [^main.cpp], which contains the [^BOOST_PYTHON_MODULE]
-macro, and call the various export functions inside it. 
-
-    void export_point();
-    void export_triangle();
-    
-    BOOST_PYTHON_MODULE(_geom)
-    {
-        export_point();
-        export_triangle();
-    }
-
-Compiling and linking together all this files produces the same result as the
-usual approach:
-
-    #include <boost/python.hpp>
-    #include <point.h>
-    #include <triangle.h>
-
-    BOOST_PYTHON_MODULE(_geom)
-    {
-        class_<point>("point")...;
-        class_<triangle>("triangle")...;
-    } 
-
-but the memory is kept under control. 
-
-This method is recommended too if you are developing the C++ library and
-exporting it to Python at the same time: changes in a class will only demand
-the compilation of a single cpp, instead of the entire wrapper code.
-
-[blurb __note__ If you're exporting your classes with [@../../../pyste/index.html Pyste], 
-take a look at the [^--multiple] option, that generates the wrappers in
-various files as demonstrated here.]
-
-[blurb __note__ This method is useful too if you are getting the error message
-['"fatal error C1204:Compiler limit:internal structure overflow"] when compiling
-a large source file, as explained in the [@../../v2/faq.html#c1204 FAQ].]
diff --git a/doc/tutorial/doc/theme/alert.gif b/doc/tutorial/doc/theme/alert.gif
deleted file mode 100644
index 270764cc..00000000
Binary files a/doc/tutorial/doc/theme/alert.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/arrow.gif b/doc/tutorial/doc/theme/arrow.gif
deleted file mode 100644
index e33db0fb..00000000
Binary files a/doc/tutorial/doc/theme/arrow.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/bkd.gif b/doc/tutorial/doc/theme/bkd.gif
deleted file mode 100644
index dcabcb80..00000000
Binary files a/doc/tutorial/doc/theme/bkd.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/bkd2.gif b/doc/tutorial/doc/theme/bkd2.gif
deleted file mode 100644
index b03d9ba9..00000000
Binary files a/doc/tutorial/doc/theme/bkd2.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/bulb.gif b/doc/tutorial/doc/theme/bulb.gif
deleted file mode 100644
index 74f3baac..00000000
Binary files a/doc/tutorial/doc/theme/bulb.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/bullet.gif b/doc/tutorial/doc/theme/bullet.gif
deleted file mode 100644
index da787e2e..00000000
Binary files a/doc/tutorial/doc/theme/bullet.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/c++boost.gif b/doc/tutorial/doc/theme/c++boost.gif
deleted file mode 100644
index 58be431a..00000000
Binary files a/doc/tutorial/doc/theme/c++boost.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/jam.png b/doc/tutorial/doc/theme/jam.png
deleted file mode 100644
index 224ed791..00000000
Binary files a/doc/tutorial/doc/theme/jam.png and /dev/null differ
diff --git a/doc/tutorial/doc/theme/l_arr.gif b/doc/tutorial/doc/theme/l_arr.gif
deleted file mode 100644
index 5b3cb1cb..00000000
Binary files a/doc/tutorial/doc/theme/l_arr.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/l_arr_disabled.gif b/doc/tutorial/doc/theme/l_arr_disabled.gif
deleted file mode 100644
index ed58a605..00000000
Binary files a/doc/tutorial/doc/theme/l_arr_disabled.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/lens.gif b/doc/tutorial/doc/theme/lens.gif
deleted file mode 100644
index c7901819..00000000
Binary files a/doc/tutorial/doc/theme/lens.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/note.gif b/doc/tutorial/doc/theme/note.gif
deleted file mode 100644
index bd92f075..00000000
Binary files a/doc/tutorial/doc/theme/note.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/python.png b/doc/tutorial/doc/theme/python.png
deleted file mode 100644
index cc2ff1d5..00000000
Binary files a/doc/tutorial/doc/theme/python.png and /dev/null differ
diff --git a/doc/tutorial/doc/theme/r_arr.gif b/doc/tutorial/doc/theme/r_arr.gif
deleted file mode 100644
index 2dcdad11..00000000
Binary files a/doc/tutorial/doc/theme/r_arr.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/r_arr_disabled.gif b/doc/tutorial/doc/theme/r_arr_disabled.gif
deleted file mode 100644
index 2100f78b..00000000
Binary files a/doc/tutorial/doc/theme/r_arr_disabled.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/smiley.gif b/doc/tutorial/doc/theme/smiley.gif
deleted file mode 100644
index 4c848f8f..00000000
Binary files a/doc/tutorial/doc/theme/smiley.gif and /dev/null differ
diff --git a/doc/tutorial/doc/theme/style.css b/doc/tutorial/doc/theme/style.css
deleted file mode 100644
index 53a6205e..00000000
--- a/doc/tutorial/doc/theme/style.css
+++ /dev/null
@@ -1,170 +0,0 @@
-body
-{
-    background-image: url(bkd.gif);
-    background-color: #FFFFFF;
-    margin: 1em 2em 1em 2em;
-}
-
-h1 { font-family: Verdana, Arial, Helvetica, sans-serif; font-weight: bold; text-align: left;  }
-h2 { font: 140% sans-serif; font-weight: bold; text-align: left;  }
-h3 { font: 120% sans-serif; font-weight: bold; text-align: left;  }
-h4 { font: bold 100% sans-serif; font-weight: bold; text-align: left;  }
-h5 { font: italic 100% sans-serif; font-weight: bold; text-align: left;  }
-h6 { font: small-caps 100% sans-serif; font-weight: bold; text-align: left;  }
-
-pre
-{
-    border-top: gray 1pt solid;
-    border-right: gray 1pt solid;
-    border-left: gray 1pt solid;
-    border-bottom: gray 1pt solid;
-
-    padding-top: 2pt;
-    padding-right: 2pt;
-    padding-left: 2pt;
-    padding-bottom: 2pt;
-
-    display: block;
-    font-family: "courier new", courier, mono;
-    background-color: #eeeeee; font-size: small
-}
-
-code
-{
-    font-family: "Courier New", Courier, mono;
-    font-size: small
-}
-
-tt
-{
-    display: inline;
-    font-family: "Courier New", Courier, mono;
-    color: #000099;
-    font-size: small
-}
-
-p
-{
-    text-align: justify;
-    font-family: Georgia, "Times New Roman", Times, serif
-}
-
-ul
-{
-    list-style-image: url(bullet.gif);
-    font-family: Georgia, "Times New Roman", Times, serif
-}
-
-ol
-{
-    font-family: Georgia, "Times New Roman", Times, serif
-}
-
-a
-{
-    font-weight: bold;
-    color: #003366;
-    text-decoration: none;
-}
-
-a:hover { color: #8080FF; }
-
-.literal        {  color: #666666; font-style: italic}
-.keyword        {  color: #000099}
-.identifier     {}
-.comment        {  font-style: italic; color: #990000}
-.special        {  color: #800040}
-.preprocessor   {  color: #FF0000}
-.string         {  font-style: italic; color: #666666}
-.copyright      {  color: #666666; font-size: small}
-.white_bkd      {  background-color: #FFFFFF}
-.dk_grey_bkd    {  background-color: #999999}
-.quotes         {  color: #666666; font-style: italic; font-weight: bold}
-
-.note_box
-{
-    display: block;
-
-    border-top: gray 1pt solid;
-    border-right: gray 1pt solid;
-    border-left: gray 1pt solid;
-    border-bottom: gray 1pt solid;
-
-    padding-right: 12pt;
-    padding-left: 12pt;
-    padding-bottom: 12pt;
-    padding-top: 12pt;
-
-    font-family: Arial, Helvetica, sans-serif;
-    background-color: #E2E9EF;
-    font-size: small; text-align: justify
-}
-
-.table_title
-{
-    background-color: #648CCA;
-
-    font-family: Verdana, Arial, Helvetica, sans-serif; color: #FFFFFF;
-    font-weight: bold
-; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 4px
-}
-
-.table_cells
-{
-    background-color: #E2E9EF;
-
-    font-family: Geneva, Arial, Helvetica, san-serif;
-    font-size: small
-; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 4px
-}
-
-.toc
-{
-    DISPLAY: block;
-    background-color: #E2E9EF
-    font-family: Arial, Helvetica, sans-serif;
-
-    border-top: gray 1pt solid;
-    border-left: gray 1pt solid;
-    border-bottom: gray 1pt solid;
-    border-right: gray 1pt solid;
-
-    padding-top: 24pt;
-    padding-right: 24pt;
-    padding-left: 24pt;
-    padding-bottom: 24pt;
-}
-
-.toc_title
-{
-    background-color: #648CCA;
-    padding-top: 4px;
-    padding-right: 4px;
-    padding-bottom: 4px;
-    padding-left: 4px;
-    font-family: Geneva, Arial, Helvetica, san-serif;
-    color: #FFFFFF;
-    font-weight: bold
-}
-
-.toc_cells
-{
-    background-color: #E2E9EF;
-    padding-top: 4px;
-    padding-right: 4px;
-    padding-bottom: 4px;
-    padding-left: 4px;
-    font-family: Geneva, Arial, Helvetica, san-serif;
-    font-size: small
-}
-
-div.logo
-{
-	float: right;
-}
-
-.toc_cells_L0 { background-color: #E2E9EF; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 4px; font-family: Geneva, Arial, Helvetica, san-serif; font-size: small }
-.toc_cells_L1 { background-color: #E2E9EF; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 44px; font-family: Geneva, Arial, Helvetica, san-serif; font-size: small }
-.toc_cells_L2 { background-color: #E2E9EF; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 88px; font-family: Geneva, Arial, Helvetica, san-serif; font-size: small }
-.toc_cells_L3 { background-color: #E2E9EF; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 122px; font-family: Geneva, Arial, Helvetica, san-serif; font-size: small }
-.toc_cells_L4 { background-color: #E2E9EF; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 166px; font-family: Geneva, Arial, Helvetica, san-serif; font-size: small }
diff --git a/doc/tutorial/doc/theme/u_arr.gif b/doc/tutorial/doc/theme/u_arr.gif
deleted file mode 100644
index ada3d6e0..00000000
Binary files a/doc/tutorial/doc/theme/u_arr.gif and /dev/null differ
diff --git a/doc/tutorial/doc/using_the_interpreter.html b/doc/tutorial/doc/using_the_interpreter.html
deleted file mode 100644
index e63658e6..00000000
--- a/doc/tutorial/doc/using_the_interpreter.html
+++ /dev/null
@@ -1,238 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Using the interpreter</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="embedding.html">
-<link rel="next" href="iterators.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Using the interpreter</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="embedding.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="iterators.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-As you probably already know, objects in Python are reference-counted.
-Naturally, the <tt>PyObject</tt>s of the Python/C API are also reference-counted.
-There is a difference however. While the reference-counting is fully
-automatic in Python, the Python/C API requires you to do it
-<a href="http://www.python.org/doc/current/api/refcounts.html">
-by hand</a>. This is
-messy and especially hard to get right in the presence of C++ exceptions.
-Fortunately Boost.Python provides the <a href="../../v2/handle.html">
-handle</a> class
-template to automate the process.</p>
-<a name="reference_counting_handles"></a><h2>Reference-counting handles</h2><p>
-There are two ways in which a function in the Python/C API can return a
-<tt>PyObject*</tt>: as a <i>borrowed reference</i> or as a <i>new reference</i>. Which of
-these a function uses, is listed in that function's documentation. The two
-require slightely different approaches to reference-counting but both can
-be 'handled' by Boost.Python.</p>
-<p>
-For a function returning a <i>borrowed reference</i> we'll have to tell the
-<tt>handle</tt> that the <tt>PyObject*</tt> is borrowed with the aptly named
-<a href="../../v2/handle.html#borrowed-spec">
-borrowed</a> function. Two functions
-returning borrowed references are <a href="http://www.python.org/doc/current/api/importing.html#l2h-125">
-PyImport_AddModule</a> and <a href="http://www.python.org/doc/current/api/moduleObjects.html#l2h-594">
-PyModule_GetDict</a>.
-The former returns a reference to an already imported module, the latter
-retrieves a module's namespace dictionary. Let's use them to retrieve the
-namespace of the <tt>__main__</tt> module:</p>
-<code><pre>
-    <span class=identifier>handle</span><span class=special>&lt;&gt; </span><span class=identifier>main_module</span><span class=special>(</span><span class=identifier>borrowed</span><span class=special>( </span><span class=identifier>PyImport_AddModule</span><span class=special>(</span><span class=string>&quot;__main__&quot;</span><span class=special>) ));
-    </span><span class=identifier>handle</span><span class=special>&lt;&gt; </span><span class=identifier>main_namespace</span><span class=special>(</span><span class=identifier>borrowed</span><span class=special>( </span><span class=identifier>PyModule_GetDict</span><span class=special>(</span><span class=identifier>main_module</span><span class=special>.</span><span class=identifier>get</span><span class=special>()) ));
-</span></pre></code>
-<p>
-Because the Python/C API doesn't know anything about <tt>handle</tt>s, we used
-the <a href="../../v2/handle.html#handle-spec-observers">
-get</a> member function to
-retrieve the <tt>PyObject*</tt> from which the <tt>handle</tt> was constructed.</p>
-<p>
-For a function returning a <i>new reference</i> we can just create a <tt>handle</tt>
-out of the raw <tt>PyObject*</tt> without wrapping it in a call to borrowed. One
-such function that returns a new reference is <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55">
-PyRun_String</a> which we'll
-discuss in the next section.</p>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-<img src="theme/lens.gif"></img> <b>Handle is a class <i>template</i>, so why haven't we been using any template parameters?</b><br>
-<br>
-<tt>handle</tt> has a single template parameter specifying the type of the managed object. This type is <tt>PyObject</tt> 99% of the time, so the parameter was defaulted to <tt>PyObject</tt> for convenience. Therefore we can use the shorthand <tt>handle&lt;&gt;</tt> instead of the longer, but equivalent, <tt>handle&lt;PyObject&gt;</tt>.
-    </td>
-  </tr>
-</table>
-<a name="running_python_code"></a><h2>Running Python code</h2><p>
-To run Python code from C++ there is a family of functions in the API
-starting with the PyRun prefix. You can find the full list of these
-functions <a href="http://www.python.org/doc/current/api/veryhigh.html">
-here</a>. They
-all work similarly so we will look at only one of them, namely:</p>
-<code><pre>
-    <span class=identifier>PyObject</span><span class=special>* </span><span class=identifier>PyRun_String</span><span class=special>(</span><span class=keyword>char </span><span class=special>*</span><span class=identifier>str</span><span class=special>, </span><span class=keyword>int </span><span class=identifier>start</span><span class=special>, </span><span class=identifier>PyObject </span><span class=special>*</span><span class=identifier>globals</span><span class=special>, </span><span class=identifier>PyObject </span><span class=special>*</span><span class=identifier>locals</span><span class=special>)
-</span></pre></code>
-<p>
-<a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55">
-PyRun_String</a> takes the code to execute as a null-terminated (C-style)
-string in its <tt>str</tt> parameter. The function returns a new reference to a
-Python object. Which object is returned depends on the <tt>start</tt> paramater.</p>
-<p>
-The <tt>start</tt> parameter is the start symbol from the Python grammar to use
-for interpreting the code. The possible values are:</p>
-<table width="90%" border="0" align="center">  <tr>
-  <td class="table_title" colspan="6">
-Start symbols  </td>
-  </tr>
-<tr><tr><td class="table_cells"><a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-58">
-Py_eval_input</a></td><td class="table_cells">for interpreting isolated expressions</td></tr><td class="table_cells"><a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-59">
-Py_file_input</a></td><td class="table_cells">for interpreting sequences of statements</td></tr><td class="table_cells"><a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-60">
-Py_single_input</a></td><td class="table_cells">for interpreting a single statement</td></tr></table>
-<p>
-When using <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-58">
-Py_eval_input</a>, the input string must contain a single expression
-and its result is returned. When using <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-59">
-Py_file_input</a>, the string can
-contain an abitrary number of statements and None is returned.
-<a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-60">
-Py_single_input</a> works in the same way as <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-59">
-Py_file_input</a> but only accepts a
-single statement.</p>
-<p>
-Lastly, the <tt>globals</tt> and <tt>locals</tt> parameters are Python dictionaries
-containing the globals and locals of the context in which to run the code.
-For most intents and purposes you can use the namespace dictionary of the
-<tt>__main__</tt> module for both parameters.</p>
-<p>
-We have already seen how to get the <tt>__main__</tt> module's namespace so let's
-run some Python code in it:</p>
-<code><pre>
-    <span class=identifier>handle</span><span class=special>&lt;&gt; </span><span class=identifier>main_module</span><span class=special>(</span><span class=identifier>borrowed</span><span class=special>( </span><span class=identifier>PyImport_AddModule</span><span class=special>(</span><span class=string>&quot;__main__&quot;</span><span class=special>) ));
-    </span><span class=identifier>handle</span><span class=special>&lt;&gt; </span><span class=identifier>main_namespace</span><span class=special>(</span><span class=identifier>borrowed</span><span class=special>( </span><span class=identifier>PyModule_GetDict</span><span class=special>(</span><span class=identifier>main_module</span><span class=special>.</span><span class=identifier>get</span><span class=special>()) ));
-    </span><span class=identifier>handle</span><span class=special>&lt;&gt;( </span><span class=identifier>PyRun_String</span><span class=special>(</span><span class=string>&quot;hello = file('hello.txt', 'w')\n&quot;
-                           </span><span class=string>&quot;hello.write('Hello world!')\n&quot;
-                           </span><span class=string>&quot;hello.close()&quot;</span><span class=special>, </span><span class=identifier>Py_file_input</span><span class=special>,
-                           </span><span class=identifier>main_namespace</span><span class=special>.</span><span class=identifier>get</span><span class=special>(), </span><span class=identifier>main_namespace</span><span class=special>.</span><span class=identifier>get</span><span class=special>()) );
-</span></pre></code>
-<p>
-This should create a file called 'hello.txt' in the current directory
-containing a phrase that is well-known in programming circles.</p>
-<p>
-<img src="theme/note.gif"></img> <b>Note</b> that we wrap the return value of <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55">
-PyRun_String</a> in a
-(nameless) <tt>handle</tt> even though we are not interested in it. If we didn't
-do this, the the returned object would be kept alive unnecessarily. Unless
-you want to be a Dr. Frankenstein, always wrap <tt>PyObject*</tt>s in <tt>handle</tt>s.</p>
-<a name="beyond_handles"></a><h2>Beyond handles</h2><p>
-It's nice that <tt>handle</tt> manages the reference counting details for us, but
-other than that it doesn't do much. Often we'd like to have a more useful
-class to manipulate Python objects. But we have already seen such a class
-in the <a href="object_interface.html">
-previous section</a>: the aptly named <tt>object</tt>
-class and it's derivatives. What we haven't seen, is that they can be
-constructed from a <tt>handle</tt>. The following examples should illustrate this
-fact:</p>
-<code> 
-<pre>
-    <span class=identifier>handle</span><span class=special>&lt;&gt; </span><span class=identifier>main_module</span><span class=special>(</span><span class=identifier>borrowed</span><span class=special>( </span><span class=identifier>PyImport_AddModule</span><span class=special>(</span><span class=string>&quot;__main__&quot;</span><span class=special>) ));
-    </span><span class=identifier>dict </span><span class=identifier>main_namespace</span><span class=special>(</span><span class=identifier>handle</span><span class=special>&lt;&gt;(</span><span class=identifier>borrowed</span><span class=special>( </span><span class=identifier>PyModule_GetDict</span><span class=special>(</span><span class=identifier>main_module</span><span class=special>.</span><span class=identifier>get</span><span class=special>()) )));
-    </span><span class=identifier>handle</span><span class=special>&lt;&gt;( </span><span class=identifier>PyRun_String</span><span class=special>(</span><span class=string>&quot;result = 5 ** 2&quot;</span><span class=special>, </span><span class=identifier>Py_file_input</span><span class=special>,
-                           </span><span class=identifier>main_namespace</span><span class=special>.</span><span class=identifier>ptr</span><span class=special>(), </span><span class=identifier>main_namespace</span><span class=special>.</span><span class=identifier>ptr</span><span class=special>()) );
-    </span><span class=keyword>int </span><span class=identifier>five_squared </span><span class=special>= </span><span class=identifier>extract</span><span class=special>&lt;</span><span class=keyword>int</span><span class=special>&gt;( </span><span class=identifier>main_namespace</span><span class=special>[</span><span class=string>&quot;result&quot;</span><span class=special>] );
-</span></pre>
-</code> 
-<p>
-Here we create a dictionary object for the <tt>__main__</tt> module's namespace.
-Then we assign 5 squared to the result variable and read this variable from
-the dictionary. Another way to achieve the same result is to let
-<a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55">
-PyRun_String</a> return the result directly with <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-58">
-Py_eval_input</a>:</p>
-<code><pre>
-    <span class=identifier>object </span><span class=identifier>result</span><span class=special>(</span><span class=identifier>handle</span><span class=special>&lt;&gt;( </span><span class=identifier>PyRun_String</span><span class=special>(</span><span class=string>&quot;5 ** 2&quot;</span><span class=special>, </span><span class=identifier>Py_eval_input</span><span class=special>,
-                                         </span><span class=identifier>main_namespace</span><span class=special>.</span><span class=identifier>ptr</span><span class=special>(), </span><span class=identifier>main_namespace</span><span class=special>.</span><span class=identifier>ptr</span><span class=special>()) ));
-    </span><span class=keyword>int </span><span class=identifier>five_squared </span><span class=special>= </span><span class=identifier>extract</span><span class=special>&lt;</span><span class=keyword>int</span><span class=special>&gt;(</span><span class=identifier>result</span><span class=special>);
-</span></pre></code>
-<p>
-<img src="theme/note.gif"></img> <b>Note</b> that <tt>object</tt>'s member function to return the wrapped
-<tt>PyObject*</tt> is called <tt>ptr</tt> instead of <tt>get</tt>. This makes sense if you
-take into account the different functions that <tt>object</tt> and <tt>handle</tt>
-perform.</p>
-<a name="exception_handling"></a><h2>Exception handling</h2><p>
-If an exception occurs in the execution of some Python code, the <a href="http://www.python.org/doc/current/api/veryhigh.html#l2h-55">
-PyRun_String</a> function returns a null pointer. Constructing a <tt>handle</tt> out of this null pointer throws <a href="../../v2/errors.html#error_already_set-spec">
-error_already_set</a>, so basically, the Python exception is automatically translated into a C++ exception when using <tt>handle</tt>:</p>
-<code><pre>
-    <span class=keyword>try
-    </span><span class=special>{
-        </span><span class=identifier>object </span><span class=identifier>result</span><span class=special>(</span><span class=identifier>handle</span><span class=special>&lt;&gt;( </span><span class=identifier>PyRun_String</span><span class=special>(</span><span class=string>&quot;5/0&quot;</span><span class=special>, </span><span class=identifier>Py_eval_input</span><span class=special>,
-                                             </span><span class=identifier>main_namespace</span><span class=special>.</span><span class=identifier>ptr</span><span class=special>(), </span><span class=identifier>main_namespace</span><span class=special>.</span><span class=identifier>ptr</span><span class=special>()) ));
-        // </span><span class=identifier>execution </span><span class=identifier>will </span><span class=identifier>never </span><span class=identifier>get </span><span class=identifier>here</span><span class=special>:
-        </span><span class=keyword>int </span><span class=identifier>five_divided_by_zero </span><span class=special>= </span><span class=identifier>extract</span><span class=special>&lt;</span><span class=keyword>int</span><span class=special>&gt;(</span><span class=identifier>result</span><span class=special>);
-    }
-    </span><span class=keyword>catch</span><span class=special>(</span><span class=identifier>error_already_set</span><span class=special>)
-    {
-        // </span><span class=identifier>handle </span><span class=identifier>the </span><span class=identifier>exception </span><span class=identifier>in </span><span class=identifier>some </span><span class=identifier>way
-    </span><span class=special>}
-</span></pre></code>
-<p>
-The <tt>error_already_set</tt> exception class doesn't carry any information in itself. To find out more about the Python exception that occurred, you need to use the <a href="http://www.python.org/doc/api/exceptionHandling.html">
-exception handling functions</a> of the Python/C API in your catch-statement. This can be as simple as calling <a href="http://www.python.org/doc/api/exceptionHandling.html#l2h-70">
-PyErr_Print()</a> to print the exception's traceback to the console, or comparing the type of the exception with those of the <a href="http://www.python.org/doc/api/standardExceptions.html">
-standard exceptions</a>:</p>
-<code><pre>
-    <span class=keyword>catch</span><span class=special>(</span><span class=identifier>error_already_set</span><span class=special>)
-    {
-        </span><span class=keyword>if </span><span class=special>(</span><span class=identifier>PyErr_ExceptionMatches</span><span class=special>(</span><span class=identifier>PyExc_ZeroDivisionError</span><span class=special>))
-        {
-            // </span><span class=identifier>handle </span><span class=identifier>ZeroDivisionError </span><span class=identifier>specially
-        </span><span class=special>}
-        </span><span class=keyword>else
-        </span><span class=special>{
-            // </span><span class=identifier>print </span><span class=identifier>all </span><span class=identifier>other </span><span class=identifier>errors </span><span class=identifier>to </span><span class=identifier>stderr
-            </span><span class=identifier>PyErr_Print</span><span class=special>();
-        }
-    }
-</span></pre></code>
-<p>
-(To retrieve even more information from the exception you can use some of the other exception handling functions listed <a href="http://www.python.org/doc/api/exceptionHandling.html">
-here</a>.)</p>
-<p>
-If you'd rather not have <tt>handle</tt> throw a C++ exception when it is constructed, you can use the <a href="../../v2/handle.html#allow_null-spec">
-allow_null</a> function in the same way you'd use borrowed:</p>
-<code><pre>
-    <span class=identifier>handle</span><span class=special>&lt;&gt; </span><span class=identifier>result</span><span class=special>(</span><span class=identifier>allow_null</span><span class=special>( </span><span class=identifier>PyRun_String</span><span class=special>(</span><span class=string>&quot;5/0&quot;</span><span class=special>, </span><span class=identifier>Py_eval_input</span><span class=special>,
-                                             </span><span class=identifier>main_namespace</span><span class=special>.</span><span class=identifier>ptr</span><span class=special>(), </span><span class=identifier>main_namespace</span><span class=special>.</span><span class=identifier>ptr</span><span class=special>()) ));
-    </span><span class=keyword>if </span><span class=special>(!</span><span class=identifier>result</span><span class=special>)
-        // </span><span class=identifier>Python </span><span class=identifier>exception </span><span class=identifier>occurred
-    </span><span class=keyword>else
-        </span><span class=comment>// everything went okay, it's safe to use the result
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="embedding.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="iterators.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 Dirk Gerrits<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/doc/virtual_functions_with_default_implementations.html b/doc/tutorial/doc/virtual_functions_with_default_implementations.html
deleted file mode 100644
index f7b15115..00000000
--- a/doc/tutorial/doc/virtual_functions_with_default_implementations.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Virtual Functions with Default Implementations</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="deriving_a_python_class.html">
-<link rel="next" href="class_operators_special_functions.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Virtual Functions with Default Implementations</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="deriving_a_python_class.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="class_operators_special_functions.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Recall that in the <a href="class_virtual_functions.html">
-previous section</a>, we
-wrapped a class with a pure virtual function that we then implemented in
-C++ or Python classes derived from it. Our base class:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>Base
-    </span><span class=special>{
-        </span><span class=keyword>virtual </span><span class=keyword>int </span><span class=identifier>f</span><span class=special>() = </span><span class=number>0</span><span class=special>;
-    };
-</span></pre></code>
-<p>
-had a pure virtual function <tt>f</tt>. If, however, its member function <tt>f</tt> was
-not declared as pure virtual:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>Base
-    </span><span class=special>{
-        </span><span class=keyword>virtual </span><span class=keyword>int </span><span class=identifier>f</span><span class=special>() { </span><span class=keyword>return </span><span class=number>0</span><span class=special>; }
-    };
-</span></pre></code>
-<p>
-and instead had a default implementation that returns <tt>0</tt>, as shown above,
-we need to add a forwarding function that calls the <tt>Base</tt> default virtual
-function <tt>f</tt> implementation:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>BaseWrap </span><span class=special>: </span><span class=identifier>Base
-    </span><span class=special>{
-        </span><span class=identifier>BaseWrap</span><span class=special>(</span><span class=identifier>PyObject</span><span class=special>* </span><span class=identifier>self_</span><span class=special>)
-            : </span><span class=identifier>self</span><span class=special>(</span><span class=identifier>self_</span><span class=special>) {}
-        </span><span class=keyword>int </span><span class=identifier>f</span><span class=special>() { </span><span class=keyword>return </span><span class=identifier>call_method</span><span class=special>&lt;</span><span class=keyword>int</span><span class=special>&gt;(</span><span class=identifier>self</span><span class=special>, </span><span class=string>&quot;f&quot;</span><span class=special>); }
-        </span><span class=keyword>int </span><span class=identifier>default_f</span><span class=special>() { </span><span class=keyword>return </span><span class=identifier>Base</span><span class=special>::</span><span class=identifier>f</span><span class=special>(); } // &lt;&lt;=== ***</span><span class=identifier>ADDED</span><span class=special>***
-        </span><span class=identifier>PyObject</span><span class=special>* </span><span class=identifier>self</span><span class=special>;
-    };
-</span></pre></code>
-<p>
-Then, Boost.Python needs to keep track of 1) the dispatch function <tt>f</tt> and
-2) the forwarding function to its default implementation <tt>default_f</tt>.
-There's a special <tt>def</tt> function for this purpose. Here's how it is
-applied to our example above:</p>
-<code><pre>
-    <span class=identifier>class_</span><span class=special>&lt;</span><span class=identifier>Base</span><span class=special>, </span><span class=identifier>BaseWrap</span><span class=special>&gt;(</span><span class=string>&quot;Base&quot;</span><span class=special>)
-        .</span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;f&quot;</span><span class=special>, &amp;</span><span class=identifier>Base</span><span class=special>::</span><span class=identifier>f</span><span class=special>, &amp;</span><span class=identifier>BaseWrap</span><span class=special>::</span><span class=identifier>default_f</span><span class=special>)
-</span></pre></code>
-<p>
-Note that we are allowing <tt>Base</tt> objects to be instantiated this time,
-unlike before where we specifically defined the <tt>class_&lt;Base&gt;</tt> with
-<tt>no_init</tt>.</p>
-<p>
-In Python, the results would be as expected:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>base </span><span class=special>= </span><span class=identifier>Base</span><span class=special>()
-    &gt;&gt;&gt; </span><span class=keyword>class </span><span class=identifier>Derived</span><span class=special>(</span><span class=identifier>Base</span><span class=special>):
-    ...     </span><span class=identifier>def </span><span class=identifier>f</span><span class=special>(</span><span class=identifier>self</span><span class=special>):
-    ...         </span><span class=keyword>return </span><span class=number>42
-    </span><span class=special>...
-    &gt;&gt;&gt; </span><span class=identifier>derived </span><span class=special>= </span><span class=identifier>Derived</span><span class=special>()
-</span></pre></code>
-<p>
-Calling <tt>base.f()</tt>:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>base</span><span class=special>.</span><span class=identifier>f</span><span class=special>()
-    </span><span class=number>0
-</span></pre></code>
-<p>
-Calling <tt>derived.f()</tt>:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>derived</span><span class=special>.</span><span class=identifier>f</span><span class=special>()
-    </span><span class=number>42
-</span></pre></code>
-<p>
-Calling <tt>call_f</tt>, passing in a <tt>base</tt> object:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>call_f</span><span class=special>(</span><span class=identifier>base</span><span class=special>)
-    </span><span class=number>0
-</span></pre></code>
-<p>
-Calling <tt>call_f</tt>, passing in a <tt>derived</tt> object:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>call_f</span><span class=special>(</span><span class=identifier>derived</span><span class=special>)
-    </span><span class=number>42
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="deriving_a_python_class.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="class_operators_special_functions.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/tutorial/index.html b/doc/tutorial/index.html
deleted file mode 100644
index eaeffa03..00000000
--- a/doc/tutorial/index.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Boost Python Tutorial</title>
-<link rel="stylesheet" href="doc/theme/style.css" type="text/css">
-<link rel="next" href="quickstart.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="doc/theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Boost Python Tutorial</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="toc_title">Table of contents</td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/quickstart.html">QuickStart</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/building_hello_world.html">Building Hello World</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/exposing_classes.html">Exposing Classes</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/constructors.html">Constructors</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/class_data_members.html">Class Data Members</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/class_properties.html">Class Properties</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/inheritance.html">Inheritance</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/class_virtual_functions.html">Class Virtual Functions</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/deriving_a_python_class.html">Deriving a Python Class</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/virtual_functions_with_default_implementations.html">Virtual Functions with Default Implementations</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/class_operators_special_functions.html">Class Operators/Special Functions</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/functions.html">Functions</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/call_policies.html">Call Policies</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/overloading.html">Overloading</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/default_arguments.html">Default Arguments</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/auto_overloading.html">Auto-Overloading</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/object_interface.html">Object Interface</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/basic_interface.html">Basic Interface</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/derived_object_types.html">Derived Object types</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/extracting_c___objects.html">Extracting C++ objects</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/enums.html">Enums</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/embedding.html">Embedding</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/using_the_interpreter.html">Using the interpreter</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/iterators.html">Iterators</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/exception_translation.html">Exception Translation</a>
-    </td>
-  </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2002-2003 David Abrahams<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/doc/v2/Apr2002.html b/doc/v2/Apr2002.html
deleted file mode 100644
index 1f2853c0..00000000
--- a/doc/v2/Apr2002.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../boost.css">
-<title>Boost.Python - April 2002 Progress Report</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">April 2002 Progress Report</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<h2>Contents</h2>
-<dl class="index">
-  <dt><a href="#accomplishments">Accomplishments</a></dt>
-  <dl class="index">
-    <dt><a href="#arity">Arbitrary Arity Support</a></dt>
-    <dt><a href="#callbacks">New Callback Interface</a></dt>
-    <dt><a href="#policies">Call Policies for Construtors</a></dt>
-    <dt><a href="#bugs">Real Users, Real Bugs</a></dt>
-    <dt><a href="#insights">New Insights</a></dt>
-    <dt><a href="#v1">Boost.Python V1 Maintenance</a></dt>
-  </dl>
-
-  <dt><a href="#missing">What's Missing</a></dt>
-
-</dl>
-
-<h2><a name="accomplishments">Accomplishments</a></h2>
-
-April was a short month as far as Boost.Python was concerned, since
-the spring ISO C++ Committee Meeting (and associated vacation)
-occupied me for the 2nd half of the month. However, a suprising amount
-of work got done...
-
-<h3><a name="arity">Arbitrary Arity Support</a></h3>
-
-I began using the <a
-href="../../../preprocessor/doc/index.htm">Boost.Preprocessor</a>
-metaprogramming library to generate support for functions and member
-functions of arbitrary arity, which was, to say the least, quite an
-adventure. The feedback cycle resulting from my foray into
-Boost.Preprocessor resulted in several improvements to the library,
-most notably in its documentation. 
-
-<p>
-
-Boost.Python now supports calls of up to 17 arguments on most
-compilers. Because most EDG-based compilers have dismal preprocessor
-performance, I had to &quot;manually&quot; expand the metaprograms for
-arities from zero to fifteen arguments, and EDG-based compilers with
-<code>__EDG_VERSION__&nbsp;&lt;=&nbsp;245</code> only support 15
-arguments by default. If some crazy program finds a need for more than
-the default arity support, users can increase the base support by
-setting the <code>BOOST_PYTHON_MAX_ARITY</code> preprocessor symbol.
-
-<h3><a name="callbacks">New Callback Interface</a></h3>
-
-I mentioned in <a href="Mar2002.html">last month's report</a> that I
-wasn't pleased with the interface for the interface for calling into
-Python, so now it has been redesigned. The new interface is outlined
-in <a
-href="http://mail.python.org/pipermail/c++-sig/2002-April/000953.html">this
-message</a> (though the GCC 2.95.3 bugs have been fixed).
-
-<h3><a name="policies">Call Policies for Constructors</a></h3>
-
-On April 2nd, I <a
-href="http://mail.python.org/pipermail/c++-sig/2002-April/000916.html">announced</a>
-support for the use of call policies with constructors.
-
-<h3><a name="bugs">Real Users, Real Bugs</a></h3>
-
-At least two people outside of Kull began actually using Boost.Python
-v2 in earnest this month. Peter Bienstman and Pearu Pearson both
-provided valuable real-world bug reports that helped me to improve the
-library's robustness.
-
-<h3><a name="insights">New Insights</a></h3>
-
-<a
-href="http://mail.python.org/pipermail/c++-sig/2002-May/001010.html"
->Answering some of Pearu's questions</a> about explicitly converting
-objects between Python and C++ actually led me to a new understanding
-of the role of the current conversion facilities. In Boost.Python v1,
-all conversions between Python and C++ were handled by a single family
-of functions, called <code>to_python()</code> and
-<code>from_python()</code>. Since the primary role of Boost.Python is
-to wrap C++ functions in Python, I used these names for the first kind
-of converters I needed: those that extract C++ objects to be used as
-function arguments and which C++ function return values to
-Python. The better-considered approach in Boost.Python v2 uses a
-completely different mechanism for conversions used when calling
-Python from C++, as in wrapped virtual function implementations. I
-usually think of this as a &quot;callback&quot;, as in &quot;calling
-back into Python&quot;, and I named the converters used in callbacks
-accordingly: <code>to_python_callback</code> and
-<code>from_python_callback</code>. However, as it turns out, the
-behavior of the &quot;callback&quot; converters is the appropriate one
-for users who want to explicitly extract a C++ value from a Python
-object, or create a Python object from a C++ value. The upshot is that
-it probably makes sense to change the name of the existing <code>to_python</code> and
-<code>from_python</code> so those names are available for the
-user-friendly explicit converters.
-
-<p>
-<a
-href="http://mail.python.org/pipermail/c++-sig/2002-May/001013.html">Another
-of Pearu's questions</a> pushes momentum further in the direction of a
-more-sophisticated overloading mechanism than the current
-simple-minded &quot;first match&quot; approach, as I suggested <a
-href="Mar2002.html#implicit_conversions">last month</a>.
-
-<h3><a name="v1">Boost.Python V1 Maintenance</a></h3>
-
-As much as I'm looking forward to retiring Boost.Python v1, a
-significant amount of effort has been being spent dealing with support
-problems; the saying that code rots when left alone is true, and
-Boost.Python is no exception. Eventually it became obvious to me that
-we were going to have to invest some effort in keeping V1 healthy
-while working on V2. Ralf and I have expanded support for various
-compilers and stabilized the V1 codebase considerably. We discarded
-the obsolete Visual Studio projects which were causing so much
-confusion. Still to do before the next Boost release:
-<ol>
-<li>Update the build/test documentation with detailed instructions for
-configuring various toolsets.
-<li>Provide some links to Boost.Python v2 to let people know what's
-coming.
-</ol>
-
-
-<h2><a name="missing">What's Missing</a></h2>
-
-Last month I announced that I would implement the following which are
-not yet complete:
-<ol>
-<li>Document all implemented features
-<li>Implement conversions for <code>char</code> types. This is
-implemented but not tested, so we have to assume it doesn't work.
-</ol>
-
-These are my first priority for this month (especially the
-documentation).
-
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
-  2002. All Rights Reserved.</i></p>
-</body>
-</html>
diff --git a/doc/v2/CallPolicies.html b/doc/v2/CallPolicies.html
deleted file mode 100644
index 09877c5d..00000000
--- a/doc/v2/CallPolicies.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href=../../../../boost.css>
-
-    <title>Boost.Python - CallPolicies Concept</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">CallPolicies Concept</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#composition">CallPolicies Composition</a></dt>
-
-      <dt><a href="#concept-requirements">Concept Requirements</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#CallPolicies-concept">CallPolicies Concept</a></dt>
-        </dl>
-      </dd>
-    </dl>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Models of the CallPolicies concept are used to specialize the behavior
-    of Python callable objects generated by Boost.Python to wrapped C++
-    objects like function and member function pointers, providing three
-    behaviors:</p>
-
-    <ol>
-      <li><code>precall</code> - Python argument tuple management before the
-      wrapped object is invoked</li>
-
-      <li><code>result_converter</code> - C++ return value handling</li>
-
-      <li><code>postcall</code> - Python argument tuple and result management
-      after the wrapped object is invoked</li>
-    </ol>
-
-    <h2><a name="composition"></a>CallPolicies Composition</h2>
-    In order to allow the use of multiple models of CallPolicies in the same
-    callable object, Boost.Python's CallPolicies class templates provide a
-    chaining interface which allows them to be recursively composed. This
-    interface takes the form of an optional template parameter,
-    <code>Base</code> which defaults to <a href=
-    "default_call_policies.html#default_call_policies-spec"><code>default_call_policies</code></a>.
-    By convention, the <code>precall</code> function of the <code>Base</code>
-    is invoked <i>after</i> the <code>precall</code> function supplied by the
-    outer template, and the <code>postcall</code> function of the
-    <code>Base</code> is invoked <i>before</i> the <code>postcall</code>
-    function of the outer template. If a <code>result_converter</code> is
-    supplied by the outer template, it <i>replaces</i> any
-    <code>result_converter</code> supplied by the <code>Base</code>. For an
-    example, see <a href=
-    "return_internal_reference.html#return_internal_reference-spec"><code>return_internal_reference</code></a>.
-    
-
-    <h2><a name="concept-requirements"></a>Concept Requirements</h2>
-
-    <h3><a name="CallPolicies-concept"></a>CallPolicies Concept</h3>
-
-    <p>In the table below, <code><b>x</b></code> denotes an object whose type
-    <code><b>P</b></code> is a model of CallPolicies, <code><b>a</b></code>
-    denotes a <code>PyObject*</code> pointing to a Python argument tuple
-    object, and <code><b>r</b></code> denotes a <code>PyObject*</code>
-    referring to a "preliminary" result object.</p>
-
-    <table summary="CallPolicies expressions" border="1" cellpadding="5">
-      <tr>
-        <td><b>Expression</b></td>
-
-        <td><b>Type</b></td>
-
-        <td><b>Result/Semantics</b></td>
-      </tr>
-
-      <tr>
-        <td valign="top"><code>x.precall(a)</code></td>
-
-        <td>convertible to <code>bool</code></td>
-
-        <td>returns <code>false</code> and <code><a href=
-        "http://www.python.org/doc/2.2/api/exceptionHandling.html#l2h-71">PyErr_Occurred</a>()&nbsp;!=&nbsp;0</code>
-        upon failure, <code>true</code> otherwise.</td>
-      </tr>
-
-      <tr>
-        <td valign="top"><code>P::result_converter</code></td>
-
-        <td>A model of <a href=
-        "ResultConverter.html#ResultConverterGenerator-concept">ResultConverterGenerator</a>.</td>
-
-        <td>An MPL unary <a href=
-        "../../../mpl/doc/paper/html/usage.html#metafunctions.classes">Metafunction
-        Class</a> used produce the "preliminary" result object.</td>
-      </tr>
-
-      <tr>
-        <td valign="top"><code>x.postcall(a, r)</code></td>
-
-        <td>convertible to <code>PyObject*</code></td>
-
-        <td>0 <code>0</code> and <code><a href=
-        "http://www.python.org/doc/2.2/api/exceptionHandling.html#l2h-71">PyErr_Occurred</a>()&nbsp;!=&nbsp;0</code>
-        upon failure. Must "conserve references" even in the event of an
-        exception. In other words, if <code>r</code> is not returned, its
-        reference count must be decremented; if another existing object is
-        returned, its reference count must be incremented.</td>
-      </tr>
-    </table>
-    Models of CallPolicies are required to be <a href=
-    "../../../utility/CopyConstructible.html">CopyConstructible</a>. 
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-
-    <p>Permission to copy, use, modify, sell and distribute this software is
-    granted provided this copyright notice appears in all copies. This
-    software is provided "as is" without express or implied warranty, and
-    with no claim as to its suitability for any purpose.</p>
-  </body>
-</html>
-
diff --git a/doc/v2/Dereferenceable.html b/doc/v2/Dereferenceable.html
deleted file mode 100644
index fdea0fc0..00000000
--- a/doc/v2/Dereferenceable.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href=../../../../boost.css>
-<title>Boost.Python - Dereferenceable Concept</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-      <h3><a href="../../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">Dereferenceable Concept</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<dl class="page-index"> 
-  <dt><a href="#introduction">Introduction</a></dt>
-  <dt><a href="#concept-requirements">Concept Requirements</a></dt>
-  <dl class="page-index"> 
-    <dt><a href="#Dereferenceable-concept">Dereferenceable Concept</a></dt>
-  </dl>
-</dl>
-
-<h2><a name="introduction"></a>Introduction</h2>
-
-<p>Instances of a dereferenceable type can be used like a pointer to access an lvalue.
-
-<h2><a name="concept-requirements"></a>Concept Requirements</h2>
-<h3><a name="Dereferenceable-concept"></a>Dereferenceable Concept</h3>
-
-<p>In the table below, <code><b>x</b></code> denotes an object whose
-type is a model of Dereferenceable.
-
-<table summary="Dereferenceable expressions" border="1" cellpadding="5">
-
-  <tr> 
-    <td><b>Expression</b></td>
-    <td><b>Requirements</b></td>
-  </tr>
-
-  <tr> 
-    <td valign="top"><code>*x</code></td>
-    <td>An lvalue
-  </tr>
-</table>
-
-If <code><b>x</b></code> is not a pointer type, it also must satsify the following expression:
-
-<table summary="Dereferenceable expressions" border="1" cellpadding="5">
-
-  <tr> 
-    <td><b>Expression</b></td>
-    <td><b>Operational Semantics</b></td>
-  </tr>
-
-  <tr> 
-    <td valign="top"><code>x.get()</code></td>
-    <td><code>&amp;*x</code>, or a null pointer
-  </tr>
-</table>
-
-<hr>
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  29 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
-<p>Permission to copy, use, modify, sell
- and distribute this software is granted provided this copyright notice appears
- in all copies. This software is provided "as is" without express or implied
- warranty, and with no claim as to its suitability for any purpose.
-</body>
-</html>
diff --git a/doc/v2/Extractor.html b/doc/v2/Extractor.html
deleted file mode 100755
index c28f5f58..00000000
--- a/doc/v2/Extractor.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href=../../../../boost.css>
-<title>Boost.Python - Extractor Concept</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-      <h3><a href="../../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">Extractor Concept</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<dl class="page-index"> 
-  <dt><a href="#introduction">Introduction</a></dt>
-  <dt><a href="#concept-requirements">Concept Requirements</a></dt>
-  <dl class="page-index"> 
-    <dt><a href="#Extractor-concept">Extractor Concept</a></dt>
-  </dl>
-  <dt><a href="#notes">Notes</a></dt>
-</dl>
-
-<h2><a name="introduction"></a>Introduction</h2>
-
-<p>An Extractor is a class which Boost.Python can use to extract C++
-objects from Python objects, and is typically used by facilities that
-define <code>from_python</code> conversions for
-&quot;traditional&quot; Python extension types. 
-
-<h2><a name="concept-requirements"></a>Concept Requirements</h2>
-<h3><a name="Extractor-concept"></a>Extractor Concept</h3>
-
-<p>In the table below, <code><b>X</b></code> denotes a model of
-Extractor and <code><b>a</b></code> denotes an instance of a Python
-object type.
-
-<table summary="Extractor expressions" border="1" cellpadding="5">
-
-  <tr> 
-    <td><b>Expression</b></td>
-    <td><b>Type</b></td>
-    <td><b>Semantics</b></td>
-  </tr>
-
-  <tr> 
-    <td valign="top"><code>X::execute(a)</code></td>
-    <td>non-void
-    <td>Returns the C++ object being extracted. The
-    <code>execute</code> function must not be overloaded.
-  </tr>
-
-  <tr> 
-    <td valign="top"><code>&amp;a.ob_type</code>
-    <td><code><a
-        href="http://www.python.org/doc/2.2/ext/dnt-type-methods.html">PyTypeObject</a>**</code>
-    <td>Points to the <code>ob_type</code> field of an object which is
-    layout-compatible with <code>PyObject</code>
-  </tr>
-
-  </tr>
-
-</table>
-
-<h2><a name="notes"></a>Notes</h2>
-
-Informally, an Extractor's <code>execute</code> member must be a
-non-overloaded static function whose single argument is a Python
-object type. Acceptable Python object types include those publicly (and
-unambiguously) derived from <code>PyObject</code>, and POD types which
-are layout-compatible with PyObject.
-
-<hr>
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
-<p>Permission to copy, use, modify, sell
- and distribute this software is granted provided this copyright notice appears
- in all copies. This software is provided "as is" without express or implied
- warranty, and with no claim as to its suitability for any purpose.
-</body>
-</html>
diff --git a/doc/v2/HolderGenerator.html b/doc/v2/HolderGenerator.html
deleted file mode 100755
index 34634798..00000000
--- a/doc/v2/HolderGenerator.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href=../../../../boost.css>
-<title>Boost.Python - Holder Concept</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-      <h3><a href="../../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">HolderGenerator Concept</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<dl class="page-index"> 
-  <dt><a href="#introduction">Introduction</a></dt>
-  <dt><a href="#concept-requirements">Concept Requirements</a></dt>
-  <dl class="page-index"> 
-    <dt><a href="#HolderGenerator-concept">HolderGenerator Concept</a></dt>
-  </dl>
-</dl>
-
-<h2><a name="introduction"></a>Introduction</h2>
-
-<p>A HolderGenerator is a unary metafunction class which returns types
-suitable for holding instances of its argument in a wrapped C++ class
-instance.
-
-<h2><a name="concept-requirements"></a>Concept Requirements</h2>
-<h3><a name="HolderGenerator-concept"></a>HolderGenerator Concept</h3>
-
-<p>In the table below, <code><b>G</b></code> denotes an type which
-models HolderGenerator, and <code><b>X</b></code> denotes a class
-type.
-
-<table summary="Holder expressions" border="1" cellpadding="5">
-
-  <tr> 
-    <td><b>Expression</b></td>
-    <td><b>Requirements</b></td>
-  </tr>
-
-  <tr> 
-    <td valign="top"><code>G::apply&lt;X&gt;::type</code></td>
-    <td>A concrete subclass of <a
-    href="instance_holder.html#instance_holder-spec">instance_holder</a>
-    which can hold objects of type <code>X</code>.
-  </tr>
-</table>
-
-<hr>
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
-<p>Permission to copy, use, modify, sell
- and distribute this software is granted provided this copyright notice appears
- in all copies. This software is provided "as is" without express or implied
- warranty, and with no claim as to its suitability for any purpose.
-</body>
-</html>
diff --git a/doc/v2/Jun2002.html b/doc/v2/Jun2002.html
deleted file mode 100644
index 9c396ed7..00000000
--- a/doc/v2/Jun2002.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../boost.css">
-<title>Boost.Python - June 2002 Progress Report</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">June 2002 Progress Report</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<h2>Contents</h2>
-<dl class="index">
-  <dt><a href="#intro">Introduction</a></dt>
-  <dt><a href="#handle"><code>handle&lt;T&gt;</code></a></dt>
-  <dt><a href="#object"><code>object</code></a></dt>
-  <dl class="index">
-    <dt><a href="#operators"><code>object</code> operators</a></dt>
-    <dt><a href="#conversions"><code>object</code> conversions</a></dt>
-  </dl>
-  <dt><a href="#list"><code>list</code></a></dt>
-  <dt><a href="#numerics"><code>Numerics</code></a></dt>
-  <dt><a href="#community">Community</a></dt>
-  <dt><a href="#next">What's Next</a></dt>
-</dl>
-
-<h2><a name="intro">Introduction</a></h2>
-
-July was mostly focused on allowing expressive manipulation of
-individual Python objects, or what Ralf Grosse-Kunstleve calls
-&quot;Writing Python in C++&quot;. The work began with this <a
-href="http://mail.python.org/pipermail/c++-sig/2002-June/001311.html">posting</a>,
-which outlines the issues and intention.
-
-<h2><a name="handle"><code>handle&lt;T&gt;</code></a></h2>
-
-The most basic element needed was a replacement for the
-<code>reference&lt;&gt;</code> class template and the
-<code>ref</code> typedef from Boost.Python v1, a simple smart
-pointer to a Python object. The old v1 typedef
-&quot;<code>ref</code>&quot; (for
-<code>reference&lt;PyObject&gt;</code>) had to be retired because I
-thought it would be too confusing given the importance of <code><a
-href="../../../bind/ref.html">boost::ref</a>()</code> to this
-library. I began a <a
-href="http://mail.python.org/pipermail/c++-sig/2002-June/001311.html">discussion</a>of
-possible names, and it was eventually <a
-href="http://mail.python.org/pipermail/c++-sig/2002-June/001337.html">decided</a>
-to rename <code>reference</code> to <code>handle</code> and supply a
-default argument so that <code>ref</code> could be spelled
-<code>handle&lt;&gt;</code> without an additional typedef. There
-were also some interface changes to make it safer and more-efficient
-to interface with the raw
-<code>PyObject*</code>s forced on us by Python's 'C' API. A
-discussion of those protocols can be found <a
-href="http://mail.python.org/pipermail/c++-sig/2002-June/001401.html">here</a>.
-
-<h2><a name="handle"><code>object</code></a></h2>
-
-It is intended that users will seldom need or want to work with
-<code>handle&lt;&gt;</code>; its major distinguishing features are
-that it gives direct access to the underlying object representation
-through <code>operator*</code> and <code>operator-&gt;</code>, and
-that can be <code>NULL</code>, both sources of danger. Instead the
-library provides a class called <code>object</code>, which
-encapsulates a valid Python object and provides a similar interface to
-Python's.
-
-<h3><a name="operators"><code>object</code> operators</a></h3>
-
-The first challenge was to provide support for object manipulations
-using a Python-like syntax, mostly in the form of operator overloads:
-
-<table border="1">
-<tr><th>Python <th>C++
-
-<tr>
-  <td><code>y = x.foo</code>  <td><code>y = x.attr(&quot;foo&quot;); 
-<tr>
-  <td><code>x.foo = 1</code>  <td><code>x.attr(&quot;foo&quot;) = 1; 
-
-<tr>
-  <td><code>y = x[z]</code>  <td><code>y = x[z];
-<tr>
-  <td><code>x[z] = 1</code>  <td><code>x[z] = 1; 
-
-<tr>
-  <td><code>y = x[3:-1]</code>  <td><code>y = x.slice(3,-1); 
-
-<tr>
-  <td><code>y = x[3:]</code>  <td><code>y = x.slice(3,_); 
-
-<tr>
-  <td><code>y = x[:-2]</code>  <td><code>y = x.slice(_,-2); 
-
-<tr>
-  <td><code>z = x(1, y)</code>  <td><code>z = x(1, y);
-<tr>
-  <td><code>z = x.f(1, y)</code>  <td><code>z = x.attr(&quot;f&quot;)(1, y);
-
-<tr>
-  <td><code>not x</code>  <td><code>!x
-
-<tr>
-  <td><code>x and y</code>  <td><code>x and y
-</table>
-
-I'm still a unsatisfied with the interface for attribute access. There
-original proposal  used a syntax like this one:
-<pre>
-y = x._(&quot;foo&quot;); 
-x._(&quot;foo&quot;) = 1; 
-</pre>
-
-which was only marginally better than what we've got. Niki Spahiev
-then <a
-href="http://mail.python.org/pipermail/c++-sig/2002-June/001447.html">pointed
-out</a> a potential conflict with the macro which GNU Gettext <a
-href="http://www.gnu.org/manual/gettext/html_mono/gettext.html#SEC6">suggests</a>
-people define. This unfortunate state of affairs forced us into using
-<code>attr</code> instead. I'd still like to find a better interface,
-but the lack of overloadable C++ operators which aren't already used
-in Python is an obstacle. The comma operator is still a possibility,
-but it has the wrong precedence:
-<pre>
-y = x,&quot;foo&quot;    // error
-x,&quot;foo&quot; = 1;   // error
-
-y = (x,&quot;foo&quot;); // ok
-(x,&quot;foo&quot;) = 1; // ok
-</pre>
-
-Well, I guess we could consider adding that to the interface without
-removing <code>attr()</code>, to see how it plays out...
-
-<h3><a name="operators"><code>object</code> conversions</a></h3>
-
-The <code>object</code> class also provided an opportunity to replace
-Boost.Python v1's <code>to_python()</code> as a user-level
-interface. Instead, <code>object</code> has a templated constructor
-which can be used to convert any C++ object to Python using the same
-underlying mechanisms used for the arguments to <code><a
-href="call.html">call</a>&lt;&gt;</code>.
-
-<p>Incidentally, the implementation of operator and conversion support
-for object uncovered an inordinate number of compiler bugs in our
-targeted platforms. It was a lot more &quot;interesting&quot; than it
-should have been.
-
-<h2><a name="list"><code>list</code></a></h2>
-
-With <code>object</code> implemented, it was time to begin replacing
-the ad-hoc implementations of <code>list</code>, <code>string</code>,
-and <code>dictionary</code> supplied by Boost.Python v1 with something
-more robust. I started with <code>list</code> as an example. Because
-<code>object</code> already provides all of the requisite operators,
-publicly deriving <code>list</code> from object seemed like a good
-choice. The remaining issues were what do do about the one-argument
-list constructor (which in Python attempts to convert its argument to
-a list), and how to deal converting with <code>list</code> arguments
-to wrapped functions. Some of the issues are laid out in <a
-href="http://mail.python.org/pipermail/c++-sig/2002-June/001551.html">this
-thread</a>. Ultimately, it was decided that <code>list(x)</code>
-should do the same thing in C++ as in Python (conversion), while
-<code>list</code> arguments should only match Python
-<code>list</code>s (and <code>list</code> subclasses). The
-implementation worked well, and provided a <a
-href="http://mail.python.org/pipermail/c++-sig/2002-June/001586.html">roadmap</a>
-for the protocol to be used for implementation of the other built-in
-types.
-
-<h2><a name="numerics">Numerics</a></h2>
-
-Support for C++ <code>long long</code> and <code>unsigned long
-long</code>
-(and <code>__int64</code> on MSVC) to/from python conversions was
-added this month. We also improved handling of numeric overflows when
-converting, e.g., a Python int to a type with a more limited range of
-representation.
-
-<h2><a name="community">Community</a></h2>
-
-<ul>
-<li>Ralf W. Grosse-Kunstleve and Nick Sauter have implemented
-<a href="http://cci.lbl.gov/boost/">multiplatform nightly
-build-and-test</a> runs for Boost.Python V2 at LBL.
-
-<li>Dave Hawkes has made significant progress on generating the
-Python <a
-href="http://mail.python.org/pipermail/c++-sig/2002-June/001503.html">built-in
-function and API wrappers</a>
-
-<li>Achim Domma has agreed to take up the job of implementing the
-<code>str</code>, <code>dict</code>, and <code>tuple</code> classes.
-</ul>
-
-Deep thanks to all the Boost.Python contributors! This project
-wouldn't be possible without your participation.
-
-  <h2><a name="next">What's Next</a></h2>
-
-As I write this we are already well into the month of July, so I
-suggest you consult the <a
-href="http://mail.python.org/pipermail/c++-sig/2002-July/">Mailing
-List Archive</a> if you want to know what's been happening. Otherwise
-you'll just have to wait till next month (hopefully the beginning).
-
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
-  2002. All Rights Reserved.</i></p>
-</body>
-</html>
diff --git a/doc/v2/Mar2002.html b/doc/v2/Mar2002.html
deleted file mode 100644
index a8a165d8..00000000
--- a/doc/v2/Mar2002.html
+++ /dev/null
@@ -1,234 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../boost.css">
-<title>Boost.Python - March 2002 Progress Report</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">March 2002 Progress Report</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<h2>Contents</h2>
-<dl class="index">
-  <dt><a href="#accomplishments">Accomplishments</a></dt>
-  <dl class="index">
-    <dt><a href="#calling_python">Calling Python from C++</a></dt>
-    <dt><a href="#virtual_functions">Virtual Functions</a></dt>
-    <dt><a href="#abstract_classes">Abstract Classes</a></dt>
-    <dt><a href="#implicit_conversions">C++ Implicit Conversions</a></dt>
-    <dt><a href="#data_members">C++ Data Members</a></dt>
-    <dt><a href="#miscellaneous">Miscellaneous</a></dt>
-  </dl>
-
-  <dt><a href="#future">The Near future</a></dt>
-
-  <dt><a href="#notes">Notes</a></dt>
-
-</dl>
-
-<h2><a name="accomplishments">Accomplishments</a></h2>
-
-March was mostly devoted to the reimplementation of features from
-Boost.Python v1, and some new features. Re-examination of the features
-from Boost.Python v1 allowed me to make significant improvements.
-
-<h3><a name="calling_python">Calling Python from C++</a></h3>
-
-The ability to call Python from C++ is crucial for virtual function
-support. Implementing this feature well for V2 proved to be more
-interesting than I expected. You can review most of the relevant
-design decisions
-<a href="callbacks.txt">here</a>.
-
-<p>
-One point which <i>isn't</i> emphasized in that document is that there
-are subtle differences in the way <code>from_python</code> conversions
-work when used for C++ function arguments and Python function return
-values. In particular, while <code>T const&amp;</code> arguments may
-invoke rvalue converters, a reference-to-const return value requires
-an lvalue converter, since a temporary conversion result would leave
-the returned reference dangling.
-
-<p>I'm not particularly pleased with the current callback interface,
-since it usually results in constructs like:
-<pre>
-<u>return returning</u>&lt;X&amp;&gt;::call(f, obj);
-</pre>
-However, I think the following may be possible and I plan to investigate:
-<pre>
-return apply&lt;X&amp;&gt;(f, obj);
-</pre>
-I'm open to suggestion for better names (and syntaxes)!
-
-<h3><a name="virtual_functions">Virtual Functions</a></h3>
-
-Once Python callbacks were implemented, it was just a short step to
-implementing virtual functions. Python extension class exposing a C++
-class whose virtual functions are overridable in Python must actually
-hold a C++ instance of a class <i>derived</i> from the one exposed to
-Python. Needing some way for users to specify that class, I added an
-optional template argument to <code>value_holder_generator</code> and
-<code>pointer_holder_generator&lt;&gt;</code> to specify the class
-actually held. This move began to put pressure on the
-<code>class_&lt;&gt;</code> interface, since the need for the user to
-produce complicated instantations of
-<code>class_&lt;&gt;</code> was increased:
-
-<pre>
-class&lt;Foo, bases&lt;&gt;, value_holder_generator&lt;Foo_callback&gt; &gt;(&quot;Foo&quot;)
-.def(&quot;hello&quot;, &amp;Foo::hello)
-...
-</pre>
-
-<h3><a name="abstract_classes">Abstract Classes</a></h3>
-
-Normally when a C++ class is exposed to Python, the library registers
-a conversion function which allows users to wrap functions returning
-values of that type. Naturally, these return values are temporaries,
-so the conversion function must make a copy in some
-dynamically-allocated storage (a &quot;holder&quot;) which is managed
-by the corresponding Python object.
-
-<p>Unfortunately, in the case of abstract classes (and other types
-without a publicly-accessible copy constructor), instantiating this
-conversion function causes a compilation error.  In order to support
-non-copyable classes, there had to be some way to prevent the library
-from trying to instantiate the conversion function. The only practical
-approach I could think of was to add an additional template parameter
-to the <code>class_&lt;&gt;</code> interface. When the number of
-template parameters with useful defaults begins to grow, it is often
-hard to choose an order which allows users to take advantage of the
-defaults.
-
-<p>
-
-This was the straw that broke the
-<code>class_&lt;&gt;</code> interface's back and caused the redesign
-whose outcome is detailed <a
-href="http://mail.python.org/pipermail/c++-sig/2002-March/000892.html">here</a>.
-The approach allows the user to supply the optional parameters in an
-arbitrary order. It was inspired by the use of <a
-href="../../../utility/iterator_adaptors.htm#named_tempalte_parameters">named
-template parameters</a> in the <a
-href="../../../utility/iterator_adaptors.htm">Boost Iterator Adaptor
-Library</a>, though in this case it is possible to deduce the meaning
-of the template parameters entirely from their type properties,
-resulting in a simpler interface. Although the move from a
-policy-based design to what resembles a configuration DSL usually
-implies a loss of flexibility, in this case I think any costs are far
-outweighed by the advantages.
-
-<p>Note: working around the limitations of the various compilers I'm
-supporting was non-trivial, and resulted in a few messy implementation
-details. It might be a good idea to switch to a more-straightforward
-approach once Metrowerks CodeWarrior Pro8 is released.
-
-<h3><a name="implicit_conversions">C++ Implicit Conversions</a></h3>
-
-Support for C++ implicit conversion involves creating
-<code>from_python</code> converters for a type <code>U</code> which in
-turn use <code>from_python</code> converters registered for a type
-<code>T</code> where there exists a implicit conversion from
-<code>T</code> to <code>U</code>. The current implementation is
-subject to two inefficiencies:
-<ol>
-
-<li>Because an rvalue <code>from_python</code> converter produces two
-pieces of data (a function and a <code>void*</code>) from its
-<code>convertible()</code> function, we end up calling the function
-for <code>T</code> twice: once when the converter is looked up in the
-registry, and again when the conversion is actually performed. 
-
-<li>A vector is used to mark the "visited" converters, preventing
-infinite recursion as <code>T</code> to
-<code>U</code> and <code>U</code> to <code>T</code> converters
-continually search through one-another.
-
-</ol>
-
-I consider the former to be a minor issue. The second may or may not
-prove to be computationally significant, but I believe that
-architecturally, it points toward a need for more sophisticated
-overload resolution. It may be that we want CLOS-style multimethod
-dispatching along with C++ style rules that prevent more than one
-implicit conversion per argument.
-
-<h3><a name="data_members">C++ Data Members</a></h3>
-
-To supply the ability to directly access data members, I was able to
-hijack the new Python <a
-href="http://www.python.org/2.2/descrintro.html#property">property</a>
-type. I had hoped that I would also be able to re-use the work of <a
-href="make_function.html">make_function</a> to create callable python
-objects from C++ functions which access a data member of a given
-class. C++ facilities for specifying data member pointer non-type
-template arguments require the user to explicitly specify the type of
-the data member and this under-utilized feature is also not
-well-implemented on all compilers, so passing the member pointer as a
-runtime value is the only practical approach. The upshot is that any
-such entity would actually have to be a function <i>object</i>, and I
-haven't implemented automatic wrapping of C++ callable function
-objects yet, so there is less re-use in the implementation than I'd
-like. I hope to implement callable object wrapping and refactor this
-code one day. I also hope to implement static data member support,
-for which Python's property will not be an appropriate descriptor.
-
-<h3><a name="miscellaneous">Miscellaneous</a></h3>
-<ul>
-<li>Moved <code>args&lt;&gt;</code> and <code>bases&lt;&gt;</code> from unnamed namespace to <code>boost::python</code> in their own header files.
-<li>Convert <code>NULL</code> pointers returned from wrapped C++ functions to <code>None</code>.
-<li>Improved some compile-time error checks.
-<li>Eliminated <code>boost/python/detail/eval.hpp</code> in favor of
-more-general <code>boost/mpl/apply.hpp</code>.
-<li>General code cleanup and refactoring.
-<li>Works with Microsoft Visual C++ 7.0
-<li>Warning suppression for many compilers
-<li>Elegant interface design for exporting <code>enum</code> types.
-</ul>
-<hr>
-
-<h2><a name="future">The Near Future</a></h2>
-
-Before April 15th I plan to 
-<ol>
-<li>Document all implemented features
-<li>Implement a <code>CallPolicy</code> interface for constructors of wrapped
-classes
-<li>Implement conversions for <code>char</code> types.
-<li>Implement automated code generation for all headers containing
-families of overloaded functions to handle arbitrary arity.
-</ol>
-
-I also hope to implement a mechanism for generating conversions
-between arbitrary Python sequences and C++ containers, if time permits
-(and others haven't already done it)!
-
-<h2><a name="notes">Notes</a></h2>
-
-The older version of KCC used by Kull is generating lots of warnings
-about a construct I use to instantiate static members of various class
-templates. I'm thinking of moving to an idiom which uses a function
-template to suppress it, but worry about bloating the size of debug
-builds. Since KCC users may be moving to GCC, I'm not sure that it's
-worth doing anything about it.
-
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
-  2002. All Rights Reserved.</i></p>
-</body>
-</html>
diff --git a/doc/v2/May2002.html b/doc/v2/May2002.html
deleted file mode 100644
index b5eb4e4f..00000000
--- a/doc/v2/May2002.html
+++ /dev/null
@@ -1,309 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../boost.css">
-<title>Boost.Python - May 2002 Progress Report</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">May 2002 Progress Report</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<h2>Contents</h2>
-<dl class="index">
-  <dt><a href="#intro">Introduction</a></dt>
-  <dt><a href="#features">New Features</a></dt>
-  <dl>
-    <dt><a href="#aix_shared">Shared Library Support for AIX</a><dd>
-    <dt><a href="#class_enhancements">Class Enhancements</a><dd>
-    <dl>
-      <dt><a href="#operators">Operators</a><dd>
-      <dt><a href="#iterators">Iterators</a><dd>
-      <dt><a href="#properties">Properties</a><dd>
-      <dt><a href="#setattr">setattr</a><dd>
-      <dt><a href="#module">__module__ Attribute</a><dd>
-    </dl>
-    <dt><a href="#back_reference">back_reference</a><dd>
- </dl>
-
-  <dt><a href="#documentation">Documentation</a></dt>
-   <dt><a href="#misc">Miscellaneous</a></dt>
-  <dl class="index">
-    <dt><a href="#converters">Converters</a></dt>
-    <dt><a href="#checkins">Checkins Mailing List</a></dt>
-    <dt><a href="#shared">Shared Libraries</a></dt>
-  </dl>
-
-  <dt><a href="#next">What's Next</a></dt>
-</dl>
-
-<h2><a name="intro">Introduction</a></h2>
-
-Aside from library development, work on Boost.Python in May was
-focused on reducing the support burden. In recent weeks, responding to
-requests for support, espcially surrounding building the library, had
-begun to impede progress on development. There was a major push to
-release a stable 1.28.0 of Boost, including documentation of <a
-href="../../../../tools/build/index.html">Boost.Build</a> and specific
-<a href="../building.html">instructions</a> for building Boost.Python
-v1. The documentation for Boost.Python v2 was also updated as
-described <a href="#documentation">here</a>.
-
-<h2><a name="features">New Features</a></h2>
-
-  <h3><a name="aix_shared">Shared Library Support for AIX</a></h3>
-
-  The Kull group required the ability to build and test Boost.Python
-  extensions on AIX, a platform with &quot;creatively designed&quot;
-  shared library semantics. Making this work was a multi-pronged
-  effort, involving changes to Boost.Build and some great research by
-  Martin Casado which uncovered the key mechanism required to allow
-  shared libraries to use functions from the Python executable. The
-  current solution used in Boost.Build relies on a <a
-  href="../../../../tools/build/gen_aix_import_file.py">Python
-  Script</a> as part of the build process. This is not a problem for
-  Boost.Python, as Python will be available. However, the commands
-  issued by the script are so simple that a 100%-pure-Boost.Jam
-  solution is surely possible. Linking on AIX is sufficiently
-  interesting to have skewed the Boost.Python development schedule a
-  bit.
-
-  <h3><a name="class_enhancements">Class Enhancements</a></h3>
-
-      <h4><a name="operators">Operators</a></h4>
-
-Support for exposing C++ operators and functions as the corresponding
-Python special methods was added. Thinking that the Boost.Python
-<a href="../special.html#numeric">v1 interface</a> was a little too
-esoteric (especially the use of
-<code>left_operand&lt;...&gt;/right_operand&lt;...&gt;</code> for
-asymmetric operands), I introduced a simple form of <a
-href="http://osl.iu.edu/~tveldhui/papers/Expression-Templates/exprtmpl.html">expression
-templates</a> which allow users to simply write the expressions that
-should be wrapped, as in this <a href="operators.html#examples">example</a>.
-
-      <h4><a name="iterators">Iterators</a></h4>
-
-Python iterator support as required by the Kull project resulted in a
-highly flexible interface allowing:
-
-<dl>
-
-<dt>Direct exposure of a class' <code>begin()</code> and
-<code>end()</code> functions:
-
-<pre>
-    ...
-    .def(&quot;__iter__&quot;, iterator&lt;list_int&gt;())
-</pre>
-<dd>
-
-<dt>Creation of iterators from member functions...
-<pre>
-    ...
-    .def(&quot;__iter__&quot;
-         , range(&amp;my_class::x_begin, &amp;my_class::x_end))
-    )
-</pre>
-<dd>
-
-<dt>...and member data:
-<pre>
-    ...
-    .def(&quot;__iter__&quot;
-         , range(&amp;std::pair&lt;char*,char*&gt;::first, &amp;std::pair&lt;char*,char*&gt;::second))
-    )
-</pre>
-<dd>
-
-<dt>The ability to specify <a
-href="CallPolicies.html">CallPolicies</a>, e.g. to prevent copying of
-heavyweight values:
-
-<pre>
-    ...
-    .def(&quot;__iter__&quot;, 
-         , range&lt;return_value_policy&lt;copy_non_const_reference&gt; &gt;(
-               &amp;my_sequence&lt;heavy&gt;::begin
-             , &amp;my_sequence&lt;heavy&gt;::end))
-</pre>
-<dd>
-
-</dl>
-
-      <h4><a name="properties">Properties</a></h4>
-
-The Kull iteration interfaces also required the ability to iterate
-over a sequence specified by an instance's attribute:
-<pre>
-&gt;&gt;&gt; f = field()
-&gt;&gt;&gt; for e in f.elements:
-...     print e,
-</pre>
-
-This forced the exposure of the <a
-      href="http://www.python.org/2.2/descrintro.html#property"><code>property</code></a>
-      interface used internally to implement the data member exposure
-      facility described in <a
-      href="Mar2002#data_members">March</a>. Properties are an
-      incredibly useful idiom, so it's good to be able to provide them
-      at little new development cost.
-
-      <h4><a name="setattr">setattr</a></h4>
-
-<code>class_&lt;&gt;</code> acquired a <code>setattr</code> member
-function which allows users to easily add new Python objects as class
-attributes.
-
-      <h4><a name="module">__module__ Attribute</a></h4>
-
-Ralf Grosse-Kunstleve has been working on pickling support for v2. To
-make it work correctly, he had to make sure that a class'
-<code>__module__</code> attribute was set correctly.
-
-<h3><a name="back_reference"><code>back_reference</code></a></h3>
-
-The new <code>back_reference&lt;T&gt;</code> template can be used as a
-function parameter when the user needs access to both a <code>T</code>
-argument and to the Python object which manages it. The function will
-only match in the overload resolution process if it would match the
-same function signature with <code>T</code> substituted for
-<code>back_reference&lt;T&gt;</code>. This feature is not yet
-documented.
-
-<h2><a name="documentation">Documentation</a></h2>
-
-In a major effort to prepare Boost.Python v2 to replace v1, many pages
-of new reference documentation were added:
-
-<blockquote>
-
-<dl>
-        <dt><a href="CallPolicies.html">CallPolicies.html</a><dd>
-        <dt><a href="Dereferenceable.html">Dereferenceable.html</a><dd>
-        <dt><a href="Extractor.html">Extractor.html</a><dd>
-        <dt><a href="HolderGenerator.html">HolderGenerator.html</a><dd>
-        <dt><a href="ResultConverter.html">ResultConverter.html</a><dd>
-        <dt><a href="call_method.html">call_method.html</a><dd>
-        <dt><a href="callbacks.html">callbacks.html</a><dd>
-        <dt><a href="data_members.html">data_members.html</a><dd>
-        <dt><a href="has_back_reference.html">has_back_reference.html</a><dd>
-        <dt><a href="implicit.html">implicit.html</a><dd>
-        <dt><a href="instance_holder.html">instance_holder.html</a><dd>
-        <dt><a href="operators.html">operators.html</a><dd>
-        <dt><a href="ptr.html">ptr.html</a><dd>
-        <dt><a href="type_id.html">type_id.html</a><dd>
-        <dt><a href="with_custodian_and_ward.html">with_custodian_and_ward.html</a><dd>
-</dl>
-
-</blockquote>
-Major updates were made to the following pages:
-
-
-<blockquote>
-<dl>
-        <dt><a href="call.html">call.html</a><dd> <dt><a href="updated">updated</a><dd>
-        <dt><a href="class.html">class.html</a><dd>
-        <dt><a href="reference.html">reference.html</a><dd>
-</dl>
-</blockquote>
-
-         As usual, careful documentation forces one to consider the
-         interface again, and there were many interface changes
-         associated with this effort, including the elevation of the
-         following components from implementation detail to
-         first-class library citizen:
-
-<blockquote>
-<dl>
-        <dt>type_id.hpp<dd>
-        <dt>pointee.hpp<dd>
-        <dt>lvalue_from_pytype.hpp<dd></dl>
-</dl>
-</blockquote>
-
-<h2><a name="misc">Miscellaneous</a></h2>
-
-    <h3><a name="converters">Converters</a></h3>
-
-It appears that the world of C++ &lt;==&gt; Python conversion rules is
-an endlessly-rich area of exploration. Completing the conversions for
-<code>char</code> and <code>char const*</code> types, as described at
-the end of <a href="Apr2002.html#missing">April's report</a>,
-uncovered some interesting new shades to the problem. It turns out to
-be worth distinguishing mutable and immutable lvalue conversions,
-because despite the fact that Python doesn't understand
-<code>const</code>, it does understand immutability (c.f. Python
-strings, which expose an immutable <code>char</code> pointer). It is
-also worth recognizing types which represent lvalue <i>sequences</i>,
-to prevent Python <code>&quot;foobar&quot;</code> from being silently
-truncated to C++ <code>'f'</code>. More details on this insight can be
-found in the mailing list <a
-href="http://mail.python.org/pipermail/c++-sig/2002-May/001023.html">
-archive</a>. I don't plan to do anything about this immediately, but I
-do think it's the right direction to go in the long run.
-
-    <h3><a name="checkins">Checkins Mailing List</a></h3>
-
-In order to better coordinate changes made by multiple developers, I
-enabled <a
-href="http://sourceforge.net/docman/display_doc.php?docid=772&group_id=1">syncmail</a>
-for the Boost.Python CVS trees, and established an associated <a
-href="http://lists.sourceforge.net/lists/listinfo/boost-python-cvs">mailing
-list</a>. Subscribe to this list to receive notices of each new
-checkin.
-
-    <h3><a name="shared">Shared Libraries</a></h3>
-
-Beyond the vagaries of dynamic linking on AIX, I have been
-participating in a more-general discussion of dynamic linking for
-C++. Needless to say, C++ dynamic linking is of critical importance to
-Boost.Python: all extension modules are normally built as shared
-libraries, and Boost.Python extension modules share a common library
-as well. 
-
-In fact, there are at least two separate conversations. One
-in the C++ standard extensions mailing list concerns what can be
-standardized for C++ and shared libraries; the other, mostly on the <a
-href="http://gcc.gnu.org/ml/gcc/">gcc</a> mailing list, concerns the
-behavior of GCC on Posix/ELF platforms. 
-
-Some of the GCC threads are here:
-
-<blockquote>
-<a
-href="http://gcc.gnu.org/ml/gcc/2002-05/msg02002.html">http://gcc.gnu.org/ml/gcc/2002-05/msg02002.html</a><br>
-<a
-href="http://gcc.gnu.org/ml/gcc/2002-05/msg02945.html">http://gcc.gnu.org/ml/gcc/2002-05/msg02945.html</a><br>
-<a href="http://gcc.gnu.org/ml/gcc/2002-05/msg01758.html">http://gcc.gnu.org/ml/gcc/2002-05/msg01758.html</a>
-</blockquote>
-
-  <h2><a name="next">What's Next</a></h2>
-
-Development is focused on what's needed to be able to retire
-Boost.Python v1. At the moment, that means deciding the user-friendly
-interfaces for to_/from_python conversion, and formally exposing the
-Python object smart pointers and object wrapper classes. Quite a few
-questions have also been showing up recently about how to embed Python
-with Boost.Python, and how to link with it statically; the solutions
-to these issues will probably have to be formalized before long.
-
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
-  2002. All Rights Reserved.</i></p>
-</body>
-</html>
diff --git a/doc/v2/ObjectWrapper.html b/doc/v2/ObjectWrapper.html
deleted file mode 100644
index 82a940e3..00000000
--- a/doc/v2/ObjectWrapper.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - ObjectWrapper Concept</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">ObjectWrapper and TypeWrapper Concepts</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#concept-requirements">Concept Requirements</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#ObjectWrapper-concept">ObjectWrapper Concept</a></dt>
-
-          <dt><a href="#TypeWrapper-concept">TypeWrapper Concept</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#caveat">Caveat</a></dt>
-    </dl>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>This page defines two concepts used to describe classes which manage a
-    Python objects, and which are intended to support usage with a
-    Python-like syntax.</p>
-
-    <h2><a name="concept-requirements"></a>Concept Requirements</h2>
-
-    <h3><a name="ObjectWrapper-concept"></a>ObjectWrapper Concept</h3>
-    Models of the ObjectWrapper concept have <a href=
-    "object.html#object-spec">object</a> as a publicly-accessible base class,
-    and are used to supply special construction behavior and/or additional
-    convenient functionality through (often templated) member functions.
-    Except when the return type <code>R</code> is itself an <a href=
-    "#TypeWrapper-concept">TypeWrapper</a>, a member function invocation of
-    the form 
-<pre>
-x.<i>some_function</i>(<i>a<small>1</small>, a<small>2</small>,...a<small>n</small></i>)
-</pre>
-    always has semantics equivalent to: 
-<pre>
-<a href=
-"extract.html#extract-spec">extract</a>&lt;R&gt;(x.attr("<i>some_function</i>")(<a
- href=
-"object.html#object-spec-ctors">object</a>(<i>a<small>1</small></i>), <a
-href=
-"object.html#object-spec-ctors">object</a>(<i>a<small>2</small></i>),...<a
-href="object.html#object-spec-ctors">object</a>(<i>a<small>n</small></i>)))()
-</pre>
-    When the <code>R</code> is an <a href=
-    "#TypeWrapper-concept">TypeWrapper</a>, the result type may be
-    constructed by taking direct posession of: 
-<pre>
-x.attr("<i>some_function</i>")(<a href=
-"object.html#object-spec-ctors">object</a>(<i>a<small>1</small></i>), <a
- href=
-"object.html#object-spec-ctors">object</a>(<i>a<small>2</small></i>),...<a
- href=
-"object.html#object-spec-ctors">object</a>(<i>a<small>n</small></i>)).ptr()
-</pre>
-    [see <a href="#caveat">caveat</a> below] 
-
-    <h3><a name="TypeWrapper-concept"></a>TypeWrapper Concept</h3>
-    TypeWrapper is a refinement of ObjectWrapper which is associated with a
-    particular Python type <code>X</code>. For a given TypeWrapper
-    <code>T</code>, a valid constructor expression 
-<pre>
-T(<i>a<small>1</small>, a<small>2</small>,...a<small>n</small></i>)
-</pre>
-    builds a new <code>T</code> object managing the result of invoking
-    <code>X</code> with arguments corresponding to 
-<pre>
-<a href=
-"object.html#object-spec-ctors">object</a>(<i>a<small>1</small></i>), <a
- href=
-"object.html#object-spec-ctors">object</a>(<i>a<small>2</small></i>),...<a
- href=
-"object.html#object-spec-ctors">object</a>(<i>a<small>n</small></i>)
-</pre>
-
-When used as arguments to wrapped C++ functions, or as the template
-parameter to <code><a
-href="extract.html#extract-spec">extract</a>&lt;&gt;</code>, only
-instances of the associated Python type will be considered a match.
-
-    <h3><a name="caveat">Caveat</a></h3>
-    The upshot of the special member function invocation rules when the
-    return type is a TypeWrapper is that it is possible for the returned
-    object to manage a Python object of an inappropriate type. This is not
-    usually a serious problem; the worst-case result is that errors will be
-    detected at runtime a little later than they might otherwise be. For an
-    example of how this can occur, note that the <code><a href=
-    "dict.html#dict-spec">dict</a></code> member function <code>items</code>
-    returns an object of type <code><a href=
-    "list.html#list-spec">list</a></code>. Now suppose the user defines this
-    <code>dict</code> subclass in Python: 
-<pre>
-&gt;&gt;&gt; class mydict(dict):
-...     def items(self):
-...         return tuple(dict.items(self)) # return a tuple
-</pre>
-    Since an instance of <code>mydict</code> is also an instance of
-    <code>dict</code>, when used as an argument to a wrapped C++ function,
-    <code><a href="dict.html#dict-spec">boost::python::dict</a></code> can
-    accept objects of Python type <code>mydict</code>. Invoking
-    <code>items()</code> on this object can result in an instance of <code><a
-    href="list.html#list-spec">boost::python::list</a></code> which actually
-    holds a Python tuple. Subsequent attempts to use list methods (e.g.
-    <code>append</code>, or any other mutating operation) on this object will
-    raise the same exception that would occur if you tried to do it from
-    Python. 
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-
-    <p>Permission to copy, use, modify, sell and distribute this software is
-    granted provided this copyright notice appears in all copies. This
-    software is provided "as is" without express or implied warranty, and
-    with no claim as to its suitability for any purpose.</p>
-  </body>
-</html>
-
diff --git a/doc/v2/ResultConverter.html b/doc/v2/ResultConverter.html
deleted file mode 100644
index 63187c3a..00000000
--- a/doc/v2/ResultConverter.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href=../../../../boost.css>
-<title>Boost.Python - ResultConverter Concept</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-      <h3><a href="../../../../index.htm"><img height="86" width="277" alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">ResultConverter Concept</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<dl class="page-index"> 
-  <dt><a href="#introduction">Introduction</a></dt>
-  <dt><a href="#concept-requirements">Concept Requirements</a></dt>
-  <dl class="page-index"> 
-    <dt><a href="#ResultConverter-concept">ResultConverter Concept</a></dt>
-    <dt><a href="#ResultConverterGenerator-concept">ResultConverterGenerator Concept</a></dt>
-  </dl>
-</dl>
-
-<h2><a name="introduction"></a>Introduction</h2>
-
-<p>A ResultConverter for a type <code>T</code> is a type whose
-instances can be used to convert C++ return values of type
-<code>T</code> <code>to_python</code>. A ResultConverterGenerator is
-an MPL unary metafunction class which, given the return type of a C++
-function, returns a ResultConverter for that type. ResultConverters in
-Boost.Python generally inspect library's registry of converters to
-find a suitable converter, but converters which don't use the registry
-are also possible.
-
-<h2><a name="concept-requirements"></a>Concept Requirements</h2>
-<h3><a name="ResultConverter-concept"></a>ResultConverter Concept</h3>
-
-<p>In the table below, <code><b>C</b></code> denotes a ResultConverter
-type for a type <b><code>R</code></b> , <code><b>c</b></code> denotes
-an object of type <code><b>C</b></code> , and <code><b>r</b></code>
-denotes an object of type <code><b>R</b></code>.
-
-<table summary="ResultConverter expressions" border="1" cellpadding="5">
-
-  <tr> 
-    <td><b>Expression</b></td>
-    <td><b>Type</b></td>
-    <td><b>Semantics</b></td>
-  </tr>
-
-  <tr> 
-    <td valign="top"><code>C c;</code></td>
-    <td>
-    <td>Constructs a <code>C</code> object.
-  </tr>
-
-  <tr> 
-    <td valign="top"><code>c.convertible()</code></td>
-    <td>convertible to <code>bool</code></td>
-    <td><code>false</code> iff no conversion from any <code>R</code> value
-    to a Python object is possible.</td>
-  </tr>
-
-  <tr> 
-    <td valign="top"><code>c(r)</code></td>
-    <td>convertible to <code>PyObject*</code></td>
-    <td>A pointer to a Python object corresponding to <code>r</code>,
-    or <code>0</code> iff <code>r</code> could not be converted
-    <code>to_python</code>, in which case <a
-    href="http://www.python.org/doc/current/api/exceptionHandling.html#l2h-71">PyErr_Occurred</a>
-    should return non-zero.</td>
-  </tr>
-</table>
-
-<h3><a name="ResultConverterGenerator-concept"></a>ResultConverterGenerator Concept</h3>
-<p>In the table below, <code><b>G</b></code> denotes a
-ResultConverterGenerator type and <code><b>R</b></code> denotes a possible
-C++ function return type.
-
-<table summary="ResultConverterGenerator expressions" border="1" cellpadding="5">
-  <tr> 
-    <td><b>Expression</b></td>
-    <td><b>Requirements</b></td>
-  </tr>
-  <tr> 
-    <td valign="top"><code>G::apply&lt;R&gt;::type</code></td>
-    <td>A ResultConverter type for <code>R</code>.</td>
-</table>
-
-<hr>
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  09 May, 2002    <!--Luann's birthday! -->
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
-<p>Permission to copy, use, modify, sell
- and distribute this software is granted provided this copyright notice appears
- in all copies. This software is provided "as is" without express or implied
- warranty, and with no claim as to its suitability for any purpose.
-</body>
-</html>
diff --git a/doc/v2/acknowledgments.html b/doc/v2/acknowledgments.html
deleted file mode 100644
index 3cc24edb..00000000
--- a/doc/v2/acknowledgments.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - Acknowledgments</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Acknowledgments</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <p><a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> is
-    the architect, designer, and implementor of <b>Boost.Python</b>.</p>
-
-    <p><a href="mailto:brett.calcott@paradise.net.nz">Brett Calcott</a>
-    contributed and maintains the Visual Studio project files and
-    documentation.</p>
-
-    <p><a href="mailto:Gottfried.Ganssauge-at-haufe.de">Gottfried
-    Ganßauge</a> supplied support for opaque pointer conversions,
-    complete with documentation and a regression test (and I didn't
-    even have to ask him for those)!
-
-    <p>Joel de Guzman implemented the <a href="overloads.html">default
-    argument support</a> and wrote the excellent <a href=
-    "../tutorial/index.html">tutorial documentation</a>.</p>
-
-    <p><a href="../../../../people/ralf_w_grosse_kunstleve.htm">Ralf W.
-    Grosse-Kunstleve</a> implemented the <a href="pickle.html">pickle
-    support</a>, and has enthusiastically supported the library since its
-    birth, contributing to design decisions and providing invaluable
-    real-world insight into user requirements. Ralf has written some <a href=
-    "faq.html#question2">extensions</a> for converting C++ containers that I
-    hope will be incorporated into the library soon. He also implemented the
-    cross-module support in the first version of Boost.Python. More
-    importantly, Ralf makes sure nobody forgets the near-perfect synergy of
-    C++ and Python for solving the problems of large-scale software
-    construction.</p>
-
-    <p><a href="../../../../people/aleksey_gurtovoy.htm">Aleksey Gurtovoy</a>
-    wrote an incredible C++ <a href="http://www.mywikinet.com/mpl">Template
-    Metaprogramming Library</a> which allows Boost.Python to perform much of
-    its compile-time magic. In addition, Aleksey very generously contributed
-    his time and deep knowledge of the quirks of various buggy compilers to
-    help us get around problems at crucial moments.</p>
-
-    <p><a href="../../../../people/paul_mensonides.htm">Paul Mensonides</a>,
-    building on the work <a href="../../../../people/vesa_karvonen.htm">Vesa
-    Karvonen</a>, wrote a similarly amazing <a href=
-    "../../../preprocessor/doc/index.html">Preprocessor Metaprogramming
-    Library</a>, and generously contributed the time and expertise to get it
-    working in the Boost.Python library, rewriting much of Boost.Python to
-    use the new preproccessor metaprogramming constructs and helping us to
-    work around buggy and slow C++ preprocessors.</p>
-
-    <p><a href="nicodemus-at-globalite.com.br">Bruno da Silva de
-    Oliveira</a> contributed the ingenious <a
-    href="../../pyste/index.html">Pyste</a> (&quot;Pie-Steh&quot;)
-    code generator.
-
-    <p><a href="mailto:nickm@sitius.com">Nikolay Mladenov</a> contributed
-    <code>staticmethod</code> support.</p>
-
-    <p>Martin Casado solved some sticky problems which allow us to build the
-    Boost.Python shared library for AIX's crazy dynamic linking model.</p>
-
-    <p><a href="mailto:achim@procoders.net">Achim Domma</a> contributed some
-    of the <a href="reference.html#object_wrappers">Object Wrappers</a> and
-    HTML templates for this documentation. Dave Hawkes contributed
-    inspiration for the use of the <code><a href=
-    "scope.html#scope-spec">scope</a></code> class to simplify module
-    definition syntax. Pearu Pearson wrote some of the test cases that are in
-    the current test suite.</p>
-
-    <p>The development of this version of Boost.Python was funded in part by
-    the <a href="http://www.llnl.gov/">Lawrence Livermore National
-    Laboratories</a> and by the <a href="http://cci.lbl.gov/">Computational
-    Crystallography Initiative</a> at Lawrence Berkeley National
-    Laboratories.</p>
-
-    <p><a href="http://kogs-www.informatik.uni-hamburg.de/~koethe/">Ullrich
-    Koethe</a> had independently developed a similar system. When he
-    discovered Boost.Python v1, he generously contributed countless hours of
-    coding and much insight into improving it. He is responsible for an early
-    version of the support for function overloading and wrote the support for
-    reflecting C++ inheritance relationships. He has helped to improve
-    error-reporting from both Python and C++ (we hope to do as well in v2
-    again soon), and has designed the original support for exposing numeric
-    operators, including a way to avoid explicit coercion by means of
-    overloading.</p>
-
-    <p>The members of the boost mailing list and the Python community
-    supplied invaluable early feedback. In particular, Ron Clarke, Mark
-    Evans, Anton Gluck, Chuck Ingold, Prabhu Ramachandran, and Barry Scott
-    took the brave step of trying to use Boost.Python while it was still in
-    early stages of development.</p>
-
-    <p>The first version of Boost.Python would not have been possible without
-    the support of Dragon Systems, which supported its development and
-    release as a Boost library.</p>
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     26 November, 2002 
-    <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/args.html b/doc/v2/args.html
deleted file mode 100644
index 8519b3bc..00000000
--- a/doc/v2/args.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/args.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/args.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#keyword-expression"><i>keyword-expressions</i></a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#arg-spec">class <code>arg</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#arg-synopsis">class <code>arg</code>
-              synopsis</a></dt>
-
-              <dt><a href="#arg-ctor">class <code>arg</code>
-              constructor</a></dt>
-
-              <dt><a href="#arg-operator">class <code>arg</code> template
-              <code>operator =</code></a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#keyword-expression-operators"><i>Keyword-expression</i>
-      operator <code>,</code></a></dt>
-
-      <dt><a href="#functions">Functions (deprecated)</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><code><a href=
-          "#args-spec">args</a>(</code>...<code>)</code></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Supplies a family of overloaded functions for specifying argument
-    keywords for wrapped C++ functions.</p>
-
-    <h2><a name="keyword-expression"></a><i>keyword-expressions</i></h2>
-
-    <p>A <b>keyword-expression</b> results in an object which holds a
-    sequence of <a href="definitions.html#ntbs">ntbs</a>es, and whose type
-    encodes the number of keywords specified. The <b>keyword-expression</b>
-    may contain default values for some or all of the keywords it holds</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="arg-spec"></a><code>class arg;</code></h3>
-
-    <p>The objects of class arg are keyword-expressions holding one keyword (
-    size one )</p>
-
-    <h4><a name="arg-synopsis"></a>Class <code>arg</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-        struct arg 
-        {
-          template &lt;class T&gt;
-                  arg &amp;perator = (T const &amp;value);
-          explicit arg (char const *name){elements[0].name = name;}
-        };
-
-}}
-</pre>
-
-    <h4><a name="arg-ctor"></a>Class <code>arg</code> constructor</h4>
-<pre>
-arg(char const* name);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> The argument must be a <a href=
-      "definitions.html#ntbs">ntbs</a>.</dt>
-
-      <dt><b>Effects:</b> Constructs an <code>arg</code> object holding a
-      keyword with name <code>name</code>.</dt>
-    </dl>
-
-    <h4><a name="arg-operator"></a>Class <code>arg</code> operator =</h4>
-<pre>
-template &lt;class T&gt; arg &amp;operator = (T const &amp;value);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> The argument must convertible to python.</dt>
-
-      <dt><b>Effects:</b> Assigns default value for the keyword.</dt>
-
-      <dt><b>Returns:</b> Reference to <code>this</code>.</dt>
-    </dl>
-
-    <h2><a name="keyword-expression-operators"><i>Keyword-expression</i>
-    operator <code>,</code></a></h2>
-<pre>
-      <i>keyword-expression</i> operator , (<i>keyword-expression</i>, const arg &amp;kw) const
-      <i>keyword-expression</i> operator , (<i>keyword-expression</i>, const char *name) const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> The argument <code>name</code> must be a <a href=
-      "definitions.html#ntbs">ntbs</a>.</dt>
-
-      <dt><b>Effects:</b> Extends the <i>keyword-expression</i> argument with
-      one more keyword.</dt>
-
-      <dt><b>Returns:</b> The extended <i>keyword-expression</i>.</dt>
-    </dl>
-
-    <h2><font color="#7F7F7F"><a name="functions"></a>Functions
-    (deprecated)</font></h2>
-
-    <h3><a name="args-spec"></a><code><font color=
-    "#7F7F7F">args</font>(</code>...<code>)</code></h3>
-<pre>
-<font color="#7F7F7F">  <i>unspecified1</i> args(char const*);
-    <i>unspecified2</i> args(char const*, char const*);
-       .
-       .
-       .
-    <i>unspecifiedN</i> args(char const*, char const*, ... char const*);
-</font>
-</pre>
-
-    <dl class="function-semantics">
-      <dt><font color="#7F7F7F"><b>Requires:</b> Every argument must be a <a
-      href="definitions.html#ntbs">ntbs</a>.</font></dt>
-
-      <dt><font color="#7F7F7F"><b>Returns:</b> an object representing a <a
-      href="#keyword-expression"><i>keyword-expression</i></a> encapsulating
-      the arguments passed.</font></dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-#include &lt;boost/python/def.hpp&gt;
-using namespace boost::python;
-
-int f(double x, double y, double z=0.0, double w=1.0);
-
-BOOST_PYTHON_MODULE(xxx)
-{
-   def("f", f
-            , ( arg("x"), "y", arg("z")=0.0, arg("w")=1.0 ) 
-            );
-}
-</pre>
-
-    <p>Revised 01 August, 2003</p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002-2003. All
-    Rights Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/bibliography.html b/doc/v2/bibliography.html
deleted file mode 100644
index 7ebd477b..00000000
--- a/doc/v2/bibliography.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../boost.css">
-<title>Boost.Python - Bibliography</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">Bibliography</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-{{bibliographical information}}
-<hr>
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
-  2002. All Rights Reserved.</i></p>
-</body>
-</html>
diff --git a/doc/v2/call.html b/doc/v2/call.html
deleted file mode 100644
index b5478a4b..00000000
--- a/doc/v2/call.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../boost.css">
-<title>Boost.Python - &lt;call.hpp&gt;</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">Header &lt;call.hpp&gt;</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<h2>Contents</h2>
-<dl class="page-index"> 
-  <dt><a href="#introduction">Introduction</a></dt>
-  <dt><a href="#functions">Functions</a></dt>
-  <dl class="page-index">
-    <dt><a href="#call-spec">call</a></dt>
-  </dl>
-
-  <dt><a href="#examples">Example(s)</a></dt>
-
-</dl>
-<hr>
-<h2><a name="introduction"></a>Introduction</h2>
-<p>
-  <code>&lt;boost/python/call.hpp&gt;</code> defines the <a
-  href="#call-spec"><code>call</code></a> family of overloaded function
-  templates, used to invoke Python callable objects from C++.
-
-<h2><a name="functions"></a>Functions</h2>
-<pre>
-<a name="call-spec">template &lt;class R, class A1, class A2, ... class A<i>n</i>&gt;</a>
-R call(PyObject* callable, A1 const&amp;, A2 const&amp;, ... A<i>n</i> const&amp;)
-</pre>
-<dl class="function-semantics"> 
-  <dt><b>Requires:</b> <code>R</code> is a pointer type, reference
-  type, or a complete type with an accessible copy constructor</dt>
-
-  <dt><b>Effects:</b> Invokes <code>callable(a1,&nbsp;a2,&nbsp;...a<i>n</i>)</code> in
-  Python, where <code>a1</code>...<code>a<i>n</i></code> are the arguments to
-  <code>call()</code>, converted to Python objects.
-  <dt><b>Returns:</b> The result of the Python call, converted to the C++ type <code>R</code>.</dt>
-
-</dt>
-  <dt><b>Rationale:</b> For a complete semantic description and
-  rationale, see <a href="callbacks.html">this page</a>.
-</dt>
-</dl>
-
-<h2><a name="examples"></a>Example(s)</h2>
-
-The following C++ function applies a Python callable object to its two
-arguments and returns the result. If a Python exception is raised or
-the result can't be converted to a <code>double</code>, an exception
-is thrown.
-
-<pre>
-double apply2(PyObject* func, double x, double y)
-{
-   return boost::python::call&lt;double&gt;(func, x, y);
-}
-</pre>
-
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  9 May, 2002 <!-- Luann's birthday! -->
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
-  2002. All Rights Reserved.</i></p>
-</body>
-</html>
diff --git a/doc/v2/call_method.html b/doc/v2/call_method.html
deleted file mode 100644
index eaa91ec9..00000000
--- a/doc/v2/call_method.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;call_method.hpp&gt;</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;call_method.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#call_method-spec">call_method</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/call_method.hpp&gt;</code> defines the <a href=
-    "#call_method-spec"><code>call_method</code></a> family of overloaded
-    function templates, used to invoke callable attributes of Python objects
-    from C++.</p>
-
-    <h2><a name="functions"></a>Functions</h2>
-<pre>
-<a name=
-"call_method-spec">template &lt;class R, class A1, class A2, ... class A<i>n</i>&gt;</a>
-R call_method(PyObject* self, char const* method, A1 const&amp;, A2 const&amp;, ... A<i>n</i> const&amp;)
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>R</code> is a pointer type, reference type,
-      or a complete type with an accessible copy constructor</dt>
-
-      <dt><b>Effects:</b> Invokes
-      <code>self.<i>method</i>(a1,&nbsp;a2,&nbsp;...a<i>n</i>)</code> in
-      Python, where <code>a1</code>...<code>a<i>n</i></code> are the
-      arguments to <code>call_method()</code>, converted to Python objects.
-      For a complete semantic description, see <a href="callbacks.html">this
-      page</a>.</dt>
-
-      <dt><b>Returns:</b> The result of the Python call, converted to the C++
-      type <code>R</code>.</dt>
-
-      <dt><b>Rationale:</b> <code>call_method</code> is critical to
-      implementing C++ virtual functions which are overridable in Python, as
-      shown by the example below.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example(s)</h2>
-    The following C++ illustrates the use of <code>call_method</code> in
-    wrapping a class with a virtual function that can be overridden in
-    Python: 
-
-    <h3>C++ Module Definition</h3>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/utility.hpp&gt;
-#include &lt;cstring&gt;
-
-// class to be wrapped
-class Base
-{
- public:
-   virtual char const* class_name() const { return "Base"; }
-   virtual ~Base();
-};
-
-bool is_base(Base* b)
-{
-   return !std::strcmp(b-&gt;class_name(), "Base");
-}
-
-// Wrapper code begins here
-using namespace boost::python;
-
-// Callback class
-class Base_callback : public Base
-{
- public:
-   Base_callback(PyObject* self) : m_self(self) {}
-
-   char const* class_name() const { return <b>call_method</b>&lt;char const*&gt;(m_self, "class_name"); }
-   char const* Base_name() const { return Base::class_name(); }
- private:
-   PyObject* const m_self;
-};
-
-using namespace boost::python;
-BOOST_PYTHON_MODULE(my_module)
-{
-    def("is_base", is_base);
-
-    class_&lt;Base,Base_callback, noncopyable&gt;("Base")
-        .def("class_name", &amp;Base_callback::Base_name)
-        ;
-
-}
-</pre>
-
-    <h3>Python Code</h3>
-<pre>
-&gt;&gt;&gt; from my_module import *
-&gt;&gt;&gt; class Derived(Base):
-...    def __init__(self):
-...       Base.__init__(self)
-...    def class_name(self):
-...       return self.__class__.__name__
-...
-&gt;&gt;&gt; is_base(Base()) # calls the class_name() method from C++
-1
-&gt;&gt;&gt; is_base(Derived())
-0
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/callbacks.html b/doc/v2/callbacks.html
deleted file mode 100644
index 1d215801..00000000
--- a/doc/v2/callbacks.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - Calling Python Functions and Methods</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Calling Python Functions and Methods</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#argument_handling">Argument Handling</a></dt>
-
-      <dt><a href="#result_handling">Result Handling</a></dt>
-
-      <dt><a href="#result_handling">Rationale</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction">Introduction</a></h2>
-    The simplest way to call a Python function from C++, given an <code><a
-    href="object.html#object-spec">object</a></code> instance <code>f</code>
-    holding the function, is simply to invoke its function call operator. 
-<pre>
-f("tea", 4, 2) // In Python: f('tea', 4, 2)
-</pre>
-    And of course, a method of an <code><a href=
-    "object.html#object-spec">object</a></code> instance <code>x</code> can
-    be invoked by using the function-call operator of the corresponding
-    attribute: 
-<pre>
-x.attr("tea")(4, 2); // In Python: x.tea(4, 2)
-</pre>
-
-    <p>If you don't have an <code>object</code> instance, Boost.Python
-    provides two families of function templates, <code><a href=
-    "call.html#call-spec">call</a></code> and <code><a href=
-    "call_method.html#call_method-spec">call_method</a></code>, for invoking
-    Python functions and methods respectively on <code>PyObject*</code>s. The
-    interface for calling a Python function object (or any Python callable
-    object) looks like:</p>
-<pre>
-call&lt;ResultType&gt;(callable_object, a1, a2... a<i>N</i>);
-</pre>
-    Calling a method of a Python object is similarly easy: 
-<pre>
-call_method&lt;ResultType&gt;(self_object, "<i>method-name</i>", a1, a2... a<i>N</i>);
-</pre>
-    This comparitively low-level interface is the one you'll use when
-    implementing C++ virtual functions that can be overridden in Python. 
-
-    <h2><a name="argument_handling">Argument Handling</a></h2>
-
-    <p>Arguments are converted to Python according to their type. By default,
-    the arguments <code>a1</code>...<code>a<i>N</i></code> are copied into
-    new Python objects, but this behavior can be overridden by the use of
-    <code><a href="ptr.html#ptr-spec">ptr()</a></code> and <a href=
-    "../../../bind/ref.html#reference_wrapper">ref()</a>:</p>
-<pre>
-class X : boost::noncopyable
-{
-   ...
-};
-
-void apply(PyObject* callable, X&amp; x)
-{
-   // Invoke callable, passing a Python object which holds a reference to x
-   boost::python::call&lt;void&gt;(callable, boost::ref(x));
-}
-</pre>
-    In the table below, <code><b>x</b></code> denotes the actual argument
-    object and <code><b>cv</b></code> denotes an optional
-    <i>cv-qualification</i>: "<code>const</code>", "<code>volatile</code>",
-    or "<code>const volatile</code>". 
-
-    <table border="1" summary="class_ template parameters">
-      <tr>
-        <th>Argument Type</th>
-
-        <th>Behavior</th>
-      </tr>
-
-      <tr>
-        <td><code>T cv&amp;</code><br>
-         <code>T cv</code></td>
-
-        <td>The Python argument is created by the same means used for the
-        return value of a wrapped C++ function returning <code>T</code>. When
-        <code>T</code> is a class type, that normally means <code>*x</code>
-        is copy-constructed into the new Python object.</td>
-      </tr>
-
-      <tr>
-        <td><code>T*</code></td>
-
-        <td>If <code>x&nbsp;==&nbsp;0</code>, the Python argument will be
-        <code><a href=
-        "http://www.python.org/doc/current/lib/bltin-null-object.html">None</a></code>.
-        Otherwise, the Python argument is created by the same means used for
-        the return value of a wrapped C++ function returning <code>T</code>.
-        When <code>T</code> is a class type, that normally means
-        <code>*x</code> is copy-constructed into the new Python object.</td>
-      </tr>
-
-      <tr>
-        <td><code><a href=
-        "../../../bind/ref.html#reference_wrapper">boost::reference_wrapper</a>&lt;T&gt;</code></td>
-
-        <td>The Python argument contains a pointer to, rather than a copy of,
-        <code>x.get()</code>. Note: failure to ensure that no Python code
-        holds a reference to the resulting object beyond the lifetime of
-        <code>*x.get()</code> <b>may result in a crash!</b></td>
-      </tr>
-
-      <tr>
-        <td><code><a href=
-        "ptr.html#pointer_wrapper-spec">pointer_wrapper</a>&lt;T&gt;</code></td>
-
-        <td>If <code>x.get()&nbsp;==&nbsp;0</code>, the Python argument will
-        be <code><a href=
-        "http://www.python.org/doc/current/lib/bltin-null-object.html">None</a></code>.
-        Otherwise, the Python argument contains a pointer to, rather than a
-        copy of, <code>*x.get()</code>. Note: failure to ensure that no
-        Python code holds a reference to the resulting object beyond the
-        lifetime of <code>*x.get()</code> <b>may result in a crash!</b></td>
-      </tr>
-    </table>
-
-    <h2><a name="result_handling">Result Handling</a></h2>
-    In general, <code>call&lt;ResultType&gt;()</code> and
-    <code>call_method&lt;ResultType&gt;()</code> return
-    <code>ResultType</code> by exploiting all lvalue and rvalue
-    <code>from_python</code> converters registered for ResultType and
-    returning a copy of the result. However, when <code>ResultType</code> is
-    a pointer or reference type, Boost.Python searches only for lvalue
-    converters. To prevent dangling pointers and references, an exception
-    will be thrown if the Python result object has only a single reference
-    count. 
-
-    <h2><a name="rationale">Rationale</a></h2>
-    In general, to get Python arguments corresponding to
-    <code>a1</code>...<code>a<i>N</i></code>, a new Python object must be
-    created for each one; should the C++ object be copied into that Python
-    object, or should the Python object simply hold a reference/pointer to
-    the C++ object? In general, the latter approach is unsafe, since the
-    called function may store a reference to the Python object somewhere. If
-    the Python object is used after the C++ object is destroyed, we'll crash
-    Python. 
-
-    <p>In keeping with the philosophy that users on the Python side shouldn't
-    have to worry about crashing the interpreter, the default behavior is to
-    copy the C++ object, and to allow a non-copying behavior only if the user
-    writes <code><a href="../../../bind/ref.html">boost::ref</a>(a1)</code>
-    instead of a1 directly. At least this way, the user doesn't get dangerous
-    behavior "by accident". It's also worth noting that the non-copying
-    ("by-reference") behavior is in general only available for class types,
-    and will fail at runtime with a Python exception if used otherwise[<a
-    href="#1">1</a>].</p>
-
-    <p>However, pointer types present a problem: one approach is to refuse to
-    compile if any aN has pointer type: after all, a user can always pass
-    <code>*aN</code> to pass "by-value" or <code>ref(*aN)</code> to indicate
-    a pass-by-reference behavior. However, this creates a problem for the
-    expected null pointer to <code>None</code> conversion: it's illegal to
-    dereference a null pointer value.</p>
-
-    <p>The compromise I've settled on is this:</p>
-
-    <ol>
-      <li>The default behavior is pass-by-value. If you pass a non-null
-      pointer, the pointee is copied into a new Python object; otherwise the
-      corresponding Python argument will be None.</li>
-
-      <li>if you want by-reference behavior, use <code>ptr(aN)</code> if
-      <code>aN</code> is a pointer and <code>ref(aN)</code> otherwise. If a
-      null pointer is passed to <code>ptr(aN)</code>, the corresponding
-      Python argument will be <code>None</code>.</li>
-    </ol>
-
-    <p>As for results, we have a similar problem: if <code>ResultType</code>
-    is allowed to be a pointer or reference type, the lifetime of the object
-    it refers to is probably being managed by a Python object. When that
-    Python object is destroyed, our pointer dangles. The problem is
-    particularly bad when the <code>ResultType</code> is char const* - the
-    corresponding Python String object is typically uniquely-referenced,
-    meaning that the pointer dangles as soon as <code>call&lt;char
-    const*&gt;(...)</code> returns.</p>
-
-    <p>The old Boost.Python v1 deals with this issue by refusing to compile
-    any uses of <code>call&lt;char const*&gt;()</code>, but this goes both
-    too far and not far enough. It goes too far because there are cases where
-    the owning Python string object survives beyond the call (just for
-    instance, when it's the name of a Python class), and it goes not far
-    enough because we might just as well have the same problem with a
-    returned pointer or reference of any other type.</p>
-
-    <p>In Boost.Python v2 this is dealt with by:</p>
-
-    <ol>
-      <li>lifting the compile-time restriction on const char* callback
-      returns</li>
-
-      <li>detecting the case when the reference count on the result Python
-      object is 1 and throwing an exception inside of
-      <code>call&lt;U&gt;(...)</code> when <code>U</code> is a pointer or
-      reference type.</li>
-    </ol>
-    This should be acceptably safe because users have to explicitly specify a
-    pointer/reference for <code>U</code> in <code>call&lt;U&gt;</code>, and
-    they will be protected against dangles at runtime, at least long enough
-    to get out of the <code>call&lt;U&gt;(...)</code> invocation. 
-    <hr>
-    <a name="1">[1]</a> It would be possible to make it fail at compile-time
-    for non-class types such as int and char, but I'm not sure it's a good
-    idea to impose this restriction yet. 
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/callbacks.txt b/doc/v2/callbacks.txt
deleted file mode 100644
index a58ca0ea..00000000
--- a/doc/v2/callbacks.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-Here's the plan:
-
-I aim to provide an interface similar to that of Boost.Python v1's
-callback<>::call(...) for dealing with callbacks. The interface will
-look like:
-
-    returning<ResultType>::call("method_name", self_object, a1, a2...);
-
-or
-
-    returning<ResultType>::call(callable_object, a1, a2...);
-
-ARGUMENT HANDLING
-
-There is an issue concerning how to make Python objects from the
-arguments a1...aN. A new Python object must be created; should the C++
-object be copied into that Python object, or should the Python object
-simply hold a reference/pointer to the C++ object? In general, the
-latter approach is unsafe, since the called function may store a
-reference to the Python object somewhere. If the Python object is used
-after the C++ object is destroyed, we'll crash Python.
-
-I plan to make the copying behavior the default, and to allow a
-non-copying behavior if the user writes boost::ref(a1) instead of a1
-directly. At least this way, the user doesn't get dangerous behavior "by
-accident". It's also worth noting that the non-copying ("by-reference")
-behavior is in general only available for class types, and will fail at
-runtime with a Python exception if used otherwise**
-
-However, pointer types present a problem: My first thought is to refuse
-to compile if any aN has pointer type: after all, a user can always pass
-*aN to pass "by-value" or ref(*aN) to indicate a pass-by-reference
-behavior. However, this creates a problem for the expected NULL pointer
-=> None conversion: it's illegal to dereference a null pointer value.
-
-We could use another construct, say "ptr(aN)", to deal with null
-pointers, but then what does it mean? We know what it does when aN is
-NULL, but it might either have by-value or by-reference behavior when aN
-is non-null.
-
-The compromise I've settled on is this: 
-
-1. The default behavior is pass-by-value. If you pass a non-null
-   pointer, the pointee is copied into a new Python object; otherwise
-   the corresponding Python argument will be None.
-
-2. if you want by-reference behavior, use ptr(aN) if aN is a pointer
-   and ref(aN) otherwise. If a null pointer is passed to ptr(aN), the
-   corresponding Python argument will be None.
-
-RESULT HANDLING
-
-As for results, we have a similar problem: if ResultType is allowed to
-be a pointer or reference type, the lifetime of the object it refers to
-is probably being managed by a Python object. When that Python object is
-destroyed, our pointer dangles. The problem is particularly bad when the
-ResultType is char const* - the corresponding Python String object is
-typically uniquely-referenced, meaning that the pointer dangles as soon
-as returning<char const*>::call() returns.
-
-Boost.Python v1 deals with this issue by refusing to compile any uses of
-callback<char const*>::call(), but IMO this goes both too far and not
-far enough. It goes too far because there are cases where the owning
-String object survives beyond the call (just for instance when it's the
-name of a Python class), and it goes not far enough because we might
-just as well have the same problem with any returned pointer or
-reference.
-
-I propose to address this in Boost.Python v2 by
-
-    1. lifting the compile-time restriction on const
-    char* callback returns
-
-    2. detecting the case when the reference count on the
-    result Python object is 1 and throwing an exception
-    inside of returning<U>::call() when U is a pointer or
-    reference type.
-
-I think this is acceptably safe because users have to explicitly specify
-a pointer/reference for U in returning<U>, and they will be protected
-against dangles at runtime, at least long enough to get out of the
-returning<U>::call() invocation.
-
--Dave
-
-**It would be possible to make it fail at compile-time for non-class
-types such as int and char, but I'm not sure it's a good idea to impose
-this restriction yet.
diff --git a/doc/v2/class.html b/doc/v2/class.html
deleted file mode 100644
index d9105e0b..00000000
--- a/doc/v2/class.html
+++ /dev/null
@@ -1,785 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/class.hpp&gt;,
-    &lt;boost/python/class_fwd.hpp&gt;</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Headers &lt;boost/python/class.hpp&gt;,
-          &lt;boost/python/class_fwd.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#class_-spec">Class template
-          <code>class_</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#class_-spec-synopsis">Class <code>class_</code>
-              synopsis</a></dt>
-
-              <dt><a href="#class_-spec-ctors">Class <code>class_</code>
-              constructors</a></dt>
-
-              <dt><a href="#class_-spec-modifiers">Class <code>class_</code>
-              modifier functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#bases-spec">Class template
-          <code>bases</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#bases-spec-synopsis">Class template
-              <code>bases</code> synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/class.hpp&gt;</code> defines the interface
-    through which users expose their C++ classes to Python. It declares the
-    <code>class_</code> class template, which is parameterized on the class
-    type being exposed. It also exposes the <code>init</code>,
-    <code>optional</code> and <code>bases</code> utility class templates,
-    which are used in conjunction with <code>class_</code>.</p>
-
-    <p><code>&lt;boost/python/class_fwd.hpp&gt;</code> contains a forward
-    declaration of the <code>class_</code> class template.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="class_-spec"></a>Class template
-    <code>class_&lt;T,&nbsp;<font color="#007F00">Bases,&nbsp;HeldType,
-    NonCopyable</font>&gt;</code></h3>
-
-    <p>Creates a Python class associated with the C++ type passed as its
-    first parameter. Although it has four template parameters, only the first
-    one is required. The three optional arguments can actually be supplied
-    <font color="#007F00"><b>in any order</b></font>; Boost.Python determines
-    the role of the argument from its type.<br>
-    <br>
-    </p>
-
-    <table border="1" summary="class_ template parameters">
-      <tr>
-        <th>Template Parameter</th>
-
-        <th>Requirements</th>
-
-        <th>Semantics</th>
-
-        <th>Default</th>
-      </tr>
-
-      <tr>
-        <td><code>T</code></td>
-
-        <td>A class type.</td>
-
-        <td>The class being wrapped</td>
-      </tr>
-
-      <tr>
-        <td><code><font color="#007F00">Bases</font></code></td>
-
-        <td>A specialization of <a href=
-        "#bases-spec"><code>bases&lt;</code>...<code>&gt;</code></a> which
-        specifies previously-exposed C++ base classes of <code>T</code><a
-        href="#footnote_1">[1]</a>.</td>
-
-        <td>Registers <code>from_python</code> conversions from wrapped
-        <code>T</code> instances to each of its exposed direct and indirect
-        bases. For each polymorphic base <code>B</code>, registers
-        conversions from indirectly-held wrapped <code>B</code> instances to
-        <code>T</code>.</td>
-
-        <td><code><a href="#bases">bases&lt;&gt;</a></code></td>
-      </tr>
-
-      <tr>
-        <td><code><font color="#007F00">HeldType</font></code></td>
-
-        <td>Must be <code>T</code>, a class derived from <code>T</code>, or a
-        <a href="Dereferenceable.html">Dereferenceable</a> type for which
-        <code><a href=
-        "pointee.html#pointee-spec">pointee</a>&lt;HeldType&gt;::type</code>
-        is <code>T</code> or a class derived from <code>T</code>.</td>
-
-        <td>Specifies the type which is actually embedded in a Python object
-        wrapping a <code>T</code> instance. More details <a href=
-        "#HeldType">below</a>.</td>
-
-        <td><code>T</code></td>
-      </tr>
-
-      <tr>
-        <td><code><font color="#007F00">NonCopyable</font></code></td>
-
-        <td>If supplied, must be <a href=
-        "../../../utility/utility.htm#Class%20noncopyable">boost::noncopyable</a>.</td>
-
-        <td>Suppresses automatic registration of <code>to_python</code>
-        conversions which copy <code>T</code> instances. Required when
-        <code>T</code> has no publicly-accessible copy constructor.</td>
-
-        <td>An unspecified type other than
-        <code>boost::noncopyable</code>.</td>
-      </tr>
-    </table>
-
-    <h4><a name="#HeldType">HeldType Semantics</a></h4>
-
-    <ol>
-      <li>If <code>HeldType</code> is derived from T, its exposed
-      constructor(s) must accept an initial <code>PyObject*</code> argument
-      which refers back to the Python object that contains the
-      <code>HeldType</code> instance, as shown in <a href=
-      "call_method.html#example">this example</a>. This argument is not
-      included in the <em><a href=
-      "init.html#init-expressions">init-expression</a></em> passed to <a
-      href="#class-spec-modifiers"><code>def(init_expr)</code></a>, below,
-      nor is it passed explicitly by users when Python instances of
-      <code>T</code> are created. This idiom allows C++ virtual functions
-      which will be overridden in Python to access the Python object so the
-      Python method can be invoked. Boost.Python automatically registers
-      additional converters which allow wrapped instances of <code>T</code>
-      to be passed to wrapped C++ functions expecting <code>HeldType</code>
-      arguments.</li>
-
-      <li>Because Boost.Python will always allow wrapped instances of
-      <code>T</code> to be passed in place of <code>HeldType</code>
-      arguments, specifying a smart pointer for <code>HeldType</code> allows
-      users to pass Python <code>T</code> instances where a smart
-      pointer-to-<code>T</code> is expected. Smart pointers such as
-      <code>std::auto_ptr&lt;&gt;</code> or <code><a href=
-      "../../../smart_ptr/shared_ptr.htm">boost::shared_ptr&lt;&gt;</a></code>
-      which contain a nested type <code>element_type</code> designating the
-      referent type are automatically supported; additional smart pointer
-      types can be supported by specializing <a href=
-      "pointee.html#pointee-spec">pointee&lt;HeldType&gt;</a>.</li>
-
-      <li>As in case 1 above, when <code>HeldType</code> is a smart pointer
-      to a class derived from <code>T</code>, the initial
-      <code>PyObject*</code> argument must be supplied by all of
-      <code>HeldType</code>'s exposed constructors.</li>
-
-      <li>Except in cases 1 and 3, users may optionally specify that T itself
-      gets initialized with a similar initial <code>PyObject*</code> argument
-      by specializing <a href=
-      "has_back_reference.html#has_back_reference-spec">has_back_reference&lt;T&gt;</a>.</li>
-    </ol>
-
-    <h4><a name="class_-spec-synopsis"></a>Class template <code>class_</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;class T
-   <font color="#007F00">   , class Bases = bases&lt;&gt;
-            , class HeldType = T
-            , class NonCopyable = <i>unspecified</i>
-           &gt;
-</font>  class class_ : public <a href="object.html#object-spec">object</a>
-  {
-    // Constructors with default __init__
-    class_(char const* name);
-    class_(char const* name, char const* docstring);
-
-    // Constructors, specifying non-default __init__
-    template &lt;class Init&gt;
-    class_(char const* name, Init);
-    template &lt;class Init&gt;
-    class_(char const* name, char const* docstring, Init);
-
-    // Exposing additional __init__ functions
-    template &lt;class Init&gt;
-    class_&amp; def(Init);
-
-    // defining methods
-    template &lt;class F&gt;
-    class_&amp; def(char const* name, F f);
-    template &lt;class Fn, class A1&gt;
-    class_&amp; def(char const* name, Fn fn, A1 const&amp;);
-    template &lt;class Fn, class A1, class A2&gt;
-    class_&amp; def(char const* name, Fn fn, A1 const&amp;, A2 const&amp;);
-    template &lt;class Fn, class A1, class A2, class A3&gt;
-    class_&amp; def(char const* name, Fn fn, A1 const&amp;, A2 const&amp;, A3 const&amp;);
-
-    // declaring method as static
-    class_&amp; staticmethod(char const* name);
-    
-    // exposing operators
-    template &lt;<i>unspecified</i>&gt;
-    class_&amp; def(<a href=
-"operators.html#operator_-spec">detail::operator_</a>&lt;unspecified&gt;);
-
-    // Raw attribute modification
-    template &lt;class U&gt;
-    class_&amp; setattr(char const* name, U const&amp;);
-
-    // exposing data members
-    template &lt;class D&gt;
-    class_&amp; def_readonly(char const* name, D T::*pm);
-
-    template &lt;class D&gt;
-    class_&amp; def_readwrite(char const* name, D T::*pm);
-
-    // exposing static data members
-    template &lt;class D&gt;
-    class_&amp; def_readonly(char const* name, D const&amp; d);
-    template &lt;class D&gt;
-    class_&amp; def_readwrite(char const* name, D&amp; d);
-
-    // property creation
-    template &lt;class Get&gt;
-    void add_property(char const* name, Get const&amp; fget);
-    template &lt;class Get, class Set&gt;
-    void add_property(char const* name, Get const&amp; fget, Set const&amp; fset);
-
-    template &lt;class Get&gt;
-    void add_static_property(char const* name, Get const&amp; fget);
-    template &lt;class Get, class Set&gt;
-    void add_static_property(char const* name, Get const&amp; fget, Set const&amp; fset);
-
-    // pickle support
-    template &lt;typename PickleSuite&gt;
-    self&amp; def_pickle(PickleSuite const&amp;);
-  };
-}}
-</pre>
-
-    <h4><a name="class_-spec-ctors"></a>Class template <code>class_</code>
-    constructors</h4>
-<pre>
-class_(char const* name);
-class_(char const* name, char const* docstring);
-template &lt;class Init&gt;
-class_(char const* name, Init init_spec);
-template &lt;class Init&gt;
-class_(char const* name, char const* docstring, Init init_spec);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>name</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a> which conforms to Python's <a href=
-      "http://www.python.org/doc/current/ref/identifiers.html">identifier
-      naming rules</a>. If <code>docstring</code> is supplied, it must be an
-      <a href="definitions.html#ntbs">ntbs</a>. If <code>init_spec</code> is
-      supplied, it must be either the special enumeration constant
-      <code>no_init</code> or an <a href=
-      "init.html#init-expression">init-expression</a> compatible with
-      <code>T</code>.</dt>
-
-      <dt><b>Effects:</b> Constructs a <code>class_</code> object holding a
-      Boost.Python extension class named <code>name</code>. The
-      <code>name</code>d attribute of the <a href=
-      "scope.html#introduction">current scope</a> is bound to the new
-      extension class.</dt>
-
-      <dd>
-        <ul>
-          <li>If supplied, the value of <code>docstring</code> is bound to
-          the <code>__doc__</code> attribute of the extension class.</li>
-
-          <li>If <code>init_spec</code> is <code>no_init</code>, a special
-          <code>__init__</code> function is generated which always raises a
-          Python exception. Otherwise, <code>this-&gt;def(init_spec)</code>
-          is called.</li>
-
-          <li>If <code>init_spec</code> is not supplied,
-          <code>this-&gt;def(init&lt;&gt;())</code> is called.</li>
-        </ul>
-      </dd>
-
-      <dt><b>Rationale:</b>Allowing the user to specify constructor arguments
-      in the <code>class_&lt;&gt;</code> constructor helps her to avoid the
-      common run-time errors which result from invoking wrapped member
-      functions without having exposed an <code>__init__</code> function
-      which creates the requisite <code>T</code> instance. Types which are
-      not default-constructible will cause a compile-time error unless
-      <code>Init</code> is supplied. The user must always supply
-      <code>name</code> as there is currently no portable method to derive
-      the text of the class name from its type.</dt>
-    </dl>
-
-    <h4><a name="class_-spec-modifiers"></a>Class template
-    <code>class_</code> modifier functions</h4>
-<pre>
-template &lt;class Init&gt;
-class_&amp; def(Init init_expr);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>init_expr</code> is the result of an <a
-      href="init.html#init-expression">init-expression</a> compatible with
-      <code>T</code>.</dt>
-
-      <dt><b>Effects:</b> For each <a href="init.html#init-expressions">valid
-      prefix</a> <em>P</em> of <code>Init</code>, adds an
-      <code>__init__(</code>...<code>)</code> function overload to the
-      extension class accepting <em>P</em> as arguments. Each overload
-      generated constructs an object of <code>HeldType</code> according to
-      the semantics described <a href="#HeldType">above</a>, using a copy of
-      <code>init_expr</code>'s <a href="CallPolicies.html">call policies</a>.
-      If the longest <a href="init.html#init-expressions">valid prefix</a> of
-      <code>Init</code> contains <em>N</em> types and <code>init_expr</code>
-      holds <em>M</em> keywords, an initial sequence of the keywords are used
-      for all but the first <em>N</em>&nbsp;-&nbsp;<em>M</em> arguments of
-      each overload.</dt>
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-
-      <dt><b>Rationale:</b> Allows users to easily expose a class'
-      constructor to Python.</dt>
-    </dl>
-    <br>
-     
-<pre>
-template &lt;class F&gt;
-class_&amp; def(char const* name, Fn fn);
-template &lt;class Fn, class A1&gt;
-class_&amp; def(char const* name, Fn fn, A1 const&amp; a1);
-template &lt;class Fn, class A1, class A2&gt;
-class_&amp; def(char const* name, Fn fn, A1 const&amp; a1, A2 const&amp; a2);
-template &lt;class Fn, class A1, class A2, class A3&gt;
-class_&amp; def(char const* name, Fn fn, A1 const&amp; a1, A2 const&amp; a2, A3 const&amp; a3);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>name</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a> which conforms to Python's <a href=
-      "http://www.python.org/doc/current/ref/identifiers.html">identifier
-      naming rules</a>.</dt>
-
-      <dd>
-        <ul>
-          <li>
-            If <code>a1</code> is the result of an <a href=
-            "overloads.html#overload-dispatch-expression"><em>overload-dispatch-expression</em></a>,
-            only the second form is allowed and fn must be a pointer to
-            function or pointer to member function whose <a href=
-            "definitions.html#arity">arity</a> is the same as A1's <a href=
-            "overloads.html#overload-dispatch-expression"><em>maximum
-            arity</em></a>. 
-
-            <dl>
-              <dt><b>Effects:</b> For each prefix <em>P</em> of
-              <code>Fn</code>'s sequence of argument types, beginning with
-              the one whose length is <code>A1</code>'s <a href=
-              "overloads.html#overload-dispatch-expression"><em>minimum
-              arity</em></a>, adds a
-              <code><em>name</em>(</code>...<code>)</code> method overload to
-              the extension class. Each overload generated invokes
-              <code>a1</code>'s call-expression with <em>P</em>, using a copy
-              of <code>a1</code>'s <a href="CallPolicies.html">call
-              policies</a>. If the longest valid prefix of <code>A1</code>
-              contains <em>N</em> types and <code>a1</code> holds <em>M</em>
-              keywords, an initial sequence of the keywords are used for all
-              but the first <em>N</em>&nbsp;-&nbsp;<em>M</em> arguments of
-              each overload.<br>
-              </dt>
-            </dl>
-          </li>
-
-          <li>
-            Otherwise, a single method overload is built around fn, which
-            must not be null: 
-
-            <ul>
-              <li>If fn is a function pointer, its first argument must be of
-              the form <code>U</code>, <code>U&nbsp;<em>cv</em>&amp;</code>,
-              <code>U&nbsp;<em>cv</em>*</code>, or
-              <code>U&nbsp;<em>cv</em>*&nbsp;const&amp;</code>, where
-              <code>T*</code> is convertible to <code>U*</code>, and
-              <code>a1</code>-<code>a3</code>, if supplied, may be selected
-              in any order from the table below.</li>
-
-              <li>Otherwise, if fn is a member function pointer, its target
-              must be <code>T</code> or one of its public base classes, and
-              <code>a1</code>-<code>a3</code>, if supplied, may be selected
-              in any order from the table below.</li>
-
-              <li>Otherwise, <code>Fn</code> must be [derived from] <code><a
-              href="object.html#object-spec">object</a></code>, and
-              <code>a1-a2</code>, if supplied, may be selcted in any order
-              from the first two rows of the table below. To be useful,
-              <code>fn</code> should be <a href=
-              "http://www.python.org/doc/current/lib/built-in-funcs.html#l2h-6">
-              callable</a>.</li>
-            </ul>
-
-            <table border="1" summary="def() optional arguments">
-              <tr>
-                <th>Memnonic Name</th>
-
-                <th>Requirements/Type properties</th>
-
-                <th>Effects</th>
-              </tr>
-
-              <tr>
-                <td>docstring</td>
-
-                <td>Any <a href="definitions.html#ntbs">ntbs</a>.</td>
-
-                <td>Value will be bound to the <code>__doc__</code> attribute
-                of the resulting method overload.</td>
-              </tr>
-
-              <tr>
-                <td>policies</td>
-
-                <td>A model of <a href=
-                "CallPolicies.html">CallPolicies</a></td>
-
-                <td>A copy will be used as the call policies of the resulting
-                method overload.</td>
-              </tr>
-
-              <tr>
-                <td>keywords</td>
-
-                <td>The result of a <a href=
-                "args.html#keyword-expression"><em>keyword-expression</em></a>
-                specifying no more arguments than the <a href=
-                "definitions.html#arity">arity</a> of <code>fn</code>.</td>
-
-                <td>A copy will be used as the call policies of the resulting
-                method overload.</td>
-              </tr>
-            </table>
-          </li>
-        </ul>
-      </dd>
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-    </dl>
-<pre>
-class_&amp; staticmethod(char const* name);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>name</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a> which conforms to Python's <a href=
-      "http://www.python.org/doc/current/ref/identifiers.html">identifier
-      naming rules</a>, and corresponds to a method whose overloads have all
-      been defined.</dt>
-
-      <dt><b>Effects:</b> Replaces the existing named attribute <i>x</i> with
-      the result of invoking <code>staticmethod(</code><i>x</i><code>)</code>
-      in Python. Specifies that the corresponding method is static and
-      therefore no object instance will be passed to it. This is equivalent
-      to the Python statement:</dt>
-
-      <dd>
-<pre>
-setattr(self, name, staticmethod(getattr(self, name)))
-</pre>
-      </dd>
-
-      <dt><b>Note:</b> Attempting to invoke <code>def(name,...)</code> after
-      invoking <code>staticmethod(name)</code> will <a href=
-      "definitions.html#raise">raise</a> a RuntimeError.</dt>
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-    </dl>
-    <br>
-     
-<pre>
-template &lt;<i>unspecified</i>&gt;
-class_&amp; def(<a href=
-"operators.html#operator_-spec">detail::operator_</a>&lt;unspecified&gt;);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> Adds a Python <a href=
-      "http://www.python.org/doc/ref/specialnames.html">special method</a> as
-      described <a href="operators.html">here</a>.</dt>
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-    </dl>
-<pre>
-template &lt;class U&gt;
-class_&amp; setattr(char const* name, U const&amp; u);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>name</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a> which conforms to Python's <a href=
-      "http://www.python.org/doc/current/ref/identifiers.html">identifier
-      naming rules</a>.</dt>
-
-      <dt><b>Effects:</b> Converts u to Python and adds it to the attribute
-      dictionary of the extension class:</dt>
-
-      <dd>
-        <blockquote>
-          <code><a href=
-          "http://www.python.org/doc/current/api/object.html#l2h-166">PyObject_SetAttrString</a>(this-&gt;ptr(),&nbsp;name,&nbsp;<a
-           href="object.html#object-spec-ctors">object</a>(u).ptr());</code>
-        </blockquote>
-      </dd>
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-    </dl>
-    <br>
-     
-<pre>
-template &lt;class Get&gt;
-void add_property(char const* name, Get const&amp; fget);
-template &lt;class Get, class Set&gt;
-void add_property(char const* name, Get const&amp; fget, Set const&amp; fset);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>name</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a> which conforms to Python's <a href=
-      "http://www.python.org/doc/current/ref/identifiers.html">identifier
-      naming rules</a>.</dt>
-
-      <dt><b>Effects:</b> Creates a new Python <a href=
-      "http://www.python.org/2.2.2/descrintro.html#property"><code>property</code></a>
-      class instance, passing <code><a href=
-      "object.html#object-spec-ctors">object</a>(fget)</code> (and <code><a
-      href="object.html#object-spec-ctors">object</a>(fset)</code> in the
-      second form) to its constructor, then adds that property to the Python
-      class object under construction with the given attribute
-      <code>name</code>.</dt>
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-
-      <dt><b>Rationale:</b> Allows users to easily expose functions that can
-      be invoked from Python with attribute access syntax.</dt>
-    </dl>
-    <br>
-<pre>
-template &lt;class Get&gt;
-void add_static_property(char const* name, Get const&amp; fget);
-template &lt;class Get, class Set&gt;
-void add_static_property(char const* name, Get const&amp; fget, Set const&amp; fset);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>name</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a> which conforms to Python's <a href=
-      "http://www.python.org/doc/current/ref/identifiers.html">identifier
-      naming rules</a>.</dt>
-
-      <dt><b>Effects:</b> Creates a Boost.Python.StaticProperty object,
-      passing <code><a href=
-      "object.html#object-spec-ctors">object</a>(fget)</code> (and <code><a
-      href="object.html#object-spec-ctors">object</a>(fset)</code> in the
-      second form) to its constructor, then adds that property to the Python
-      class under construction with the given attribute <code>name</code>.
-      StaticProperty is a special subclass of Python's <a href=
-      "http://www.python.org/2.2.2/descrintro.html#property"><code>property</code></a>
-      class which can be called without an initial <code>self</code>
-      argument.</dt>
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-
-      <dt><b>Rationale:</b> Allows users to easily expose functions that can
-      be invoked from Python with static attribute access syntax.</dt>
-    </dl>
-    <br>
-<pre>
-template &lt;class D&gt;
-class_&amp; def_readonly(char const* name, D T::*pm);
-template &lt;class D&gt;
-class_&amp; def_readonly(char const* name, D const&amp; d);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>name</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a> which conforms to Python's <a href=
-      "http://www.python.org/doc/current/ref/identifiers.html">identifier
-      naming rules</a>.</dt>
-
-      <dt><b>Effects:</b></dt>
-
-      <dd>
-<pre>
-this-&gt;add_property(name, <a href=
-"data_members.html#make_getter-spec">make_getter</a>(pm));
-</pre>
-        and 
-<pre>
-this-&gt;add_static_property(name, <a href=
-"data_members.html#make_getter-spec">make_getter</a>(pm));
-</pre>
-        respectively.<br>
-        <br>
-      </dd>
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-
-      <dt><b>Rationale:</b> Allows users to easily expose a class' data
-      member or free variable such that it can be inspected from Python with
-      a natural syntax.</dt>
-    </dl>
-<pre>
-template &lt;class D&gt;
-class_&amp; def_readwrite(char const* name, D T::*pm);
-template &lt;class D&gt;
-class_&amp; def_readwrite(char const* name, D&amp; d);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b></dt>
-
-      <dd>
-<pre>
-this-&gt;add_property(name, <a href=
-"data_members.html#make_getter-spec">make_getter</a>(pm), <a href=
-"data_members.html#make_setter-spec">make_setter</a>(pm));
-</pre>
-        and 
-<pre>
-this-&gt;add_static_property(name, <a href=
-"data_members.html#make_getter-spec">make_getter</a>(pm), <a href=
-"data_members.html#make_setter-spec">make_setter</a>(pm));
-</pre>
-        respectively.<br>
-        <br>
-      </dd>
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-
-      <dt><b>Rationale:</b> Allows users to easily expose a class' data or
-      free variable member such that it can be inspected and set from Python
-      with a natural syntax.</dt>
-    </dl>
-<pre>
-template &lt;typename PickleSuite&gt;
-class_&amp; def_pickle(PickleSuite const&amp;);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> PickleSuite must be publically derived from <a
-      href="pickle.html"><code>pickle_suite</code></a>.</dt>
-
-      <dt><b>Effects:</b> Defines a legal combination of the special
-      attributes and methods: <code>__getinitargs__</code>,
-      <code>__getstate__</code>, <code>__setstate__</code>,
-      <code>__getstate_manages_dict__</code>,
-      <code>__safe_for_unpickling__</code>, <code>__reduce__</code></dt>
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-
-      <dt><b>Rationale:</b> Provides an <a href="pickle.html">easy to use
-      high-level interface</a> for establishing complete pickle support for
-      the wrapped class. The user is protected by compile-time consistency
-      checks.</dt>
-    </dl>
-    <br>
-     
-
-    <h3><a name="bases-spec"></a>Class template
-    <code>bases&lt;T1,&nbsp;T2,</code>...<code>TN&gt;</code></h3>
-
-    <p>An <a href="../../../mpl/doc/ref/Sequences.html">MPL sequence</a>
-    which can be used in <code>class_&lt;</code>...<code>&gt;</code>
-    instantiations indicate a list of base classes.</p>
-
-    <h4><a name="bases-spec-synopsis"></a>Class template <code>bases</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;T1 = <i>unspecified</i>,...T<i>n</i> = <i>unspecified</i>&gt;
-  struct bases
-  {};
-}}
-</pre>
-
-    <h2><a name="examples"></a>Example(s)</h2>
-
-    <p>Given a C++ class declaration:</p>
-<pre>
-class Foo : public Bar, public Baz
-{
- public:
-   Foo(int x, char const* y);
-   Foo(double);
-
-   std::string const&amp; name() { return m_name; }
-   void name(char const*);
-
-   double value; // public data
- private:
-   ...
-};
-</pre>
-    A corresponding Boost.Python extension class can be created with: 
-<pre>
-using namespace boost::python;
-
-class_&lt;Foo,bases&lt;Bar,Baz&gt; &gt;("Foo",
-          "This is Foo's docstring."
-          "It describes our Foo extension class",
-
-          init&lt;int,char const*&gt;(args("x","y"), "__init__ docstring")
-          )
-   .def(init&lt;double&gt;())
-   .def("get_name", &amp;Foo::get_name, return_internal_reference&lt;&gt;())
-   .def("set_name", &amp;Foo::set_name)
-   .def_readwrite("value", &amp;Foo::value)
-   ;
-</pre>
-    <hr>
-    <a name="footnote_1">[1]</a> By "previously-exposed" we mean that the for
-    each <code>B</code> in <code>bases</code>, an instance of
-    <code>class_&lt;B<font color="#007F00">, ...</font>&gt;</code> must have
-    already been constructed. 
-<pre>
-class_&lt;Base&gt;("Base");
-class_&lt;Derived, bases&lt;Base&gt; &gt;("Derived");
-</pre>
-    Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     5 August, 2002 <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-     
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/configuration.html b/doc/v2/configuration.html
deleted file mode 100644
index feee4a05..00000000
--- a/doc/v2/configuration.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - Configuration</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Configuration</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#app-defined">Application Defined Macros</a></dt>
-
-      <dt><a href="#lib-defined-impl">Library Defined Implementation
-      Macros</a></dt>
-    </dl>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><b>Boost.Python</b> uses several configuration macros in <a href=
-    "http://www.boost.org/libs/config/config.htm">&lt;boost/config.hpp&gt;</a>,
-    as well as configuration macros meant to be supplied by the application.
-    These macros are documented here.</p>
-
-    <h2><a name="app-defined"></a>Application Defined Macros</h2>
-
-    <p>These are the macros that may be defined by an application using
-    <b>Boost.Python</b>. Note that if you extend a strict interpretation of
-    the C++ standard to cover dynamic libraries, using different values of
-    these macros when compiling different libraries (including extension
-    modules and the <b>Boost.Python</b> library itself) is a violation of the
-    <a href="definitions.html#ODR">ODR</a>. However, we know of no C++
-    implementations on which this particular violation is detectable or
-    causes any problems.</p>
-
-    <table summary="application defined macros" width="100%" cellpadding=
-    "10">
-      <tr>
-        <th align="left"><b>Macro</b></th>
-
-        <th><b>Default</b></th>
-
-        <th align="left"><b>Meaning</b></th>
-      </tr>
-
-      <tr>
-        <td valign="top"><code>BOOST_PYTHON_MAX_ARITY</code></td>
-
-        <td valign="top" align="center">15</td>
-
-        <td valign="top">The maximum <a href=
-        "definitions.html#arity">arity</a> of any function, member function,
-        or constructor to be wrapped, invocation of a <b>Boost.Python</b>
-        function wich is specified as taking arguments
-        <code>x1,&nbsp;x2,</code>...<code>X</code><i>n</i>. This includes, in
-        particular, callback mechanisms such as <code><a href=
-        "object.html#object-spec">object</a>::operator()(</code>...<code>)</code>
-        or <code><a href=
-        "call_method.html#call_method-spec">call_method</a>&lt;R&gt;(</code>...
-        <code>)</code>.</td>
-      </tr>
-
-      <tr>
-        <td valign="top"><code>BOOST_PYTHON_MAX_BASES</code></td>
-
-        <td valign="top" align="center">10</td>
-
-        <td valign="top">The maximum number of template arguments to the
-        <code><a href=
-        "class.html#bases-spec">bases</a>&lt;</code>...<code>&gt;</code>
-        class template, which is used to specify the bases of a wrapped C++
-        class..</td>
-      </tr>
-
-      <tr>
-        <td valign="top"><code>BOOST_PYTHON_STATIC_MODULE</code></td>
-
-        <td valign="top" align="center"><i>not&nbsp;defined</i></td>
-
-        <td valign="top">If defined, prevents your module initialization
-        function from being treated as an exported symbol on platforms which
-        support that distinction in-code</td>
-      </tr>
-    </table>
-
-    <h2><a name="lib-defined-impl"></a>Library Defined Implementation
-    Macros</h2>
-
-    <p>These macros are defined by <b>Boost.Python</b> and are implementation
-    details of interest only to implementors and those porting to new
-    platforms.</p>
-
-    <table summary="library defined implementation macros" width="100%"
-    cellpadding="10">
-      <tr>
-        <th align="left"><b>Macro</b></th>
-
-        <th><b>Default</b></th>
-
-        <th align="left"><b>Meaning</b></th>
-      </tr>
-
-      <tr>
-        <td valign="top"><code>BOOST_PYTHON_TYPE_ID_NAME</code></td>
-
-        <td valign="top" align="center"><i>not&nbsp;defined</i></td>
-
-        <td valign="top">If defined, this indicates that the type_info
-        comparison across shared library boundaries does not work on this
-        platform. In other words, if shared-lib-1 passes
-        <code>typeid(T)</code> to a function in shared-lib-2 which compares
-        it to <code>typeid(T)</code>, that comparison may return
-        <code>false</code>. If this macro is #defined, Boost.Python uses and
-        compares <code>typeid(T).name()</code> instead of using and comparing
-        the <code>std::type_info</code> objects directly.</td>
-      </tr>
-    </table>
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     7 January, 2003 
-    <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/copy_const_reference.html b/doc/v2/copy_const_reference.html
deleted file mode 100644
index c65fc21c..00000000
--- a/doc/v2/copy_const_reference.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python -
-    &lt;boost/python/copy_const_reference.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/copy_const_reference.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#copy_const_reference-spec">Class
-          <code>copy_const_reference</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#copy_const_reference-spec-synopsis">Class
-              <code>copy_const_reference</code> synopsis</a></dt>
-
-              <dt><a href="#copy_const_reference-spec-metafunctions">Class
-              <code>copy_const_reference</code> metafunctions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="copy_const_reference-spec"></a>Class
-    <code>copy_const_reference</code></h3>
-
-    <p><code>copy_const_reference</code> is a model of <a href=
-    "ResultConverter.html#ResultConverterGenerator-concept">ResultConverterGenerator</a>
-    which can be used to wrap C++ functions returning a reference-to-const
-    type such that the referenced value is copied into a new Python
-    object.</p>
-
-    <h4><a name="copy_const_reference-spec-synopsis"></a>Class
-    <code>copy_const_reference</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    struct copy_const_reference
-    {
-        template &lt;class T&gt; struct apply;
-    };
-}}
-</pre>
-
-    <h4><a name="copy_const_reference-spec-metafunctions"></a>Class
-    <code>copy_const_reference</code> metafunctions</h4>
-<pre>
-template &lt;class T&gt; struct apply
-</pre>
-
-    <dl class="metafunction-semantics">
-      <dt><b>Requires:</b> <code>T</code> is <code>U const&amp;</code> for
-      some <code>U</code>.</dt>
-
-      <dt><b>Returns:</b> <code>typedef <a href=
-      "to_python_value.html#to_python_value-spec">to_python_value</a>&lt;T&gt;
-      type;</code></dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <h3>C++ Module Definition</h3>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/copy_const_reference.hpp&gt;
-#include &lt;boost/python/return_value_policy.hpp&gt;
-
-// classes to wrap
-struct Bar { int x; }
-
-struct Foo {
-   Foo(int x) : { b.x = x; }
-   Bar const&amp; get_bar() const { return b; }
- private:
-   Bar b;
-};
-
-// Wrapper code
-using namespace boost::python;
-BOOST_PYTHON_MODULE(my_module)
-{
-    class_&lt;Bar&gt;("Bar");
-
-     class_&lt;Foo&gt;("Foo", init&lt;int&gt;())
-        .def("get_bar", &amp;Foo::get_bar
-            , return_value_policy&lt;copy_const_reference&gt;())
-       ;
-}
-</pre>
-
-    <h3>Python Code</h3>
-<pre>
-&gt;&gt;&gt; from my_module import *
-&gt;&gt;&gt; f = Foo(3)         # create a Foo object
-&gt;&gt;&gt; b = f.get_bar()    # make a copy of the internal Bar object
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/copy_non_const_reference.html b/doc/v2/copy_non_const_reference.html
deleted file mode 100644
index 9cce0e74..00000000
--- a/doc/v2/copy_non_const_reference.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python -
-    &lt;boost/python/copy_non_const_reference.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/copy_non_const_reference.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#copy_non_const_reference-spec">Class
-          <code>copy_non_const_reference</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#copy_non_const_reference-spec-synopsis">Class
-              <code>copy_non_const_reference</code> synopsis</a></dt>
-
-              <dt><a href=
-              "#copy_non_const_reference-spec-metafunctions">Class
-              <code>copy_non_const_reference</code> metafunctions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="copy_non_const_reference-spec"></a>Class
-    <code>copy_non_const_reference</code></h3>
-
-    <p><code>copy_non_const_reference</code> is a model of <a href=
-    "ResultConverter.html#ResultConverterGenerator-concept">ResultConverterGenerator</a>
-    which can be used to wrap C++ functions returning a
-    reference-to-non-const type such that the referenced value is copied into
-    a new Python object.</p>
-
-    <h4><a name="copy_non_const_reference-spec-synopsis"></a>Class
-    <code>copy_non_const_reference</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    struct copy_non_const_reference
-    {
-        template &lt;class T&gt; struct apply;
-    };
-}}
-</pre>
-
-    <h4><a name="copy_non_const_reference-spec-metafunctions"></a>Class
-    <code>copy_non_const_reference</code> metafunctions</h4>
-<pre>
-template &lt;class T&gt; struct apply
-</pre>
-
-    <dl class="metafunction-semantics">
-      <dt><b>Requires:</b> <code>T</code> is <code>U&amp;</code> for some
-      non-const <code>U</code>.</dt>
-
-      <dt><b>Returns:</b> <code>typedef <a href=
-      "to_python_value.html#to_python_value-spec">to_python_value</a>&lt;T&gt;
-      type;</code></dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <p>C++ code:</p>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/copy_non_const_reference.hpp&gt;
-#include &lt;boost/python/return_value_policy.hpp&gt;
-
-// classes to wrap
-struct Bar { int x; }
-
-struct Foo {
-   Foo(int x) : { b.x = x; }
-   Bar&amp; get_bar() { return b; }
- private:
-   Bar b;
-};
-
-// Wrapper code
-using namespace boost::python;
-BOOST_PYTHON_MODULE(my_module)
-{
-    class_&lt;Bar&gt;("Bar");
-
-     class_&lt;Foo&gt;("Foo", init&lt;int&gt;())
-        .def("get_bar", &amp;Foo::get_bar
-            , return_value_policy&lt;copy_non_const_reference&gt;())
-       ;
-}
-</pre>
-    Python Code: 
-<pre>
-&gt;&gt;&gt; from my_module import *
-&gt;&gt;&gt; f = Foo(3)         # create a Foo object
-&gt;&gt;&gt; b = f.get_bar()    # make a copy of the internal Bar object
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/data_members.html b/doc/v2/data_members.html
deleted file mode 100644
index e6fa8a91..00000000
--- a/doc/v2/data_members.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/data_members.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/data_members.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#make_getter-spec">make_getter</a></dt>
-
-          <dt><a href="#make_setter-spec">make_setter</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code><a href="#make_getter-spec">make_getter</a>()</code> and
-    <code><a href="#make_setter-spec">make_setter</a>()</code> are the
-    functions used internally by <code>class_&lt;&gt;::<a href=
-    "class.html#class_-spec-modifiers">def_readonly</a></code> and
-    <code>class_&lt;&gt;::<a href=
-    "class.html#class_-spec-modifiers">def_readwrite</a></code> to produce
-    Python callable objects which wrap C++ data members.</p>
-
-    <h2><a name="functions"></a>Functions</h2>
-<pre>
-<a name="make_getter-spec">template &lt;class C, class D&gt;</a>
-<a href="object.html#object-spec">object</a> make_getter(D C::*pm);
-
-template &lt;class C, class D, class Policies&gt;
-<a href=
-"object.html#object-spec">object</a> make_getter(D C::*pm, Policies const&amp; policies);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>Policies</code> is a model of <a href=
-      "CallPolicies.html">CallPolicies</a>.</dt>
-
-      <dt><b>Effects:</b> Creates a Python callable object which accepts a
-      single argument that can be converted <code>from_python</code> to
-      <code>C*</code>, and returns the corresponding member <code>D</code>
-      member of the <code>C</code> object, converted <code>to_python</code>.
-      If <code>policies</code> is supplied, it will be applied to the
-      function as described <a href="CallPolicies.html">here</a>. Otherwise,
-      the library attempts to determine whether <code>D</code> is a
-      user-defined class type, and if so uses <code><a href=
-      "return_internal_reference.html#return_internal_reference-spec">return_internal_reference</a>&lt;&gt;</code></dt>
-
-      <dt>for <code>Policies</code>. Note that this test may inappropriately
-      choose <code>return_internal_reference&lt;&gt;</code> in some cases
-      when <code>D</code> is a smart pointer type. This is a known
-      defect.</dt>
-
-      <dt><b>Returns:</b> An instance of <a href=
-      "object.html#object-spec">object</a> which holds the new Python
-      callable object.</dt>
-    </dl>
-<pre>
-template &lt;class D&gt;
-<a href="object.html#object-spec">object</a> make_getter(D const&amp; d);
-template &lt;class D, class Policies&gt;
-<a href=
-"object.html#object-spec">object</a> make_getter(D const&amp; d, Policies const&amp; policies);
-
-template &lt;class D&gt;
-<a href="object.html#object-spec">object</a> make_getter(D const* p);
-template &lt;class D, class Policies&gt;
-<a href=
-"object.html#object-spec">object</a> make_getter(D const* p, Policies const&amp; policies);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>Policies</code> is a model of <a href=
-      "CallPolicies.html">CallPolicies</a>.</dt>
-
-      <dt><b>Effects:</b> Creates a Python callable object which accepts no
-      arguments and returns <code>d</code> or <code>*p</code>, converted
-      <code>to_python</code> on demand. If <code>policies</code> is supplied,
-      it will be applied to the function as described <a href=
-      "CallPolicies.html">here</a>. Otherwise, the library attempts to
-      determine whether <code>D</code> is a user-defined class type, and if
-      so uses <code><a href=
-      "reference_existing_object.html#reference_existing_object-spec">reference_existing_object</a></code></dt>
-
-      <dt>for <code>Policies</code>.</dt>
-
-      <dt><b>Returns:</b> An instance of <a href=
-      "object.html#object-spec">object</a> which holds the new Python
-      callable object.</dt>
-    </dl>
-<pre>
-<a name="make_setter-spec">template &lt;class C, class D&gt;</a>
-<a href="object.html#object-spec">object</a> make_setter(D C::*pm);
-
-template &lt;class C, class D, class Policies&gt;
-<a href=
-"object.html#object-spec">object</a> make_setter(D C::*pm, Policies const&amp; policies);
-</pre>
-
-    <dl class="function*-semantics">
-      <dt><b>Requires:</b> <code>Policies</code> is a model of <a href=
-      "CallPolicies.html">CallPolicies</a>.</dt>
-
-      <dt><b>Effects:</b> Creates a Python callable object which, when called
-      from Python, expects two arguments which can be converted
-      <code>from_python</code> to <code>C*</code> and
-      <code>D&nbsp;const&amp;</code>, respectively, and sets the
-      corresponding <code>D</code> member of the <code>C</code> object. If
-      <code>policies</code> is supplied, it will be applied to the function
-      as described <a href="CallPolicies.html">here</a>.</dt>
-
-      <dt><b>Returns:</b> An instance of <a href=
-      "object.html#object-spec">object</a> which holds the new Python
-      callable object.</dt>
-    </dl>
-<pre>
-template &lt;class D&gt;
-<a href="object.html#object-spec">object</a> make_setter(D&amp; d);
-template &lt;class D, class Policies&gt;
-<a href=
-"object.html#object-spec">object</a> make_setter(D&amp; d, Policies const&amp; policies);
-
-template &lt;class D&gt;
-<a href="object.html#object-spec">object</a> make_setter(D* p);
-template &lt;class D, class Policies&gt;
-<a href=
-"object.html#object-spec">object</a> make_setter(D* p, Policies const&amp; policies);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>Policies</code> is a model of <a href=
-      "CallPolicies.html">CallPolicies</a>.</dt>
-
-      <dt><b>Effects:</b> Creates a Python callable object which accepts one
-      argument, which is converted from Python to <code>D const&amp;</code>
-      and written into <code>d</code> or <code>*p</code>, respectively. If
-      <code>policies</code> is supplied, it will be applied to the function
-      as described <a href="CallPolicies.html">here</a>.</dt>
-
-      <dt><b>Returns:</b> An instance of <a href=
-      "object.html#object-spec">object</a> which holds the new Python
-      callable object.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <p>The code below uses make_getter and make_setter to expose a data
-    member as functions:</p>
-<pre>
-#include &lt;boost/python/data_members.hpp&gt;
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-
-struct X
-{
-    X(int x) : y(x) {}
-    int y;
-};
-
-using namespace boost::python;
-
-BOOST_PYTHON_MODULE_INIT(data_members_example)
-{
-    class_&lt;X&gt;("X", init&lt;int&gt;())
-       .def("get", make_getter(&amp;X::y))
-       .def("set", make_setter(&amp;X::y))
-       ;
-}
-</pre>
-    It can be used this way in Python: 
-<pre>
-&gt;&gt;&gt; from data_members_example import *
-&gt;&gt;&gt; x = X(1)
-&gt;&gt;&gt; x.get()
-1
-&gt;&gt;&gt; x.set(2)
-&gt;&gt;&gt; x.get()
-2
-</pre>
-
-    <p>
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     5 August, 2003 <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/def.html b/doc/v2/def.html
deleted file mode 100644
index 80978a87..00000000
--- a/doc/v2/def.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/def.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/def.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#def-spec">def</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code><a href="#def-spec">def</a>()</code> is the function which can
-    be used to expose C++ functions and callable objects as Python functions
-    in the current <code><a href="scope.html">scope</a></code>.</p>
-
-    <h2><a name="functions"></a>Functions</h2>
-    <a name="def-spec"></a>def 
-<pre>
-template &lt;class F&gt;
-void def(char const* name, F f);
-
-template &lt;class Fn, class A1&gt;
-void def(char const* name, Fn fn, A1 const&amp;);
-
-template &lt;class Fn, class A1, class A2&gt;
-void def(char const* name, Fn fn, A1 const&amp;, A2 const&amp;);
-
-template &lt;class Fn, class A1, class A2, class A3&gt;
-void def(char const* name, Fn fn, A1 const&amp;, A2 const&amp;, A3 const&amp;);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>name</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a> which conforms to Python's <a href=
-      "http://www.python.org/doc/current/ref/identifiers.html">identifier
-      naming rules</a>.</dt>
-
-      <dd>
-        <ul>
-          <li>If <code>Fn</code> is [derived from] <code><a href=
-          "object.html#object-spec">object</a></code>, it will be added to
-          the current scope as a single overload. To be useful,
-          <code>fn</code> should be <a href=
-          "http://www.python.org/doc/current/lib/built-in-funcs.html#l2h-6">callable</a>.</li>
-
-          <li>
-            If <code>a1</code> is the result of an <a href=
-            "overloads.html#overload-dispatch-expression"><em>overload-dispatch-expression</em></a>,
-            only the second form is allowed and fn must be a pointer to
-            function or pointer to member function whose <a href=
-            "definitions.html#arity">arity</a> is the same as A1's <a href=
-            "overloads.html#overload-dispatch-expression"><em>maximum
-            arity</em></a>. 
-
-            <dl>
-              <dt><b>Effects:</b> For each prefix <em>P</em> of
-              <code>Fn</code>'s sequence of argument types, beginning with
-              the one whose length is <code>A1</code>'s <a href=
-              "overloads.html#overload-dispatch-expression"><em>minimum
-              arity</em></a>, adds a
-              <code><em>name</em>(</code>...<code>)</code> function overload
-              to the <a href="scope.html">current scope</a>. Each overload
-              generated invokes <code>a1</code>'s call-expression with
-              <em>P</em>, using a copy of <code>a1</code>'s <a href=
-              "CallPolicies.html">call policies</a>. If the longest valid
-              prefix of <code>A1</code> contains <em>N</em> types and
-              <code>a1</code> holds <em>M</em> keywords, an initial sequence
-              of the keywords are used for all but the first
-              <em>N</em>&nbsp;-&nbsp;<em>M</em> arguments of each
-              overload.<br>
-              </dt>
-            </dl>
-          </li>
-
-          <li>Otherwise, fn must be a non-null function or member function
-          pointer, and a single function overload built around fn is added to
-          the <a href="scope.html">current scope</a>. If any of
-          <code>a1</code>-<code>a3</code> are supplied, they may be selected
-          in any order from the table below.</li>
-        </ul>
-
-        <table border="1" summary="def() optional arguments">
-          <tr>
-            <th>Memnonic Name</th>
-
-            <th>Requirements/Type properties</th>
-
-            <th>Effects</th>
-          </tr>
-
-          <tr>
-            <td>docstring</td>
-
-            <td>Any <a href="definitions.html#ntbs">ntbs</a>.</td>
-
-            <td>Value will be bound to the <code>__doc__</code> attribute of
-            the resulting method overload.</td>
-          </tr>
-
-          <tr>
-            <td>policies</td>
-
-            <td>A model of <a href="CallPolicies.html">CallPolicies</a></td>
-
-            <td>A copy will be used as the call policies of the resulting
-            method overload.</td>
-          </tr>
-
-          <tr>
-            <td>keywords</td>
-
-            <td>The result of a <a href=
-            "args.html#keyword-expression"><em>keyword-expression</em></a>
-            specifying no more arguments than the <a href=
-            "definitions.html#arity">arity</a> of <code>fn</code>.</td>
-
-            <td>A copy will be used as the call policies of the resulting
-            method overload.</td>
-          </tr>
-        </table>
-      </dd>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-#include &lt;boost/python/def.hpp&gt;
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/args.hpp&gt;
-
-using namespace boost::python;
-
-char const* foo(int x, int y) { return "foo"; }
-
-BOOST_PYTHON_MODULE(def_test)
-{
-    def("foo", foo, args("x", "y"), "foo's docstring");
-}
-</pre>
-
-    <p>
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     7 March, 2003
-    <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/def_visitor.html b/doc/v2/def_visitor.html
deleted file mode 100644
index 63d01b58..00000000
--- a/doc/v2/def_visitor.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <meta name="generator" content="Microsoft FrontPage 5.0">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/def_visitor.hpp&gt;</title>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html"><font size="7">Boost.Python</font></a></h1>
-
-          <h2 align="center">Header &lt;boost/python/def_visitor.hpp&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    
-<dl class="page-index">
-  <dt><a href="#introduction">Introduction</a> 
-  <dt><a href="#classes">Classes</a> 
-  <dd> 
-    <dl class="page-index">
-      <dt><a href="#def_visitor-spec">Class <code>def_visitor</code></a>
-      <dd> <a href="#def_visitor-synopsis">Class <code>def_visitor</code> 
-        synopsis</a></dd>
-      <dd> <a href="#def_visitor-requirements">Class <code>def_visitor</code> 
-        requirements</a></dd>
-    </dl>
-  <dt><a href="#examples">Example</a> 
-</dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    
-<p><code>&lt;boost/python/def_visitor.hpp&gt;</code> provides a generic visitation 
-  interface through which the <a href="class.html">class_</a> <b>def</b> member 
-  functionality can be extended non-intrusively to avoid cluttering the <a href="class.html">class_</a> 
-  interface. It declares the <code>def_visitor&lt;T&gt; </code>class template, 
-  which is parameterized on the derived type <tt>DerivedVisitor</tt>, which provides 
-  the actual <b>def</b> functionality through its <b>visit</b> member functions.
-<h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="def_visitor-spec"></a>Class template <code>def_visitor&lt;DerivedVisitor&gt;</code></h3>
-
-    
-<p>The class def_visitor is a base class paramaterized by its derived class. The 
-  def_visitor class is a protocol class. Its derived class, DerivedVisitor, is 
-  expected to have a member function visit. The def_visitor class is never instantiated 
-  directly. Instead, an instance of its subclass, DerivedVisitor,&nbsp; is passed 
-  on as an argument to the <a href="class.html">class_</a> def member function.
-<h4>
-<a name="def_visitor-synopsis" id="def_visitor-synopsis"></a>Class <code>def_visitor </code>synopsis</h4>
-<pre>namespace boost { namespace python {
-
-    template &lt;class DerivedVisitor&gt;
-    class def_visitor {};
-}</pre>
-<h3><a name="def_visitor-requirements"></a><code>def_visitor </code>requirements</h3>
-
-    
-<p>The <span class="pre">client supplied class </span><span class="pre"></span><tt class="literal"><span class="pre">DerivedVisitor</span></tt> 
-  template parameter is expected to:
-<ul>
-  <li>be privately derived from def_visitor</li>
-  <li>grant friend access to class def_visitor_access</li>
-  <li>define either or both visit member functions listed in the table below:</li>
-</ul>
-
-    
-<table border class="table">
-  <tr> 
-    <td width="181" nowrap><b>Expression</b></td>
-    <td width="85"><b>Return Type</b></td>
-    <td width="330"><b>Requirements</b></td>
-    <td width="259"><b>Effects</b></td>
-  </tr>
-  <tr> 
-    <td nowrap>visitor.visit(cls)</td>
-    <td>void</td>
-    <td>cls is an instance of a <a href="class.html">class_</a>&nbsp; being wrapped 
-      to Python. visitor is a def_visitor derived class.</td>
-    <td>A call to cls.def(visitor) forwards to this member function.</td>
-  </tr>
-  <tr> 
-    <td nowrap>visitor.visit(cls, name, options)</td>
-    <td>void</td>
-    <td>cls is a class_ instance, name is a C string. visitor is a def_visitor 
-      derived class. options is a context specific optional argument.</td>
-    <td>A call to cls.def(name, visitor) or cls.def(name, visitor, options) forwards 
-      to this member function. </td>
-  </tr>
-</table>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    
-<pre>class X {/*...*/};<br>
-class my_def_visitor : boost::python::def_visitor&lt;my_def_visitor&gt;
-{
-    friend class def_visitor_access;
-
-    template &lt;class classT&gt;
-    void visit(classT&amp; c) const
-    {
-        c
-            .def(&quot;foo&quot;, &amp;my_def_visitor::foo)
-            .def(&quot;bar&quot;, &amp;my_def_visitor::bar)
-        ;
-    }
-
-    static void foo(X&amp; self);
-    static void bar(X&amp; self);
-};
-
-BOOST_PYTHON_MODULE(my_ext)
-{ 
-    class_&lt;X&gt;(&quot;X&quot;)
-        .def(my_def_visitor())
-    ;
-}
-</pre>
-  <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->27 August, 2003<!--webbot bot="Timestamp" endspan i-checksum="34484" -->
-  </p>
-
-
-    <p><i>&copy; Copyright Joel de Guzman 2003. All Rights Reserved.</i>
\ No newline at end of file
diff --git a/doc/v2/default_call_policies.html b/doc/v2/default_call_policies.html
deleted file mode 100644
index 90f816fa..00000000
--- a/doc/v2/default_call_policies.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python -
-    &lt;boost/python/default_call_policies.hpp&gt;</title>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/default_call_policies.hpp&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#classes">Classes</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#default_call_policies-spec">Class
-          <code>default_call_policies</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#default_call_policies-spec-synopsis">Class
-              <code>default_call_policies</code> synopsis</a>
-
-              <dt><a href="#default_call_policies-spec-statics">Class
-              <code>default_call_policies</code> static functions</a>
-            </dl>
-
-          <dt><a href="#default_result_converter-spec">Class
-          <code>default_result_converter</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#default_result_converter-spec-synopsis">Class
-              <code>default_result_converter</code> synopsis</a>
-
-              <dt><a href="#default_result_converter-spec-metafunctions">Class
-              <code>default_result_converter</code> metafunctions</a>
-            </dl>
-        </dl>
-
-      <dt><a href="#examples">Example</a>
-    </dl>
-    <hr>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="default_call_policies-spec"></a>Class
-    <code>default_call_policies</code></h3>
-
-    <p><code>default_call_policies</code> is a model of <a href=
-    "CallPolicies.html">CallPolicies</a> with no <code>precall</code> or
-    <code>postcall</code> behavior and a <code>result_converter</code> which
-    handles by-value returns. Wrapped C++ functions and member functions use
-    <code>default_call_policies</code> unless otherwise specified. You may find
-    it convenient to derive new models of <a href=
-    "CallPolicies.html">CallPolicies</a> from
-    <code>default_call_policies</code>.
-
-    <h4><a name="default_call_policies-spec-synopsis"></a>Class
-    <code>default_call_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    struct default_call_policies
-    {
-        static bool precall(PyObject*);
-        static PyObject* postcall(PyObject*, PyObject* result);
-        typedef <a href=
-"#default_result_converter-spec">default_result_converter</a> result_converter;
-    };
-}}
-</pre>
-
-    <h4><a name="default_call_policies-spec-statics"></a>Class
-    <code>default_call_policies</code> static functions</h4>
-<pre>
-bool precall(PyObject*);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>true</code>
-
-      <dt><b>Throws:</b> nothing
-    </dl>
-<pre>
-PyObject* postcall(PyObject*, PyObject* result);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>result</code>
-
-      <dt><b>Throws:</b> nothing
-    </dl>
-
-    <h3><a name="default_result_converter-spec"></a>Class
-    <code>default_result_converter</code></h3>
-
-    <p><code>default_result_converter</code> is a model of <a href=
-    "ResultConverter.html#ResultConverterGenerator-concept">ResultConverterGenerator</a> which can be
-    used to wrap C++ functions returning non-pointer types, <code>char
-    const*</code>, and <code>PyObject*</code>, by-value.
-
-    <h4><a name="default_result_converter-spec-synopsis"></a>Class
-    <code>default_result_converter</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    struct default_result_converter
-    {
-        template &lt;class T&gt; struct apply;
-    };
-}}
-</pre>
-
-    <h4><a name="default_result_converter-spec-metafunctions"></a>Class
-    <code>default_result_converter</code> metafunctions</h4>
-<pre>
-template &lt;class T&gt; struct apply
-</pre>
-
-    <dl class="metafunction-semantics">
-      <dt><b>Requires:</b> <code>T</code> is not a reference type. If
-      <code>T</code> is a pointer type, <code>T</code> is <code>const
-      char*</code> or <code>PyObject*</code>.
-
-      <dt><b>Returns:</b> <code>typedef <a href=
-      "to_python_value.html#to_python_value-spec">to_python_value</a>&lt;T
-      const&amp;&gt; type;</code>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <p>This example comes from the Boost.Python implementation itself. Because
-    the <a href=
-    "return_value_policy.html#return_value_policy-spec">return_value_policy</a>
-    class template does not implement <code>precall</code> or
-    <code>postcall</code> behavior, its default base class is
-    <code>default_call_policies</code>:
-<pre>
-template &lt;class Handler, class Base = default_call_policies&gt;
-struct return_value_policy : Base
-{
-   typedef Handler result_converter;
-};
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
diff --git a/doc/v2/definitions.html b/doc/v2/definitions.html
deleted file mode 100644
index 625e9b74..00000000
--- a/doc/v2/definitions.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - Definitions</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Definitions</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <dl class="definitions">
-      <dt><b><a name="arity">arity</a>:</b> The number of arguments accepted
-      by a function or member function. Unless otherwise specified, the
-      hidden "<code>this</code>" argument to member functions is not counted
-      when specifying arity</dt>
-
-      <dd><br>
-      </dd>
-
-      <dt><b><a name="ntbs">ntbs</a>:</b> Null-Terminated Byte String, or
-      `C'-string. C++ string literals are <strong>ntbs</strong>es. An
-      <strong>ntbs</strong> must never be null.</dt>
-
-      <dd><br>
-      </dd>
-
-      <dt><b><a name="raise">raise</a>:</b> Exceptions in Python are
-      "raised", not "thrown", as they are in C++. When this documentation
-      says that some Python exception is "raised" in the context of C++ code,
-      it means that the corresponding Python exception is set via the <a
-      href=
-      "http://www.python.org/doc/current/api/exceptionHandling.html">Python/'C'
-      API</a>, and <code><a href=
-      "errors.html#throw_error_already_set-spec">throw_error_already_set</a>()</code>
-      is called.</dt>
-
-      <dd><br>
-      </dd>
-
-      <dt><b><a name="POD">POD</a>:</b> A technical term from the C++
-      standard. Short for "Plain Ol'Data": A POD-struct is an aggregate class
-      that has no non-static data members of type pointer to member,
-      non-POD-struct, non-POD-union (or array of such types) or reference,
-      and has no user-defined copy assign- ment operator and no user-defined
-      destructor. Similarly, a POD-union is an aggregate union that has no
-      non-static data members of type pointer to member, non-POD-struct,
-      non-POD-union (or array of such types) or reference, and has no
-      user-defined copy assignment operator and no user-defined destructor. A
-      POD class is a class that is either a POD-struct or a POD-union. An
-      aggregate is an array or a class (clause 9) with no user-declared
-      constructors (12.1), no private or protected non-static data members
-      (clause 11), no base classes (clause 10), and no virtual functions
-      (10.3).</dt>
-
-      <dd><br>
-      </dd>
-
-      <dt><b><a name="ODR">ODR</a>:</b> The &quot;One Definition
-      Rule&quot;, which says that any entity in a C++ program must have the same definition in all translation units (object files) which make up a program.
-      </dt>
-
-      <dd><br>
-      </dd>
-
-
-    </dl>
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/dict.html b/doc/v2/dict.html
deleted file mode 100644
index 3b4dc211..00000000
--- a/doc/v2/dict.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/dict.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/dict.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#dict-spec">Class <code>dict</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#dict-spec-synopsis">Class <code>dict</code>
-              synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Exposes a <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> for the Python
-    <a href=
-    "http://www.python.org/dev/doc/devel/lib/typesmapping.html">dict</a>
-    type.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="dict-spec"></a>Class <code>dict</code></h3>
-
-    <p>Exposes the <a href=
-    "http://www.python.org/dev/doc/devel/lib/typesmapping.html">mapping
-    protocol</a> of Python's built-in <code>dict</code> type. The semantics
-    of the constructors and member functions defined below can be fully
-    understood by reading the <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> concept
-    definition. Since <code>dict</code> is publicly derived from <code><a
-    href="object.html#object-spec">object</a></code>, the public object
-    interface applies to <code>dict</code> instances as well.</p>
-
-    <h4><a name="dict-spec-synopsis"></a>Class <code>dict</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-   class dict : public object
-   {
-      dict();
-
-      template&lt; class T &gt;
-      dict(T const &amp; data);
-
-      // modifiers
-      void clear();
-      dict copy();
-
-      template &lt;class T1, class T2&gt;
-      tuple popitem();
-
-      template &lt;class T&gt;
-      object setdefault(T const &amp;k);
-
-      template &lt;class T1, class T2&gt;
-      object setdefault(T1 const &amp; k, T2 const &amp; d);
-
-      void update(object_cref E);
- 
-      template&lt; class T &gt;
-      void update(T const &amp; E);
-
-      // observers
-      list values() const;
-    
-      object get(object_cref k) const;
-
-      template&lt;class T&gt;
-      object get(T const &amp; k) const;
-
-      object get(object_cref k, object_cref d) const;
-      object get(T1 const &amp; k, T2 const &amp; d) const;
-
-      bool has_key(object_cref k) const;
-
-      template&lt; class T &gt;
-      bool has_key(T const &amp; k) const;
-
-      list items() const;
-      object iteritems() const;
-      object iterkeys() const;
-      object itervalues() const;
-      list keys() const;
-  };
-}}
-</pre>
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-using namespace boost::python;
-dict swap_object_dict(object target, dict d)
-{
-    dict result = extract&lt;dict&gt;(target.attr("__dict__"));
-    target.attr("__dict__") = d;
-    return result;
-}
-</pre>
-
-    <p>Revised 30 September, 2002</p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/enum.html b/doc/v2/enum.html
deleted file mode 100644
index 57926794..00000000
--- a/doc/v2/enum.html
+++ /dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/enum.hpp&gt;</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/enum.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#enum_-spec">Class template
-          <code>enum_</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#enum_-spec-synopsis">Class template <code>enum_</code>
-              synopsis</a></dt>
-
-              <dt><a href="#enum_-spec-ctors">Class template <code>enum_</code>
-              constructors</a></dt>
-
-              <dt><a href="#enum_-spec-modifiers">Class template <code>enum_</code>
-              modifier functions</a></dt>
-            </dl>
-          </dd>
-
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/enum.hpp&gt;</code> defines the
-    interface through which users expose their C++ enumeration types
-    to Python. It declares the
-    <code>enum_</code> class template, which is parameterized on the
-    enumeration type being exposed. </p>
-
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="enum_-spec"></a>Class template
-    <code>enum_&lt;T&gt;</code></h3>
-
-    <p>Creates a Python class derived from Python's <code>int</code>
-    type which is associated with the C++ type passed as its first
-    parameter. 
-
-    <h4><a name="enum_-spec-synopsis"></a>Class template <code>enum_</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;class T&gt;
-  class enum_ : public <a href="object.html#object-spec">object</a>
-  {
-    enum_(char const* name);
-    enum_&lt;T&gt;&amp; value(char const* name, T);
-    enum_&lt;T&gt;&amp; export_values();
-  };
-}}
-</pre>
-
-    <h4><a name="enum_-spec-ctors"></a>Class template <code>enum_</code>
-    constructors</h4>
-<pre>
-enum_(char const* name);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>name</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a> which conforms to Python's <a href=
-      "http://www.python.org/doc/current/ref/identifiers.html">identifier
-      naming rules</a>. 
-
-      <dt><b>Effects:</b> Constructs an <code>enum_</code> object
-      holding a Python extension type derived from <code>int</code>
-      which is named <code>name</code>. The
-      <code>name</code>d attribute of the <a href=
-      "scope.html#introduction">current scope</a> is bound to the new
-      extension type.</dt>
-    </dl>
-
-    <h4><a name="enum_-spec-modifiers"></a>Class template
-    <code>enum_</code> modifier functions</h4>
-<pre>
-inline enum_&lt;T&gt;&amp; value(char const* name, T x);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>name</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a> which conforms to Python's <a
-      href=
-      "http://www.python.org/doc/current/ref/identifiers.html">identifier
-      naming rules</a>.
-
-      <dt><b>Effects:</b> adds an instance of the wrapped enumeration
-      type with value <code>x</code> to the type's dictionary as the
-      <code>name</code>d attribute</dt>.
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-
-    </dl>
-
-<pre>
-inline enum_&lt;T&gt;&amp; export_values();
-</pre>
-
-    <dl class="function-semantics">
-
-      <dt><b>Effects:</b> sets attributes in the current <a
-        href="scope.html#scope-spec"><code>scope</code></a> with the
-        same names and values as all enumeration values exposed so far
-        by calling <code>value()</code></dt>.
-
-      <dt><b>Returns:</b> <code>*this</code></dt>
-
-    </dl>
-
-    <h2><a name="examples"></a>Example(s)</h2>
-
-    <p>C++ module definition
-<pre>
-#include &lt;boost/python/enum.hpp&gt;
-#include &lt;boost/python/def.hpp&gt;
-#include &lt;boost/python/module.hpp&gt;
-
-using namespace boost::python;
-
-enum color { red = 1, green = 2, blue = 4 };
-
-color identity_(color x) { return x; }
-
-BOOST_PYTHON_MODULE(enums)
-{
-    enum_&lt;color&gt;(&quot;color&quot;)
-        .value(&quot;red&quot;, red)
-        .value(&quot;green&quot;, green)
-        .export_values()
-        .value(&quot;blue&quot;, blue)
-        ;
-    
-    def(&quot;identity&quot;, identity_);
-}
-</pre>
-    <p>Interactive Python:
-<pre>
-&gt;&gt;&gt; from enums import *
-
-&gt;&gt;&gt; identity(red)
-enums.color.red
-
-&gt;&gt;&gt; identity(color.red)
-enums.color.red
-
-&gt;&gt;&gt; identity(green)
-enums.color.green
-
-&gt;&gt;&gt; identity(color.green)
-enums.color.green
-
-&gt;&gt;&gt; identity(blue)
-Traceback (most recent call last):
-  File &quot;&lt;stdin&gt;&quot;, line 1, in ?
-NameError: name blue' is not defined
-
-&gt;&gt;&gt; identity(color.blue)
-enums.color.blue
-
-&gt;&gt;&gt; identity(color(1))
-enums.color.red
-
-&gt;&gt;&gt; identity(color(2))
-enums.color.green
-
-&gt;&gt;&gt; identity(color(3))
-enums.color(3)
-
-&gt;&gt;&gt; identity(color(4))
-enums.color.blue
-
-&gt;&gt;&gt; identity(1)
-Traceback (most recent call last):
-  File &quot;&lt;stdin&gt;&quot;, line 1, in ?
-TypeError: bad argument type for built-in operation
-</pre>
-    <hr>
-
-    Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 December, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-     
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/errors.html b/doc/v2/errors.html
deleted file mode 100644
index 940c30fd..00000000
--- a/doc/v2/errors.html
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/errors.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/errors.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#error_already_set-spec">Class
-          <code>error_already_set</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#error_already_set-spec-synopsis">Class
-              <code>error_already_set</code> synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#handle_exception-spec">handle_exception</a></dt>
-
-          <dt><a href="#expect_non_null-spec">expect_non_null</a></dt>
-
-          <dt><a href=
-          "#throw_error_already_set-spec">throw_error_already_set</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Examples</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/errors.hpp&gt;</code> provides types and
-    functions for managing and translating between Python and C++ exceptions.
-    This is relatively low-level functionality that is mostly used internally
-    by Boost.Python. Users should seldom need it.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="error_already_set-spec"></a>Class
-    <code>error_already_set</code></h3>
-
-    <p><code>error_already_set</code> is an exception type which can be
-    thrown to indicate that a Python error has occurred. If thrown, the
-    precondition is that <a href=
-    "http://www.python.org/doc/2.2/api/exceptionHandling.html#l2h-71">PyErr_Occurred()</a>
-    returns a value convertible to <code>true</code>. Portable code shouldn't
-    throw this exception type directly, but should instead use <code><a href=
-    "#throw_error_already_set-spec">throw_error_already_set</a>()</code>,
-    below.</p>
-
-    <h4><a name="error_already_set-spec-synopsis"></a>Class error_already_set
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    class error_already_set {};
-}}
-</pre>
-
-    <h2><a name="functions"></a>Functions</h2>
-<pre>
-<a name=
-"handle_exception-spec">template &lt;class T&gt; bool handle_exception</a>(T f) throw();
-
-void handle_exception() throw();
-</pre>
-
-    <dl class="handle_exception-semantics">
-      <dt><b>Requires:</b> The first form requires that the expression
-      <code><a href=
-      "../../../function/doc/reference.html#functionN">function0</a>&lt;void&gt;(f)</code>
-      is valid. The second form requires that a C++ exception is currently
-      being handled (see section 15.1 in the C++ standard).</dt>
-
-      <dt><b>Effects:</b> The first form calls <code>f()</code> inside a
-      <code>try</code> block which first attempts to use all registered <a
-      href="exception_translator.html">exception translators</a>. If none of
-      those translates the exception, the <code>catch</code> clauses then set
-      an appropriate Python exception for the C++ exception caught, returning
-      <code>true</code> if an exception was thrown, <code>false</code>
-      otherwise. The second form passes a function which rethrows the
-      exception currently being handled to the first form.</dt>
-
-      <dt><b>Postconditions:</b> No exception is being handled</dt>
-
-      <dt><b>Throws:</b> nothing</dt>
-
-      <dt><b>Rationale:</b> At inter-language boundaries it is important to
-      ensure that no C++ exceptions escape, since the calling language
-      usually doesn't have the equipment neccessary to properly unwind the
-      stack. Use <code>handle_exception</code> to manage exception
-      translation whenever your C++ code is called directly from the Python
-      API. This is done for you automatically by the usual function wrapping
-      facilities: <code><a href=
-      "make_function.html#make_function-spec">make_function</a>()</code>,
-      <code><a href=
-      "make_function.html#make_constructor-spec">make_constructor</a>()</code>,
-      <code><a href="def.html#def-spec">def</a>()</code> and <code><a href=
-      "class.html#def-spec">class_::def</a>()</code>. The second form can be
-      more convenient to use (see the <a href="#examples">example</a> below),
-      but various compilers have problems when exceptions are rethrown from
-      within an enclosing <code>try</code> block.</dt>
-    </dl>
-<pre>
-<a name=
-"expect_non_null-spec">template &lt;class T&gt; T* expect_non_null(T* x);</a>
-</pre>
-
-    <dl class="expect_non_null-semantics">
-      <dt><b>Returns:</b> <code>x</code></dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "#error_already_set-spec">error_already_set</a>()</code> iff <code>x ==
-      0</code>.</dt>
-
-      <dt><b>Rationale:</b> Simplifies error-handling when calling functions
-      in the <a href="http://www.python.org/doc/2.2/api/api.html">Python/C
-      API</a> which return 0 on error.</dt>
-    </dl>
-<pre>
-<a name="throw_error_already_set-spec">void throw_error_already_set();</a>
-</pre>
-
-    <dl class="throw_error_already_set-semantics">
-      <dt><b>Effects:</b> <code>throw&nbsp;<a href=
-      "#error_already_set-spec">error_already_set</a>();</code></dt>
-    </dl>
-
-    <dl>
-      <dt><b>Rationale:</b> Many platforms and compilers are not able to
-      consistently catch exceptions thrown across shared library boundaries.
-      Using this function from the Boost.Python library ensures that the
-      appropriate <code>catch</code> block in <code><a href=
-      "#handle_exception-spec">handle_exception</a>()</code> can catch the
-      exception.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Examples</h2>
-<pre>
-#include &lt;string&gt;
-#include &lt;boost/python/errors.hpp&gt;
-#include &lt;boost/python/object.hpp&gt;
-#include &lt;boost/python/handle.hpp&gt;
-
-// Returns a std::string which has the same value as obj's "__name__"
-// attribute.
-std::string get_name(boost::python::object obj)
-{
-   // throws if there's no __name__ attribute
-   PyObject* p = boost::python::expect_non_null(
-      PyObject_GetAttrString(obj.ptr(), "__name__"));
-
-   char const* s = PyString_AsString(p);
-   if (s != 0) 
-        Py_DECREF(p);
-
-   // throws if it's not a Python string
-   std::string result(
-      boost::python::expect_non_null(
-         PyString_AsString(p)));
-
-   Py_DECREF(p); // Done with p
-   
-   return result;
-}
-
-//
-// Demonstrate form 1 of handle_exception
-//
-
-// Place into result a Python Int object whose value is 1 if a and b have
-// identical "__name__" attributes, 0 otherwise.
-void same_name_impl(PyObject*&amp; result, boost::python::object a, boost::python::object b)
-{
-   result = PyInt_FromLong(
-      get_name(a) == get_name(a2));
-}
-
-object borrowed_object(PyObject* p)
-{
-   return boost::python::object(
-        boost::python::handle&lt;&gt;(
-             boost::python::borrowed(a1)));
-}
-
-// This is an example Python 'C' API interface function
-extern "C" PyObject*
-same_name(PyObject* args, PyObject* keywords)
-{
-   PyObject* a1;
-   PyObject* a2;
-   PyObject* result = 0;
-
-   if (!PyArg_ParseTuple(args, const_cast&lt;char*&gt;("OO"), &amp;a1, &amp;a2))
-      return 0;
-   
-   // Use boost::bind to make an object compatible with
-   // boost::Function0&lt;void&gt;
-   if (boost::python::handle_exception(
-         boost::bind&lt;void&gt;(same_name_impl, boost::ref(result), borrowed_object(a1), borrowed_object(a2))))
-   {
-      // an exception was thrown; the Python error was set by
-      // handle_exception()
-      return 0;
-   }
-
-   return result;
-}
-
-//
-// Demonstrate form 2 of handle_exception. Not well-supported by all
-// compilers.
-//
-extern "C" PyObject*
-same_name2(PyObject* args, PyObject* keywords)
-{
-   PyObject* a1;
-   PyObject* a2;
-   PyObject* result = 0;
-
-   if (!PyArg_ParseTuple(args, const_cast&lt;char*&gt;("OO"), &amp;a1, &amp;a2))
-      return 0;
-
-   try {
-      return PyInt_FromLong(
-         get_name(borrowed_object(a1)) == get_name(borrowed_object(a2)));
-   }
-   catch(...)
-   {
-      // If an exception was thrown, translate it to Python
-      boost::python::handle_exception();
-      return 0;
-   }
-}
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/exception_translator.html b/doc/v2/exception_translator.html
deleted file mode 100644
index 8aa0fe3b..00000000
--- a/doc/v2/exception_translator.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python -
-    &lt;boost/python/exception_translator.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/exception_translator.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href=
-          "#register_exception_translator-spec">register_exception_translator</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>As described <a href="errors.html#handle_exception-spec">here</a>, it
-    is important to make sure that exceptions thrown by C++ code do not pass
-    into the Python interpreter core. By default, Boost.Python translates all
-    C++ exceptions thrown by wrapped functions and module init functions into
-    Python, but the default translators are extremely limited: most C++
-    exceptions will appear in Python as a <a href=
-    "http://www.python.org/doc/current/lib/module-exceptions.html">RuntimeError</a>
-    exception whose representation is
-    <code>'Unidentifiable&nbsp;C++&nbsp;Exception'</code>. To produce better
-    error messages, users can register additional exception translators as
-    described below.</p>
-
-    <h2><a name="functions"></a>Functions</h2>
-
-<h3><code><a name="register_exception_translator-spec">register_exception_translator</a></code></h3>
-
-<pre>
-<a name="register_exception_translator-spec">template&lt;class ExceptionType, class Translate&gt;</a>
-void register_exception_translator(Translate const&amp; translate);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b></dt>
-
-      <dd>
-        <code>Translate</code> is <a href=
-        "../../../utility/CopyConstructible.html">Copyconstructible</a>, and
-        the following code must be well-formed: 
-<pre>
-void f(ExceptionType x) { translate(x); }
-</pre>
-        The expression <code>translate(x)</code> must either throw a C++
-        exception, or a subsequent call to <code><a href=
-        "http://www.python.org/doc/current/api/exceptionHandling.html">PyErr_Occurred</a>()</code>
-        must return 1.
-      </dd>
-
-      <p>
-
-      <dt><b>Effects:</b> Adds a copy of <code>translate</code> to the sequence of
-      exception translators tried when Boost.Python catches an exception that
-      is about to pass into Python's core interpreter. The new translator
-      will get "first shot" at translating all exceptions matching the catch
-      clause shown above. Any subsequently-registered translators will be
-      allowed to translate the exception earlier. A translator which cannot
-      translate a given C++ exception can re-throw it, and it will be handled
-      by a translator which was registered earlier (or by the default
-      translator).</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/def.hpp&gt;
-#include &lt;boost/python/exception_translator.hpp&gt;
-#include &lt;exception&gt;
-
-struct my_exception : std::exception
-{
-  char const* what() throw() { return "One of my exceptions"; }
-};
-
-void translate(my_exception const&amp; e)
-{
-    // Use the Python 'C' API to set up an exception object
-    PyErr_SetString(PyExc_RuntimeError, e.what());
-}
-
-void something_which_throws()
-{
-    ...
-    throw my_exception();
-    ...
-}
-
-BOOST_PYTHON_MODULE(exception_translator_ext)
-{
-  using namespace boost::python;
-  register_exception_translator&lt;my_exception&gt;(&amp;translate);
-  
-  def("something_which_throws", something_which_throws);
-}
-</pre>
-    <br>
-     <br>
-     
-    <hr>
-
-    <p>Revised 03 October, 2002</p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/extract.html b/doc/v2/extract.html
deleted file mode 100644
index bec97f28..00000000
--- a/doc/v2/extract.html
+++ /dev/null
@@ -1,230 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/extract.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/extract.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#extract-spec">Class <code>extract</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#extract-spec-synopsis">Class <code>extract</code>
-              synopsis</a></dt>
-
-              <dt><a href="#extract-spec-ctors">Class <code>extract</code>
-              constructors and destructor</a></dt>
-
-              <dt><a href="#extract-spec-observers">Class
-              <code>extract</code> observer functions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Exposes a mechanism for extracting C++ object values from
-    generalized Python objects. Note that
-    <code>extract&lt;</code>...<code>&gt;</code> can also be used to
-    &quot;downcast&quot; an <a
-    href="object.html#object-spec">object</a> to some specific <a
-    href="ObjectWrapper.html#ObjectWrapper-concept">ObjectWrapper</a>. Because
-    invoking a mutable python type with an argument of the same type
-    (e.g. <code>list([1,2])</code> typically makes a <em>copy</em> of
-    the argument object, this may be the only way to access the <a
-    href="ObjectWrapper.html#ObjectWrapper-concept">ObjectWrapper</a>'s
-    interface on the original object.
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="extract-spec"></a>Class template <code>extract</code></h3>
-
-    <p><code>extract&lt;T&gt;</code> can be used to extract a value of
-    an arbitrary C++ type from an instance of <code><a
-    href="object.html#object-spec">object</a></code>. Two usages are supported:
-<ol>
-<li><b><code>extract&lt;T&gt;(o)</code></b> is a temporary object
-which is implicitly convertible to <code>T</code> (explicit conversion
-is also available through the object's function-call
-operator). However, if no conversion is available which can convert
-<code>o</code> to an object of type <code>T</code>, a Python
-<code>TypeError</code> exception will be <a
-href="definitions.html#raise">raised</a>.
-
-<li><b><code>extract&lt;T&gt; x(o);</code></b> constructs an extractor
-whose <code>check()</code> member function can be used to ask whether
-a conversion is available without causing an exception to be thrown.
-</ol>
-
-    <h4><a name="extract-spec-synopsis"></a>Class template <code>extract</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;class T&gt;
-  struct extract
-  {
-      typedef <i>unspecified</i> result_type;
-
-      extract(PyObject*);
-      extract(object const&amp;);
-
-      result_type operator()() const;
-      operator result_type() const;
-
-      bool check() const;
-  };
-}}
-</pre>
-
-    <h4><a name="extract-spec-ctors"></a>Class <code>extract</code>
-    constructors and destructor</h4>
-<pre>
-extract(PyObject* p);
-extract(object const&amp;);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> The first form requires that <code>p</code> is non-null.</dt>
-
-      <dt><b>Effects:</b>Stores a pointer to the Python object managed
-      by its constructor argument. In particular, the reference
-      count of the object is not incremented. The onus is on the user
-      to be sure it is not destroyed before the extractor's conversion
-      function is called.</dt>
-    </dl>
-
-    <h4><a name="extract-spec-observers"></a>Class <code>extract</code>
-    observer functions</h4>
-<pre>
-result_type operator()() const;
-operator result_type() const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> Converts the stored pointer to
-      <code>result_type</code>, which is either <code>T</code> or
-      <code>T const&amp;</code>.
-      </dt>
-
-      <dt><b>Returns:</b> An object of <code>result_type</code>
-      corresponding to the one referenced by the stored pointer.</dt>
-
-      <dt><b>Throws:</b> <code><a
-      href="errors.html#error_already_set-spec">error_already_set</a></code>
-      and sets a <code>TypeError</code> if no such conversion is
-      available. May also emit other unspecified exceptions thrown by
-      the converter which is actually used.</dt>
-    </dl>
-
-<pre>
-bool check() const;
-</pre>
-
-    <dl class="function-semantics">
-
-      <dt><b>Postconditions:</b> None. In particular, note that a
-      return value of <code>true</code> does not preclude an exception
-      being thrown from <code>operator result_type()</code> or
-      <code>operator()()</code>.</dt>
-
-      <dt><b>Returns:</b> <code>false</code> <i>only</i> if no conversion from the
-      stored pointer to <code>T</code> is available.</dt>
-
-    </dl>
-
-
-    <h2><a name="examples"></a>Examples</h2>
-
-<pre>
-#include &lt;cstdio&gt;
-using namespace boost::python;
-int Print(str s)
-{ 
-   // extract a C string from the Python string object
-   char const* c_str = extract&lt;char const*&gt;(s);
-
-   // Print it using printf
-   std::printf(&quot;%s\n&quot;, c_str);
-
-   // Get the Python string's length and convert it to an int
-   return extract&lt;int&gt;(s.attr(&quot;__len__&quot;)())
-}
-</pre>
-
-The following example shows how extract can be used along with
-<code><a
-href="class.html#class_-spec">class_</a>&lt;</code>...<code>&gt;</code>
-to create and access an instance of a wrapped C++ class.
-
-<pre>
-struct X
-{
-   X(int x) : v(x) {}
-   int value() { return v; }
- private:
-   int v;
-};
-
-BOOST_PYTHON_MODULE(extract_ext)
-{
-    object x_class(
-       class_&lt;X&gt;(&quot;X&quot;, init&lt;int&gt;())
-          .def(&quot;value&quot;, &amp;X::value))
-          ;
-        
-    // Instantiate an X object through the Python interface. 
-    // Its lifetime is now managed by x_obj.
-    object x_obj = x_class(3);
-
-    // Get a reference to the C++ object out of the Python object
-    X&amp; x = extract&lt;X&amp;&gt;(x_obj);
-    assert(x.value() == 3);
-}
-</pre>
-    <p>Revised 15 November, 2002</p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/faq.html b/doc/v2/faq.html
deleted file mode 100644
index e5c24a8b..00000000
--- a/doc/v2/faq.html
+++ /dev/null
@@ -1,578 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - FAQ</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Frequently Asked Questions (FAQs)</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <dl class="page-index">
-
-      <dt><a href="#funcptr">How can I wrap a function which takes a
-      function pointer as an argument?</a><dd>
-
-      <dt><a href="#dangling">I'm getting the "attempt to return dangling
-      reference" error. What am I doing wrong?</a></dt>
-
-      <dt><a href="#question1">Is return_internal_reference
-      efficient?</a></dt>
-
-      <dt><a href="#question2">How can I wrap functions which take C++
-      containers as arguments?</a></dt>
-
-      <dt><a href="#c1204">fatal error C1204:Compiler limit:internal
-      structure overflow</a></dt>
-
-      <dt><a href="#debugging">How do I debug my Python extensions?</a></dt>
-
-      <dt><a href="#imul">Why doesn't my <code>*=</code> operator
-      work?</a></dt>
-
-      <dt><a href="#macosx">Does Boost.Python work with Mac OS X?</a></dt>
-
-      <dt><a href="#xref">How can I find the existing PyObject that holds a
-      C++ object?</a></dt>
-
-      <dt><a href="#ownership">How can I wrap a function which needs to take
-      ownership of a raw pointer?</a></dt>
-
-      <dt><a href="#slow_compilation">Compilation takes too much time and eats too much memory! 
-      What can I do to make it faster?</a></dt>
-       
-      <dt><a href="#packages">How do I create sub-packages using Boost.Python?</a></dt>                
-    </dl>
-    <hr>
-
-    <h2><a name="funcptr">How can I wrap a function which takes a
-      function pointer as an argument?</a></h2>
-
-    If what you're trying to do is something like this:
-<pre>
-typedef boost::function&lt;void (string s) &gt; funcptr;
-
-void foo(funcptr fp)
-{
-    fp(&quot;hello,world!&quot;);
-}
-
-BOOST_PYTHON_MODULE(test)
-{
-    def(&quot;foo&quot;,foo) ;
-}
-</pre>
-
-And then:
-
-<pre>
-&gt;&gt;&gt; def hello(s):
-...    print s 
-...
-&gt;&gt;&gt; foo(hello)
-hello, world!
-</pre>
-
-    The short answer is: &quot;you can't&quot;.  This is not a
-    Boost.Python limitation so much as a limitation of C++.  The
-    problem is that a Python function is actually data, and the only
-    way of associating data with a C++ function pointer is to store it
-    in a static variable of the function.  The problem with that is
-    that you can only associate one piece of data with every C++
-    function, and we have no way of compiling a new C++ function
-    on-the-fly for every Python function you decide to pass
-    to <code>foo</code>.  In other words, this could work if the C++
-    function is always going to invoke the <em>same</em> Python
-    function, but you probably don't want that.
-
-    <p>If you have the luxury of changing the C++ code you're
-    wrapping, pass it an <code>object</code> instead and call that;
-    the overloaded function call operator will invoke the Python
-    function you pass it behind the <code>object</code>.
-
-    <p>For more perspective on the issue, see <a
-    href="http://aspn.activestate.com/ASPN/Mail/Message/1554837">this
-    posting</a>.
-
-    <hr>
-
-    <h2><a name="dangling">I'm getting the "attempt to return dangling
-    reference" error. What am I doing wrong?</a></h2>
-    That exception is protecting you from causing a nasty crash. It usually
-    happens in response to some code like this: 
-<pre>
-period const&amp; get_floating_frequency() const
-{
-  return boost::python::call_method&lt;period const&amp;&gt;(
-      m_self,"get_floating_frequency");
-}
-</pre>
-    And you get: 
-<pre>
-ReferenceError: Attempt to return dangling reference to object of type:
-class period
-</pre>
-
-    <p>In this case, the Python method invoked by <code>call_method</code>
-    constructs a new Python object. You're trying to return a reference to a
-    C++ object (an instance of <code>class period</code>) contained within
-    and owned by that Python object. Because the called method handed back a
-    brand new object, the only reference to it is held for the duration of
-    <code>get_floating_frequency()</code> above. When the function returns,
-    the Python object will be destroyed, destroying the instance of
-    <code>class period</code>, and leaving the returned reference dangling.
-    That's already undefined behavior, and if you try to do anything with
-    that reference you're likely to cause a crash. Boost.Python detects this
-    situation at runtime and helpfully throws an exception instead of letting
-    you do that.<br>
-     &nbsp;</p>
-    <hr>
-
-    <h2><a name="question1"></a>Is return_internal_reference efficient?</h2>
-
-    <blockquote>
-      <b>Q:</b> <i>I have an object composed of 12 doubles. A const&amp; to
-      this object is returned by a member function of another class. From the
-      viewpoint of using the returned object in Python I do not care if I get
-      a copy or a reference to the returned object. In Boost.Python Version 2
-      I have the choice of using copy_const_reference or
-      return_internal_reference. Are there considerations that would lead me
-      to prefer one over the other, such as size of generated code or memory
-      overhead?</i> 
-
-      <p><b>A:</b> copy_const_reference will make an instance with storage
-      for one of your objects, size = base_size + 12 * sizeof(double).
-      return_internal_reference will make an instance with storage for a
-      pointer to one of your objects, size = base_size + sizeof(void*).
-      However, it will also create a weak reference object which goes in the
-      source object's weakreflist and a special callback object to manage the
-      lifetime of the internally-referenced object. My guess?
-      copy_const_reference is your friend here, resulting in less overall
-      memory use and less fragmentation, also probably fewer total
-      cycles.</p>
-    </blockquote>
-    <hr>
-
-    <h2><a name="question2"></a>How can I wrap functions which take C++
-    containers as arguments?</h2>
-
-    <p>Ralf W. Grosse-Kunstleve provides these notes:</p>
-
-    <ol>
-      <li>
-        Using the regular <code>class_&lt;&gt;</code> wrapper: 
-<pre>
-class_&lt;std::vector&lt;double&gt; &gt;("std_vector_double")
-  .def(...)
-  ...
-  ;
-</pre>
-        This can be moved to a template so that several types (double, int,
-        long, etc.) can be wrapped with the same code. This technique is used
-        in the file 
-
-        <blockquote>
-          scitbx/include/scitbx/array_family/boost_python/flex_wrapper.h
-        </blockquote>
-        in the "scitbx" package. The file could easily be modified for
-        wrapping std::vector&lt;&gt; instantiations. 
-
-        <p>This type of C++/Python binding is most suitable for containers
-        that may contain a large number of elements (&gt;10000).</p>
-      </li>
-
-      <li>
-        Using custom rvalue converters. Boost.Python "rvalue converters"
-        match function signatures such as: 
-<pre>
-void foo(std::vector&lt;double&gt; const&amp; array); // pass by const-reference
-void foo(std::vector&lt;double&gt; array); // pass by value
-</pre>
-        Some custom rvalue converters are implemented in the file 
-
-        <blockquote>
-          scitbx/include/scitbx/boost_python/container_conversions.h
-        </blockquote>
-        This code can be used to convert from C++ container types such as
-        std::vector&lt;&gt; or std::list&lt;&gt; to Python tuples and vice
-        versa. A few simple examples can be found in the file 
-
-        <blockquote>
-          scitbx/array_family/boost_python/regression_test_module.cpp
-        </blockquote>
-        Automatic C++ container &lt;-&gt; Python tuple conversions are most
-        suitable for containers of moderate size. These converters generate
-        significantly less object code compared to alternative 1 above.
-      </li>
-    </ol>
-    A disadvantage of using alternative 2 is that operators such as
-    arithmetic +,-,*,/,% are not available. It would be useful to have custom
-    rvalue converters that convert to a "math_array" type instead of tuples.
-    This is currently not implemented but is possible within the framework of
-    Boost.Python V2 as it will be released in the next couple of weeks. [ed.:
-    this was posted on 2002/03/10] 
-
-    <p>It would also be useful to also have "custom lvalue converters" such
-    as std::vector&lt;&gt; &lt;-&gt; Python list. These converters would
-    support the modification of the Python list from C++. For example:</p>
-
-    <p>C++:</p>
-<pre>
-void foo(std::vector&lt;double&gt;&amp; array)
-{
-  for(std::size_t i=0;i&lt;array.size();i++) {
-    array[i] *= 2;
-  }
-}
-</pre>
-    Python: 
-<pre>
-&gt;&gt;&gt; l = [1, 2, 3]
-&gt;&gt;&gt; foo(l)
-&gt;&gt;&gt; print l
-[2, 4, 6]
-</pre>
-    Custom lvalue converters require changes to the Boost.Python core library
-    and are currently not available. 
-
-    <p>P.S.:</p>
-
-    <p>The "scitbx" files referenced above are available via anonymous
-    CVS:</p>
-<pre>
-cvs -d:pserver:anonymous@cvs.cctbx.sourceforge.net:/cvsroot/cctbx login
-cvs -d:pserver:anonymous@cvs.cctbx.sourceforge.net:/cvsroot/cctbx co scitbx
-</pre>
-    <hr>
-
-    <h2><a name="c1204"></a>fatal error C1204:Compiler limit:internal
-    structure overflow</h2>
-
-    <blockquote>
-      <b>Q:</b> <i>I get this error message when compiling a large source
-      file. What can I do?</i> 
-
-      <p><b>A:</b> You have two choices:</p>
-
-      <ol>
-        <li>Upgrade your compiler (preferred)</li>
-
-        <li>
-          Break your source file up into multiple translation units. 
-
-          <p><code><b>my_module.cpp</b></code>:</p>
-<pre>
-...
-void more_of_my_module();
-BOOST_PYTHON_MODULE(my_module)
-{
-   def("foo", foo);
-   def("bar", bar);
-   ...
-   more_of_my_module();
-}
-</pre>
-          <code><b>more_of_my_module.cpp</b></code>: 
-<pre>
-void more_of_my_module()
-{
-   def("baz", baz);
-   ...
-}
-</pre>
-          If you find that a <code><a href=
-          "class.html#class_-spec">class_</a>&lt;...&gt;</code> declaration
-          can't fit in a single source file without triggering the error, you
-          can always pass a reference to the <code>class_</code> object to a
-          function in another source file, and call some of its member
-          functions (e.g. <code>.def(...)</code>) in the auxilliary source
-          file: 
-
-          <p><code><b>more_of_my_class.cpp</b></code>:</p>
-<pre>
-void more_of_my_class(class&lt;my_class&gt;&amp; x)
-{
-   x
-     .def("baz", baz)
-     .add_property("xx", &amp;my_class::get_xx, &amp;my_class::set_xx)
-     ;
-
-   ...
-}
-</pre>
-        </li>
-      </ol>
-    </blockquote>
-    <hr>
-
-    <h2><a name="debugging"></a>How do I debug my Python extensions?</h2>
-
-    <p>Greg Burley gives the following answer for Unix GCC users:</p>
-
-    <blockquote>
-      Once you have created a boost python extension for your c++ library or
-      class, you may need to debug the code. Afterall this is one of the
-      reasons for wrapping the library in python. An expected side-effect or
-      benefit of using BPL is that debugging should be isolated to the c++
-      library that is under test, given that python code is minimal and
-      boost::python either works or it doesn't. (ie. While errors can occur
-      when the wrapping method is invalid, most errors are caught by the
-      compiler ;-). 
-
-      <p>The basic steps required to initiate a gdb session to debug a c++
-      library via python are shown here. Note, however that you should start
-      the gdb session in the directory that contains your BPL my_ext.so
-      module.</p>
-<pre>
-(gdb) target exec python
-(gdb) run
- &gt;&gt;&gt; from my_ext import *
- &gt;&gt;&gt; [C-c]
-(gdb) break MyClass::MyBuggyFunction
-(gdb) cont
- &gt;&gt;&gt; pyobj = MyClass()
- &gt;&gt;&gt; pyobj.MyBuggyFunction()
-Breakpoint 1, MyClass::MyBuggyFunction ...
-Current language:  auto; currently c++
-(gdb) do debugging stuff
-</pre>
-    </blockquote>
-
-    <p>Greg's approach works even better using Emacs' "<code>gdb</code>"
-    command, since it will show you each line of source as you step through
-    it.</p>
-
-    <p>On <b>Windows</b>, my favorite debugging solution is the debugger that
-    comes with Microsoft Visual C++ 7. This debugger seems to work with code
-    generated by all versions of Microsoft and Metrowerks toolsets; it's rock
-    solid and "just works" without requiring any special tricks from the
-    user.</p>
-
-    <p>Unfortunately for Cygwin and MinGW users, as of this writing gdb on
-    Windows has a very hard time dealing with shared libraries, which could
-    make Greg's approach next to useless for you. My best advice for you is
-    to use Metrowerks C++ for compiler conformance and Microsoft Visual
-    Studio as a debugger when you need one.</p>
-
-    <h3>Debugging extensions through Boost.Build</h3>
-    If you are launching your extension module tests with <a href=
-    "../../../tools/build">Boost.Build</a> using the
-    <code>boost-python-runtest</code> rule, you can ask it to launch your
-    debugger for you by adding "-sPYTHON_LAUNCH=<i>debugger</i>" to your bjam
-    command-line: 
-<pre>
-bjam -sTOOLS=metrowerks "-sPYTHON_LAUNCH=devenv /debugexe" test
-bjam -sTOOLS=gcc -sPYTHON_LAUNCH=gdb test
-</pre>
-    It can also be extremely useful to add the <code>-d+2</code> option when
-    you run your test, because Boost.Build will then show you the exact
-    commands it uses to invoke it. This will invariably involve setting up
-    PYTHONPATH and other important environment variables such as
-    LD_LIBRARY_PATH which may be needed by your debugger in order to get
-    things to work right. 
-    <hr>
-
-    <h2><a name="imul"></a>Why doesn't my <code>*=</code> operator work?</h2>
-
-    <blockquote>
-      <b>Q:</b> <i>I have exported my class to python, with many overloaded
-      operators. it works fine for me except the</i> <code>*=</code>
-      <i>operator. It always tells me "can't multiply sequence with non int
-      type". If I use</i> <code>p1.__imul__(p2)</code> <i>instead of</i>
-      <code>p1 *= p2</code><i>, it successfully executes my code. What's
-      wrong with me?</i> 
-
-      <p><b>A:</b> There's nothing wrong with you. This is a bug in Python
-      2.2. You can see the same effect in Pure Python (you can learn a lot
-      about what's happening in Boost.Python by playing with new-style
-      classes in Pure Python).</p>
-<pre>
-&gt;&gt;&gt; class X(object):
-...     def __imul__(self, x):
-...         print 'imul'
-...
-&gt;&gt;&gt; x = X()
-&gt;&gt;&gt; x *= 1
-</pre>
-      To cure this problem, all you need to do is upgrade your Python to
-      version 2.2.1 or later.
-    </blockquote>
-    <hr>
-
-    <h2><a name="macosx"></a>Does Boost.Python work with Mac OS X?</h2>
-
-    <blockquote>
-      <p>The short answer: as of January 2003, unfortunately not.</p>
-
-      <p>The longer answer: using Mac OS 10.2.3 with the December Developer's
-      Kit, Python 2.3a1, and bjam's darwin-tools.jam, Boost.Python compiles
-      fine, including the examples. However, there are problems at runtime
-      (see <a href=
-      "http://mail.python.org/pipermail/c++-sig/2003-January/003267.html">http://mail.python.org/pipermail/c++-sig/2003-January/003267.html</a>).
-      Solutions are currently unknown.</p>
-
-      <p>It is known that under certain circumstances objects are
-      double-destructed. See <a href=
-      "http://mail.python.org/pipermail/c++-sig/2003-January/003278.html">http://mail.python.org/pipermail/c++-sig/2003-January/003278.html</a>
-      for details. It is not clear however if this problem is related to the
-      Boost.Python runtime issues.</p>
-    </blockquote>
-    <hr>
-
-    <h2><a name="xref">How can I find the existing PyObject that holds a C++
-    object?</a></h2>
-
-    <blockquote>
-      "I am wrapping a function that always returns a pointer to an
-      already-held C++ object."
-    </blockquote>
-    One way to do that is to hijack the mechanisms used for wrapping a class
-    with virtual functions. If you make a wrapper class with an initial
-    PyObject* constructor argument and store that PyObject* as "self", you
-    can get back to it by casting down to that wrapper type in a thin wrapper
-    function. For example: 
-<pre>
-class X { X(int); virtual ~X(); ... };
-X* f();  // known to return Xs that are managed by Python objects
-
-
-// wrapping code
-
-struct X_wrap : X
-{
-    X_wrap(PyObject* self, int v) : self(self), X(v) {}
-    PyObject* self;
-};
-
-handle&lt;&gt; f_wrap()
-{
-    X_wrap* xw = dynamic_cast&lt;X_wrap*&gt;(f());
-    assert(xw != 0);
-    return handle&lt;&gt;(borrowed(xw-&gt;self));
-}
-
-...
-
-def("f", f_wrap());
-class_&lt;X,X_wrap&gt;("X", init&lt;int&gt;())
-   ...
-   ;
-</pre>
-    Of course, if X has no virtual functions you'll have to use
-    <code>static_cast</code> instead of <code>dynamic_cast</code> with no
-    runtime check that it's valid. This approach also only works if the
-    <code>X</code> object was constructed from Python, because
-    <code>X</code>s constructed from C++ are of course never
-    <code>X_wrap</code> objects. 
-
-    <p>Another approach to this requires you to change your C++ code a bit;
-    if that's an option for you it might be a better way to go. work we've
-    been meaning to get to anyway. When a <code>shared_ptr&lt;X&gt;</code> is
-    converted from Python, the shared_ptr actually manages a reference to the
-    containing Python object. When a shared_ptr&lt;X&gt; is converted back to
-    Python, the library checks to see if it's one of those "Python object
-    managers" and if so just returns the original Python object. So you could
-    just write <code>object(p)</code> to get the Python object back. To
-    exploit this you'd have to be able to change the C++ code you're wrapping
-    so that it deals with shared_ptr instead of raw pointers.</p>
-
-    <p>There are other approaches too. The functions that receive the Python
-    object that you eventually want to return could be wrapped with a thin
-    wrapper that records the correspondence between the object address and
-    its containing Python object, and you could have your f_wrap function
-    look in that mapping to get the Python object out.</p>
-
-    <h2><a name="ownership">How can I wrap a function which needs to take
-    ownership of a raw pointer?</a></h2>
-
-    <blockquote>
-      <i>Part of an API that I'm wrapping goes something like this:</i> 
-<pre>
-struct A {}; struct B { void add( A* ); }
-where B::add() takes ownership of the pointer passed to it.
-</pre>
-
-      <p><i>However:</i></p>
-<pre>
-a = mod.A()
-b = mod.B()
-b.add( a )
-del a         
-del b
-# python interpreter crashes 
-# later due to memory corruption.
-</pre>
-
-      <p><i>Even binding the lifetime of a</i> to b via
-      with_custodian_and_ward doesn't prevent the python object a from
-      ultimately trying to delete the object it's pointing to. Is there a way
-      to accomplish a 'transfer-of-ownership' of a wrapped C++ object?</p>
-
-      <p><i>--Bruce Lowery</i></p>
-    </blockquote>
-    Yes: Make sure the C++ object is held by auto_ptr: 
-<pre>
-class_&lt;A, std::auto_ptr&lt;A&gt; &gt;("A")
-    ...
-    ;
-</pre>
-    Then make a thin wrapper function which takes an auto_ptr parameter: 
-<pre>
-void b_insert(B&amp; b, std::auto_ptr&lt;A&gt; a)
-{
-    b.insert(a.get());
-    a.release();
-}
-</pre>
-    Wrap that as B.add. Note that pointers returned via <code><a href=
-    "manage_new_object.html#manage_new_object-spec">manage_new_object</a></code>
-    will also be held by <code>auto_ptr</code>, so this transfer-of-ownership
-    will also work correctly. 
-
-    <h2><a name="slow_compilation">Compilation takes too much time and eats too
-            much memory!  What can I do to make it faster?</a></h2> 
-    <p>
-    Please refer to the <a href="../tutorial/doc/reducing_compiling_time.html">Techniques</a> 
-    section in the tutorial. 
-    </p>
- 
-    <h2><a name="packages">How do I create sub-packages using Boost.Python?</a></h2> 
-    <p>
-    In the <a href="../tutorial/doc/creating_packages.html">Techniques</a>
-    section of the tutorial this topic is explored.
-    </p>
-    
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     18 March, 2003 
-    <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002-2003. All
-    Rights Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/feb2002.html b/doc/v2/feb2002.html
deleted file mode 100644
index bc305a47..00000000
--- a/doc/v2/feb2002.html
+++ /dev/null
@@ -1,366 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <meta http-equiv="Content-Type" content=
-    "text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - February 2002 Progress Report</title>
-<style type="text/css">
- :link { color: #0000ff }
- :visited { color: #800080 }
- p.c3 {font-style: italic}
- h2.c2 {text-align: center}
- h1.c1 {text-align: center}
-</style>
-
-    <table border="0" cellpadding="7" cellspacing="0" width=
-    "100%" summary="header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-
-        <td valign="top">
-          <h1 class="c1"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 class="c2">February 2002 Progress Report</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="index">
-      <dt><a href="#Python10">Python10 Conference Report</a>
-
-      <dt><a href="#progress">Boost.Python v2 Progress</a>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="#documentation">Documentation</a>
-
-          <dt><a href="#conversion">Overhaul of
-          <code>to_python</code>/<code>from_python</code>
-          conversion mechanism</a>
-
-          <dt><a href="#miscellaneous">Miscellaneous</a>
-        </dl>
-    </dl>
-
-    <h2><a name="Python10">Python10 Conference Report</a></h2>
-    I spent the first week of February at the Python10 conference
-    in Alexandria, VA. I&#39;m including this experience report
-    for two reasons: firstly, it documents where my time was
-    used. Secondly, a public presence for Boost.Python and
-    interaction between the Python and C++ communities is
-    important to the future of Boost.Python, which in turn is
-    important to the Kull Project. 
-
-    <p>Andy Koenig, of all people, was the keynote speaker of
-    this year&#39;s opening plenary session. He presented his
-    &quot;impressions of a polyglot outsider&quot;, which
-    studiously avoided any mention of C++ until the end of his
-    talk, when he was asked about standardization. I was
-    surprised to learn that the C++ community at large wanted a
-    few more years before beginning but when ANSI accepted
-    HP&#39;s request for a standard, the process was forced to
-    start: it was a matter of participating or having
-    standardization proceed without one&#39;s input. Andy managed
-    to highlight very effectively the balance of strengths in
-    Python, one of the most important being its support for
-    extension via libraries. In many ways that makes Python a
-    good analogue for C++ in the interpreted world
-
-    <p>There were several kind mentions of the Boost.Python
-    library from people who found it indispensable. I was
-    particularly happy that Karl MacMillan, Michael Droettboom,
-    and Ichiro Fujinaga from Johns Hopkins is using it to do OCR
-    on a vast library of music notation, since in a previous life
-    I was an author of music notation software. These guys are
-    also drawing on Ullrich Koethe&#39;s VIGRA library for image
-    manipulation (Ullrich has been a major contributor to
-    Boost.Python). They also have a system for writing the
-    Boost.Python wrapper code in C++ comments, which allows them
-    to keep all of the code in one place. I&#39;ve asked them to
-    send me some information on that.
-
-    <p>The development of Swig has been gaining momentum again
-    (the basic description at
-    www.boost.org/libs/python/doc/comparisons.html still
-    applies). The talk given about it by David Beazly was very
-    well-attended, and they appear to have quite a few users.
-    Swig&#39;s strengths (coverage of many langauages) and
-    weaknesses (incomplete C++ language support) haven&#39;t
-    changed, although the C++ support seems to have improved
-    considerably - they now claim to have a complete model of the
-    C++ type system. It seems to be mostly geared at wrapping
-    what Walter Landry calls &quot;C-Tran&quot;: C++ code which
-    traffics in built-in types with little use of abstraction.
-    I&#39;m not knocking that, either: I&#39;m sure a lot of that
-    code exists, so it&#39;s a valuable service. One feature Swig
-    has which I&#39;d like to steal is the ability to unwrap a
-    single Python argument into multiple C++ arguments, for
-    example, by converting a Python string into a pointer and
-    length. When his talk was over, David approached me about a
-    possible joint workshop on language binding, which sounds
-    like a fun idea to me.
-
-    <p>I spent some considerable time talking with Steven Knight,
-    the leader of the Scons build tool effort. We had a lot to
-    share with one another, and I gained a much better
-    appreciation for many of the Scons design decisions. Scons
-    seems to be concentrating on being the ultimate build system
-    substrate, and Steve seemed to think that we were on the
-    right track with our high-level design. We both hope that the
-    Boost.Build V2 high-level architecture can eventually be
-    ported to run on top of Scons.
-
-    <p>They also have a highly-refined and successful development
-    procedure which I&#39;d like to emulate for Boost.Build V2.
-    Among many other things they do, their source-control system
-    automatically ensures that when you check in a new test, it
-    is automatically run on the currently checked-in state of the
-    code, and is expected to fail -- a relatively obvious good
-    idea which I&#39;ve never heard before.
-
-    <p>Guido Van Rossum&#39;s &quot;State of the Python
-    Union&quot; address was full of questions for the community
-    about what should be done next, but the one idea Guido seemed
-    to stress was that core language stability and continuing
-    library development would be a good idea (sound familiar?) I
-    mentioned the Boost model as a counterpoint to the idea of
-    something like CPAN (the massive Perl library archives), and
-    it seemed to generate some significant interest. I&#39;ve
-    offered to work with anyone from the Python community who
-    wants to set up something like Boost.
-
-    <p>There was some discussion of &quot;string
-    interpolation&quot; (variable substitution in strings), and
-    Guido mentioned that he had some thoughts about the
-    strengths/weaknesses of Python&#39;s formatting interface. It
-    might be useful for those working on formatting for boost to
-    contact him and find out what he has to say.
-
-    <p>Ka-Ping Yee demoed a Mailman discussion thread weaver.
-    This tool weaves the various messages in a discussion thread
-    into a single document so you can follow the entire
-    conversation. Since we&#39;re looking very seriously at
-    moving Boost to Mailman, this could be a really useful thing
-    for us to have. If we do this, we&#39;ll move the yahoogroups
-    discussions into the mailman archive so old discussions can
-    be easily accessed in the same fashion.
-
-    <p>And, just because it&#39;s cool, though perhaps not
-    relevant: http://homepages.ulb.ac.be/~arigo/psyco/ is a
-    promising effort to accelerate the execution of Python code
-    to speeds approaching those of compiled languages. It
-    reminded me a lot of Todd Veldhuizen&#39;s research into
-    moving parts of C++ template compilation to runtime, only
-    coming from the opposite end of things.
-
-    <h2><a name="progress">Boost.Python v2 Progress</a></h2>
-    Here&#39;s what actually got accomplished. 
-
-    <h3><a name="documentation">Documentation</a></h3>
-
-    <p>My first priority upon returning from Python10 was to get
-    some documentation in place. After wasting an unfortunate
-    amount of time looking at automatic documentation tools which
-    don&#39;t quite work, I settled down to use Bill Kempf&#39;s
-    HTML templates designed to be a boost standard. While they
-    are working well, it is highly labor-intensive.
-
-    <p>I decided to begin with the high-level reference material,
-    as opposed to tutorial, narrative, or nitty-gritty details of
-    the framework. It seemed more important to have a precise
-    description of the way the commonly-used components work than
-    to have examples in HTML (since we already have some test
-    modules), and since the low-level details are much
-    less-frequently needed by users it made sense for me to
-    simply respond to support requests for the time being.
-
-    <p>After completing approximately 60% of the high-level docs
-    (currently checked in to libs/python/doc/v2), I found myself
-    ready to start documenting the mechanisms for creating
-    to-/from-python converters. This caused a dilemma: I had
-    realized during the previous week that a much simpler,
-    more-efficient, and easier-to-use implementation was
-    possible, but I hadn&#39;t planned on implementing it right
-    away, since what was already in place worked adequately. I
-    had also received my first query on the C++-sig about how to
-    write such a converter
-
-    <p>Given the labor-intensive nature of documentation writing,
-    I decided it would be a bad idea to document the conversion
-    mechanism if I was just going to rewrite it. Often the best
-    impetus for simplifying a design is the realization that
-    understandably documenting its current state would be too
-    difficult, and this was no exception.
-
-    <h3><a name="conversion">Overhaul of
-    <code>to_python</code>/<code>from_python</code> conversion
-    mechanism</a></h3>
-
-    <p>There were two basic realizations involved here:
-
-    <ol>
-      <li><code>to_python</code> conversion could be a one-step
-      process, once an appropriate conversion function is found.
-      This allows elimination of the separate indirect
-      convertibility check
-
-      <li>There are basically two categories of from_python
-      conversions: those which lvalues stored within or held by
-      the Python object (essentially extractions), like what
-      happens when an instance of a C++ class exposed with class_
-      is used as the target of a wrapped member function), and
-      those in which a new rvalue gets created, as when a Python
-      Float is converted to a C++
-      <code>complex&lt;double&gt;</code> or a Python tuple is
-      converted to a C++ <code>std::vector&lt;&gt;</code>. From
-      the client side, there are two corresponding categories of
-      conversion: those which demand an lvalue conversion and
-      those which can accept an lvalue or an rvalue conversion.
-    </ol>
-    The latter realization allowed the following collapse, which
-    considerably simplified things: 
-
-    <blockquote>
-      <table border="1" summary="Conversion protocol">
-        <tr>
-          <th>Target Type
-
-          <th>Eligible Converters
-
-        <tr>
-          <td><code>T</code> 
-
-          <td rowspan="5"><code>T</code> rvalue or lvalue
-
-        <tr>
-          <td><code>T const</code> 
-
-        <tr>
-          <td><code>T volatile</code> 
-
-        <tr>
-          <td><code>T const volatile</code> 
-
-        <tr>
-          <td><code>T const&amp;</code> 
-
-        <tr>
-          <td><code>T const*</code> 
-
-          <td rowspan="9"><code>T</code> lvalue
-
-        <tr>
-          <td><code>T volatile*</code> 
-
-        <tr>
-          <td><code>T const volatile*</code> 
-
-        <tr>
-          <td><code>T&amp;</code> 
-
-        <tr>
-          <td><code>T volatile&amp;</code> 
-
-        <tr>
-          <td><code>T const volatile&amp;</code> 
-
-        <tr>
-          <td><code>T* const&amp;</code> 
-
-        <tr>
-          <td><code>T const* const&amp;</code> 
-
-        <tr>
-          <td><code>T volatile*const&amp;</code> 
-
-        <tr>
-          <td><code>T const volatile*const&amp;</code> 
-      </table>
-    </blockquote>
-    This job included the following additional enhancements: 
-
-    <ul>
-      <li>Elimination of virtual functions, which cause object
-      code bloat
-
-      <li>Registration of a single converter function for all
-      lvalue conversions, two for all rvalue conversions
-
-      <li>Killed lots of unneeded code
-
-      <li>Increased opacity of registry interface
-
-      <li>Eliminated all need for decorated runtime type
-      identifiers
-
-      <li>Updated test modules to reflect new interface
-
-      <li>Eliminated the need for users to worry about converter
-      lifetime issues Additional Builtin Conversion Enhancements
-
-      <li>Support for complex&lt;float&gt;,
-      complex&lt;double&gt;, and complex&lt;long double&gt;
-      conversions
-
-      <li>Support for bool conversions
-
-      <li>NULL pointers representable by None in Python
-
-      <li>Support for conversion of Python classic classes to
-      numeric types
-    </ul>
-
-    <h3><a name="miscellaneous">Miscellaneous</a></h3>
-    These don&#39;t fit easily under a large heading: 
-
-    <ul>
-      <li>Support CallPolicies for class member functions
-
-      <li>from_python_data.hpp: revamped type alignment
-      metaprogram so that it&#39;s fast enough for KCC
-
-      <li>classfwd.hpp header forward-declares class_&lt;T&gt;
-
-      <li>indirect_traits.hpp:
-
-      <li>added is_pointer_to_reference
-
-      <li>fixed bugs
-
-      <li>Reduced recompilation dependencies
-
-      <li>msvc_typeinfo works around broken MS/Intel typeid()
-      implementation
-
-      <li>Many fixes and improvements to the type_traits library
-      in order to work around compiler bugs and suppress warnings
-
-      <li>Eliminated the need for explicit acquisition of
-      converter registrations
-
-      <li>Expanded constructor support to 6 arguments
-
-      <li>Implemented generalized pointer lifetime support
-
-      <li>Updated code generation for returning.hpp
-
-      <li>Tracked down and fixed cycle GC bugs
-
-      <li>Added comprehensive unit tests for destroy_reference,
-      pointer_type_id, select_from_python, complex&lt;T&gt;,
-      bool, and classic class instance conversions
-    </ul>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p class="c3">&copy; Copyright <a href= 
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a>
-    2002. All Rights Reserved.
-
diff --git a/doc/v2/from_python.html b/doc/v2/from_python.html
deleted file mode 100644
index 6d08f733..00000000
--- a/doc/v2/from_python.html
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/from_python.hpp&gt;</title>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/from_python.hpp&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a>
-
-      <dt><a href="#classes">Classes</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#from_python-spec">Class
-          Template<code>from_python</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#from_python-spec-synopsis">Class Template
-              <code>from_python</code> synopsis</a>
-
-              <dt><a href="#from_python-spec-ctors">Class Template
-              <code>from_python</code> constructor</a>
-
-              <dt><a href="#from_python-spec-observers">Class Template
-              <code>from_python</code> observer functions</a>
-            </dl>
-        </dl>
-
-      <dt><a href="#examples">Example</a>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/from_python.hpp&gt;</code> introduces a class
-    template <code>from_python&lt;T&gt;</code> for extracting a C++ object of
-    type <code>T</code> from a Python object.
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="from_python-spec"></a>Class Template
-    <code>from_python&lt;class T&gt;</code></h3>
-
-    <p><code>from_python&lt;T&gt;</code> is the type used internally by
-    Boost.Python to extract C++ function arguments from a Python argument tuple
-    when calling a wrapped function. It can also be used directly to make
-    similar conversions in other contexts.
-
-    <h4><a name="from_python-spec-synopsis"></a>Class Template
-    <code>from_python</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-   template &lt;class T&gt;
-   struct from_python : private <a href=
-"../../../utility/utility.htm#Class noncopyable">boost::noncopyable</a> // Exposition only.
-       // from_python&lt;T&gt; meets the <a href=
-"NonCopyable.html">NonCopyable</a> requirements
-   {
-      from_python(PyObject*);
-      bool convertible() const;
-      <i>convertible-to-T</i> operator()(PyObject*) const;
-   };
-}
-</pre>
-
-    <h4><a name="from_python-spec-ctors"></a>Class Template
-    <code>from_python</code> constructor</h4>
-<pre>
-from_python(PyObject* p);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>p != 0</code>
-
-      <dt><b>Effects:</b> Constructs a <code>from_python</code> object suitable
-      for extracting a C++ object of type <code>T</code> from <code>p</code>.
-    </dl>
-
-    <h4><a name="from_python-spec-observers"></a>Class Template
-    <code>from_python</code> observer functions</h4>
-<pre>
-bool convertible() const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>false</code> if the conversion cannot succeed.
-      This indicates that either:
-
-      <dd>
-        <ol>
-          <li>No <code>from_python_converter</code> was registered for
-          <code>T</code>, or
-
-          <li>any such converter rejected the constructor argument
-          <code>p</code> by returning <code>0</code> from its
-          <code>convertible()</code> function
-        </ol>
-        Note that conversion may still fail in <code>operator()</code> due to
-        an exception. 
-
-      <dt><b>Throws:</b> nothing
-
-      <dt><b>Rationale:</b> Because <code>from_python&lt;&gt;</code> is used in
-      overload resolution, and throwing an exception can be slow, it is useful
-      to be able to rule out a broad class of unsuccessful conversions without
-      throwing an exception.
-    </dl>
-<pre>
-<i>convertible-to-T</i> operator()(PyObject* p) const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>*p</code> refers to the same object which was
-      passed to the constructor, and <code>convertible()</code> returns
-      <code>true</code>.
-
-      <dt><b>Effects:</b> performs the conversion
-
-      <dt><b>Returns:</b> an object convertible to <code>T</code>.
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-#include &lt;string&gt;
-#include &lt;boost/python/from_python.hpp&gt;
-
-// If a std::string can be extracted from p, return its
-// length. Otherwise, return 0.
-std::size_t length_if_string(PyObject* p)
-{
-   from_python&lt;std::string&gt; converter(p);
-   if (!converter.convertible())
-      return 0;
-   else
-      return converter(p).size();
-}
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
diff --git a/doc/v2/handle.html b/doc/v2/handle.html
deleted file mode 100644
index 947bc82c..00000000
--- a/doc/v2/handle.html
+++ /dev/null
@@ -1,333 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/handle.hpp&gt;</title>
-
-    <style type="text/css">
- p.c4 {font-style: italic}
- span.c3 {color: #ff0000}
- h2.c2 {text-align: center}
- h1.c1 {text-align: center}
-        </style>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 class="c1"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 class="c2">Header &lt;boost/python/handle.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#handle-spec">Class template
-          <code>handle</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#handle-spec-synopsis">Class <code>handle</code>
-              synopsis</a></dt>
-
-              <dt><a href="#handle-spec-ctors">Class <code>handle</code>
-              constructors and destructor</a></dt>
-
-              <dt><a href="#handle-spec-modifiers">Class <code>handle</code>
-              modifier functions</a></dt>
-
-              <dt><a href="#handle-spec-observers">Class <code>handle</code>
-              observer functions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#borrowed-spec"><code>borrowed</code></a></dt>
-
-          <dt><a href="#allow_null-spec"><code>allow_null</code></a></dt>
-        </dl>
-      </dd>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/handle.hpp&gt;</code> provides
-    <code>class&nbsp;template&nbsp;handle</code>, a smart pointer for
-    managing reference-counted Python objects.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="handle-spec"></a>Class template <code>handle</code></h3>
-
-    <p><code>handle</code> is a smart pointer to a Python object type; it
-    holds a pointer of type <code>T*</code>, where T is its template
-    parameter. <code>T</code> must be either a type derived from
-    <code>PyObject</code> or a <a href="definitions.html#POD">POD</a> type
-    whose initial <code>sizeof(PyObject)</code> bytes are layout-compatible
-    with <code>PyObject</code>. Use <code>handle&lt;&gt;</code> at the
-    boundary between the Python/'C' API and high-level code; prefer <code><a
-    href="object.html#object-spec">object</a></code> for a generalized
-    interface to Python objects.</p>
-
-    <p><a name="upcast"></a>In this document, the term "upcast" refers to an
-    operation which converts a pointer <code>Y*</code> to a base class
-    pointer <code>T*</code> via <code>static_cast&lt;T*&gt;</code> if
-    <code>Y</code> is derived from <code>T</code>, or via C-style cast
-    <code>(T*)</code> if it is not. However, in the latter case the "upcast"
-    is ill-formed if the initial <code>sizeof(PyObject)</code> bytes of
-    <code>Y</code> are not layout-compatible with <code>PyObject</code>.</p>
-
-    <h4><a name="handle-spec-synopsis"></a>Class template handle
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;class T&gt;
-  class handle
-  {
-      typedef <i>unspecified-member-function-pointer</i> bool_type;
-
-   public: // types
-      typedef T element_type;
-
-   public: // member functions
-      ~handle();
-
-      template &lt;class Y&gt;
-      explicit handle(detail::borrowed&lt;null_ok&lt;Y&gt; &gt;* p);
-
-      template &lt;class Y&gt;
-      explicit handle(null_ok&lt;detail::borrowed&lt;Y&gt; &gt;* p);
-
-      template &lt;class Y&gt;
-      explicit handle(detail::borrowed&lt;Y&gt;* p);
-
-      template &lt;class Y&gt;
-      explicit handle(null_ok&lt;Y&gt;* p);
-
-      template &lt;class Y&gt;
-      explicit handle(Y* p);
-
-      handle();
-
-      handle&amp; operator=(handle const&amp; r);
-
-      template&lt;typename Y&gt;
-      handle&amp; operator=(handle&lt;Y&gt; const &amp; r); // never throws
-
-
-      template &lt;typename Y&gt;
-      handle(handle&lt;Y&gt; const&amp; r);
-
-      handle(handle const&amp; r);
-
-      T* operator-&gt; () const;
-      T&amp; operator* () const;
-      T* get() const;
-      void reset();
-      T* release();
-
-      operator bool_type() const; // never throws
-   private:
-      T* m_p;
-  };
-  
-  template &lt;class T&gt; struct null_ok;
-  namespace detail { template &lt;class T&gt; struct borrowed; }
-}}
-</pre>
-
-    <h4><a name="handle-spec-ctors">Class <code>handle</code> constructors
-    and destructor</a></h4>
-<pre>
-virtual ~handle();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>Py_XDECREF(</code><i>upcast</i><code>&lt;PyObject*&gt;(m_p))</code></dt>
-    </dl>
-<pre>
-template &lt;class Y&gt;
-explicit handle(detail::borrowed&lt;null_ok&lt;Y&gt; &gt;* p);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>Py_XINCREF(</code><i>upcast</i><code>&lt;PyObject*&gt;(p));
-      m_p&nbsp;=&nbsp;</code><i>upcast</i><code>&lt;T*&gt;(p);</code></dt>
-    </dl>
-<pre>
-template &lt;class Y&gt;
-explicit handle(null_ok&lt;detail::borrowed&lt;Y&gt; &gt;* p);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>Py_XINCREF(</code><i>upcast</i><code>&lt;PyObject*&gt;(p));
-      m_p&nbsp;=&nbsp;</code><i>upcast</i><code>&lt;T*&gt;(p);</code></dt>
-    </dl>
-<pre>
-template &lt;class Y&gt;
-explicit handle(detail::borrowed&lt;Y&gt;* p);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>Py_XINCREF(</code><i>upcast</i><code>&lt;PyObject*&gt;(p));
-      m_p&nbsp;=&nbsp;</code><i>upcast</i><code>&lt;T*&gt;(<a href=
-      "errors.html#expect_non_null-spec">expect_non_null</a>(p));</code></dt>
-    </dl>
-<pre>
-template &lt;class Y&gt;
-explicit handle(null_ok&lt;Y&gt;* p);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>m_p&nbsp;=&nbsp;</code><i>upcast</i><code>&lt;T*&gt;(p);</code></dt>
-    </dl>
-<pre>
-template &lt;class Y&gt;
-explicit handle(Y* p);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>m_p&nbsp;=&nbsp;</code><i>upcast</i><code>&lt;T*&gt;(<a href=
-      "errors.html#expect_non_null-spec">expect_non_null</a>(p));</code></dt>
-    </dl>
-<pre>
-handle();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> <code>m_p&nbsp;=&nbsp;0;</code></dt>
-    </dl>
-<pre>
-template &lt;typename Y&gt;
-handle(handle&lt;Y&gt; const&amp; r);
-handle(handle const&amp; r);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>m_p&nbsp;=&nbsp;r.m_p;&nbsp;Py_XINCREF(</code><i>upcast</i><code>&lt;PyObject*&gt;(m_p));</code></dt>
-    </dl>
-
-    <h4><a name="handle-spec-modifiers">Class <code>handle</code>
-    modifiers</a></h4>
-<pre>
-handle&amp; operator=(handle const&amp; r);
-template&lt;typename Y&gt;
-handle&amp; operator=(handle&lt;Y&gt; const &amp; r); // never throws
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>Py_XINCREF(</code><i>upcast</i><code>&lt;PyObject*&gt;(r.m_p));&nbsp;Py_XDECREF(</code><i>
-      upcast</i><code>&lt;PyObject*&gt;(m_p));&nbsp;m_p&nbsp;=&nbsp;r.m_p;</code></dt>
-    </dl>
-<pre>
-T* release();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> <code>T* x = m_p;&nbsp;m_p&nbsp;=&nbsp;0;return
-      x;</code></dt>
-    </dl>
-<pre>
-void reset();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>*this&nbsp;=&nbsp;handle&lt;T&gt;();</code></dt>
-    </dl>
-
-    <h4><a name="handle-spec-observers">Class <code>handle</code>
-    observers</a></h4>
-<pre>
-T* operator-&gt; () const;
-T* get() const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>m_p;</code></dt>
-    </dl>
-<pre>
-T&amp; operator* () const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>*m_p;</code></dt>
-    </dl>
-<pre>
-operator bool_type() const; // never throws
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> 0 if <code>m_p&nbsp;==&nbsp;0</code>, a pointer
-      convertible to <code>true</code> otherwise.</dt>
-    </dl>
-
-    <h2><a name="functions"></a>Functions</h2>
-
-    <h3><a name="borrowed-spec"></a><code>borrowed</code></h3>
-<pre>
-template &lt;class T&gt;
-detail::borrowed&lt;T&gt;* borrowed(T* p)
-{
-    return (detail::borrowed&lt;T&gt;*)p;
-}
-</pre>
-
-    <h3><a name="allow_null-spec"></a><code>allow_null</code></h3>
-<pre>
-template &lt;class T&gt;
-null_ok&lt;T&gt;* allow_null(T* p)
-{
-    return (null_ok&lt;T&gt;*)p;
-}
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     13 November, 2002 
-    <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p class="c4">&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</p>
-  </body>
-</html>
-
diff --git a/doc/v2/has_back_reference.html b/doc/v2/has_back_reference.html
deleted file mode 100644
index ab92e353..00000000
--- a/doc/v2/has_back_reference.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/has_back_reference.hpp&gt;</title>
-
-    <style type="text/css">
- p.c3 {font-style: italic}
- h2.c2 {text-align: center}
- h1.c1 {text-align: center}
-            </style>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 class="c1"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 class="c2">Header
-          &lt;boost/python/has_back_reference.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#has_back_reference-spec">Class template
-          <code>has_back_reference</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#has_back_reference-spec-synopsis">Class template
-              <code>has_back_reference</code> synopsis</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#examples">Example(s)</a></dt>
-        </dl>
-      </dd>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/has_back_reference.hpp&gt;</code> defines the
-    traits class template <code>has_back_reference&lt;&gt;</code>, which can
-    be specialized by the user to indicate that a wrapped class instance
-    holds a <code>PyObject*</code> corresponding to a Python object.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="has_back_reference-spec"></a>Class template
-    <code>has_back_reference</code></h3>
-
-    <p>A unary metafunction whose <code>value</code> is true iff its argument
-    is a <code>pointer_wrapper&lt;&gt;</code>.</p>
-
-    <h4><a name="has_back_reference-spec-synopsis"></a>Class template
-    <code>has_back_reference</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    template&lt;class WrappedClass&gt; class has_back_reference
-    { 
-        static <i>unspecified</i> value = false;
-    };
-}}
-</pre>
-
-    <p>A "<a href="../../../../more/generic_programming.html#traits">traits
-    class</a>" which is inspected by Boost.Python to determine how wrapped
-    classes can be constructed.</p>
-
-    <dl class="traits-semantics">
-      <dt><code>value</code> is an integral constant convertible to bool of
-      unspecified type.</dt>
-
-      <dt>Specializations may substitute a value convertible to
-      <code>true</code> for <code>value</code> iff for each invocation of
-      <code>class_&lt;WrappedClass&gt;::def(init&lt;</code><i>type-sequence...</i><code>
-      &gt;())</code>, there exists a corresponding constructor
-      <code>WrappedClass::WrappedClass(PyObject*,&nbsp;</code><i>type-sequence...</i>
-      <code>)</code>. If such a specialization exists, the
-      <code>WrappedClass</code> constructors will be called with a "back
-      reference" pointer to the corresponding Python object whenever they are
-      invoked from Python.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <h3>C++ module definition</h3>
-<pre>
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/has_back_reference.hpp&gt;
-#include &lt;boost/python/handle.hpp&gt;
-#include &lt;boost/shared_ptr.hpp&gt;
-
-using namespace boost::python;
-
-struct X
-{
-    X(PyObject* self) : m_self(self), m_x(0) {}
-    X(PyObject* self, int x) : m_self(self), m_x(x) {}
-    
-    handle&lt;&gt; self() { return handle&lt;&gt;(borrowed(m_self)); }
-    int get() { return m_x; }
-    void set(int x) { m_x = x; }
-
-    PyObject* m_self;
-    int x;
-};
-
-// specialize has_back_reference for X
-namespace boost { namespace python
-{
-  template &lt;&gt;
-  struct has_back_reference&lt;X&gt;
-  {
-     enum { value = true; }
-  }
-}}
-
-struct Y
-{
-    Y() : m_x(0) {}
-    Y(int x) : m_x(x) {}
-    int get() { return m_x; }
-    void set(int x) { m_x = x; }
-
-    int x;
-};
-
-boost::shared_ptr&lt;Y&gt; Y_self(boost::shared_ptr&lt;Y&gt; self) const { return self; }
-
-BOOST_PYTHON_MODULE(back_references)
-{
-    class_&lt;X&gt;("X")
-       .def(init&lt;int&gt;())
-       .def("self", &amp;X::self)
-       .def("get", &amp;X::get)
-       .def("set", &amp;X::set)
-       ;
-
-    class_&lt;Y, shared_ptr&lt;Y&gt; &gt;("Y")
-       .def(init&lt;int&gt;())
-       .def("get", &amp;Y::get)
-       .def("set", &amp;Y::set)
-       .def("self", Y_self)
-       ;
-}
-</pre>
-    The following Python session illustrates that <code>x.self()</code>
-    returns the same Python object on which it is invoked, while
-    <code>y.self()</code> must create a new Python object which refers to the
-    same Y instance. 
-
-    <h3>Python code</h3>
-<pre>
-&gt;&gt;&gt; from back_references import *
-&gt;&gt;&gt; x = X(1)
-&gt;&gt;&gt; x2 = x.self()
-&gt;&gt;&gt; x2 is x
-<b>1</b>
-&gt;&gt;&gt; (x.get(), x2.get())
-(1, 1)
-&gt;&gt;&gt; x.set(10)
-&gt;&gt;&gt; (x.get(), x2.get())
-(10, 10)
-&gt;&gt;&gt;
-&gt;&gt;&gt;
-&gt;&gt;&gt; y = Y(2)
-&gt;&gt;&gt; y2 = y.self()
-&gt;&gt;&gt; y2 is y
-<b>0</b>
-&gt;&gt;&gt; (y.get(), y2.get())
-(2, 2)
-&gt;&gt;&gt; y.set(20)
-&gt;&gt;&gt; (y.get(), y2.get())
-(20, 20)
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p class="c3">&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</p>
-  </body>
-</html>
-
diff --git a/doc/v2/header.html b/doc/v2/header.html
deleted file mode 100644
index 73d3aea6..00000000
--- a/doc/v2/header.html
+++ /dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;{{header}}&gt;</title>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;{{header}}&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a>
-
-      <dt><a href="#macros">Macros</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#macro-spec">{{macro name}}</a>
-        </dl>
-
-      <dt><a href="#values">Values</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#value-spec">{{value name}}</a>
-        </dl>
-
-      <dt><a href="#types">Types</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#type-spec">{{type name}}</a>
-        </dl>
-
-      <dt><a href="#classes">Classes</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#class-spec">Class <code>{{name}}</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#class-spec-synopsis">Class <code>{{name}}</code> synopsis</a>
-
-              <dt><a href="#class-spec-ctors">Class <code>{{name}}</code>
-              constructors and destructor</a>
-
-              <dt><a href="#class-spec-comparisons">Class <code>{{name}}</code> comparison functions</a>
-
-              <dt><a href="#class-spec-modifiers">Class <code>{{name}}</code> modifier functions</a>
-
-              <dt><a href="#class-spec-observers">Class <code>{{name}}</code> observer functions</a>
-
-              <dt><a href="#class-spec-statics">Class <code>{{name}}</code> static functions</a>
-            </dl>
-        </dl>
-
-      <dt><a href="#functions">Functions</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#function-spec">{{function name}}</a>
-        </dl>
-
-      <dt><a href="#objects">Objects</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#object-spec">{{object name}}</a>
-        </dl>
-
-      <dt><a href="#examples">Example(s)</a>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>{{Introductory text}}
-
-    <h2><a name="macros"></a>Macros</h2>
-
-    <p><a name="macro-spec"></a>{{Macro specifications}}
-
-    <h2><a name="values"></a>Values</h2>
-
-    <p><a name="value-spec"></a>{{Value specifications}}
-
-    <h2><a name="types"></a>Types</h2>
-
-    <p><a name="type-spec"></a>{{Type specifications}}
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="class-spec"></a>Class <code>{{name}}</code></h3>
-
-    <p>{{class overview text}}
-
-    <h4><a name="class-spec-synopsis"></a>Class <code>{{name}}</code> synopsis</h4>
-<pre>
-namespace boost
-{
-    class {{name}}
-  {
-  };
-};
-</pre>
-
-    <h4><a name="class-spec-ctors"></a>Class <code>{{name}}</code> constructors and
-    destructor</h4>
-<pre>
-{{constructor}}
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> {{text}}
-
-      <dt><b>Effects:</b> {{text}}
-
-      <dt><b>Postconditions:</b> {{text}}
-
-      <dt><b>Returns:</b> {{text}}
-
-      <dt><b>Throws:</b> {{text}}
-
-      <dt><b>Complexity:</b> {{text}}
-
-      <dt><b>Rationale:</b> {{text}}
-    </dl>
-<pre>
-{{destructor}}
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> {{text}}
-
-      <dt><b>Effects:</b> {{text}}
-
-      <dt><b>Postconditions:</b> {{text}}
-
-      <dt><b>Returns:</b> {{text}}
-
-      <dt><b>Throws:</b> {{text}}
-
-      <dt><b>Complexity:</b> {{text}}
-
-      <dt><b>Rationale:</b> {{text}}
-    </dl>
-
-    <h4><a name="class-spec-comparisons"></a>Class <code>{{name}}</code> comparison
-    functions</h4>
-<pre>
-{{function}}
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> {{text}}
-
-      <dt><b>Effects:</b> {{text}}
-
-      <dt><b>Postconditions:</b> {{text}}
-
-      <dt><b>Returns:</b> {{text}}
-
-      <dt><b>Throws:</b> {{text}}
-
-      <dt><b>Complexity:</b> {{text}}
-
-      <dt><b>Rationale:</b> {{text}}
-    </dl>
-
-    <h4><a name="class-spec-modifiers"></a>Class <code>{{name}}</code> modifier
-    functions</h4>
-<pre>
-{{function}}
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> {{text}}
-
-      <dt><b>Effects:</b> {{text}}
-
-      <dt><b>Postconditions:</b> {{text}}
-
-      <dt><b>Returns:</b> {{text}}
-
-      <dt><b>Throws:</b> {{text}}
-
-      <dt><b>Complexity:</b> {{text}}
-
-      <dt><b>Rationale:</b> {{text}}
-    </dl>
-
-    <h4><a name="class-spec-observers"></a>Class <code>{{name}}</code> observer
-    functions</h4>
-<pre>
-{{function}}
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> {{text}}
-
-      <dt><b>Effects:</b> {{text}}
-
-      <dt><b>Postconditions:</b> {{text}}
-
-      <dt><b>Returns:</b> {{text}}
-
-      <dt><b>Throws:</b> {{text}}
-
-      <dt><b>Complexity:</b> {{text}}
-
-      <dt><b>Rationale:</b> {{text}}
-    </dl>
-
-    <h4><a name="class-spec-statics"></a>Class <code>{{name}}</code> static functions</h4>
-<pre>
-{{function}}
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> {{text}}
-
-      <dt><b>Effects:</b> {{text}}
-
-      <dt><b>Postconditions:</b> {{text}}
-
-      <dt><b>Returns:</b> {{text}}
-
-      <dt><b>Throws:</b> {{text}}
-
-      <dt><b>Complexity:</b> {{text}}
-
-      <dt><b>Rationale:</b> {{text}}
-    </dl>
-
-    <h2><a name="functions"></a>Functions</h2>
-<pre>
-
-
-<a name="function-spec"></a>{{function}}
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> {{text}}
-
-      <dt><b>Effects:</b> {{text}}
-
-      <dt><b>Postconditions:</b> {{text}}
-
-      <dt><b>Returns:</b> {{text}}
-
-      <dt><b>Throws:</b> {{text}}
-
-      <dt><b>Complexity:</b> {{text}}
-
-      <dt><b>Rationale:</b> {{text}}
-    </dl>
-
-    <h2><a name="objects"></a>Objects</h2>
-
-    <p><a name="object-spec"></a>{{Object specifications}}
-
-    <h2><a name="examples"></a>Example(s)</h2>
-
-    <p>{{Example(s)}}
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
diff --git a/doc/v2/implicit.html b/doc/v2/implicit.html
deleted file mode 100644
index c830a6c9..00000000
--- a/doc/v2/implicit.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/implicit.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/implicit.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#implicitly_convertible-spec">Function Template
-          <code>implicitly_convertible</code></a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-    <code>implicitly_convertible</code> allows Boost.Python to implicitly
-    take advantage of a C++ implicit or explicit conversion when matching
-    Python objects to C++ argument types. 
-
-    <h2><a name="functions"></a>Functions</h2>
-
-    <h3><a name="implicitly_convertible-spec"></a>Function template
-    <code>implicitly_convertible</code></h3>
-<pre>
-template &lt;class Source, class Target&gt;
-void implicitly_convertible();
-</pre>
-
-    <table border="1" summary="implicitly_convertible template parameters">
-      <caption>
-        <b><code>implicitly_convertible</code> template parameters</b><br>
-      </caption>
-
-      <tr>
-        <th>Parameter</th>
-
-        <th>Description</th>
-      </tr>
-
-      <tr>
-        <td><code>Source</code></td>
-
-        <td>The source type of the implicit conversion</td>
-      </tr>
-
-      <tr>
-        <td><code>Target</code></td>
-
-        <td>The target type of the implicit conversion</td>
-      </tr>
-    </table>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> The declaration <code>Target t(s);</code>, where
-      <code>s</code> is of type <code>Source</code>, is valid.</dt>
-
-      <dt><b>Effects:</b> registers an rvalue <code>from_python</code>
-      converter to <code>Target</code> which can succeed for any
-      <code>PyObject*&nbsp;p</code> iff there exists any registered converter
-      which can produce <code>Source</code> rvalues</dt>
-
-      <dt><b>Rationale:</b> C++ users expect to be able to take advantage of
-      the same sort of interoperability in Python as they do in C++.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <h3>C++ module definition</h3>
-<pre>
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/implicit.hpp&gt;
-#include &lt;boost/python/module.hpp&gt;
-
-using namespace boost::python;
-
-struct X
-{
-    X(int x) : v(x) {}
-    operator int() { return v; }
-    int v;
-};
-
-int x_value(X const&amp; x)
-{
-    return x.v;
-}
-
-X make_x(int n) { return X(n); }
-
-BOOST_PYTHON_MODULE(implicit_ext)
-{
-    def("x_value", x_value);
-    def("make_x", make_x);
-
-    class_&lt;X&gt;("X", 
-        init&lt;int&gt;())
-        ;
-
-    implicitly_convertible&lt;X,int&gt;();
-    implicitly_convertible&lt;int,X&gt;();
-}
-</pre>
-
-    <h3>Python code</h3>
-<pre>
-&gt;&gt;&gt; from implicit_ext import *
-&gt;&gt;&gt; x_value(X(42))
-42
-&gt;&gt;&gt; x_value(42)
-42
-&gt;&gt;&gt; x = make_x(X(42))
-&gt;&gt;&gt; x_value(x)
-42
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/index.html b/doc/v2/index.html
deleted file mode 100644
index 0d5ace16..00000000
--- a/doc/v2/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="refresh" content="0; URL=../index.html">
-
-    <title></title>
-  </head>
-
-  <body>
-    Loading index page; if nothing happens, please go to <a href=
-    "../index.html">../index.html</a>.
-  </body>
-</html>
-
diff --git a/doc/v2/indexing.html b/doc/v2/indexing.html
deleted file mode 100644
index b139843b..00000000
--- a/doc/v2/indexing.html
+++ /dev/null
@@ -1,636 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st February 2003), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-    <title>
-      Indexing Support
-    </title>
-  </head>
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%"
-           summary="header">
-      <tr>
-        <td valign="top" width="300">
-          <h3>
-            <a href="../../../../index.htm"><img height="86" width="277"
-                 alt="C++ Boost" src="../../../../c++boost.gif" border=
-                 "0"></a>
-          </h3>
-        </td>
-        <td valign="top">
-          <h1 align="center">
-            <a href="../index.html">Boost.Python</a>
-          </h1>
-          
-      <h2> Headers &lt;boost/python/indexing/indexing_suite.hpp&gt;<br>
-        &lt;boost/python/indexing/vector_indexing_suite.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-    <h2>
-      Contents
-    </h2>
-    <dl class="page-index">
-      <dt>
-        <a href="#introduction">Introduction</a>
-      </dt>
-      <dt>
-        <a href="#interface">Interface</a>
-      </dt>
-      <dd>
-        <dl class="page-index">
-          <dt>
-            <a href="#indexing_suite">indexing_suite</a>
-          </dt>
-          <dt>
-            <a href="#indexing_suite_subclasses">indexing_suite
-            sub-classes</a>
-          </dt>
-          <dd>
-            <dl class="page-index">
-              <dt>
-                <a href="#vector_indexing_suite">vector_indexing_suite</a>
-              </dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-    </dl>
-    <dl>
-      <dt>
-        <a href="#indexing_suite_class">indexing_suite class</a>
-      </dt>
-      <dt>
-        <a href="#vector_indexing_suite_class">vector_indexing_suite
-        class</a>
-      </dt>
-    </dl>
-    <hr>
-    <h2>
-      <a name="introduction" id="introduction"></a>Introduction
-    </h2>
-    <p>
-      Indexing is a Boost Python facility for easy exportation of indexable
-      C++ containers to Python. Indexable containers are containers that
-      allow random access through the operator[] (e.g. std::vector).
-    </p>
-    <p>
-      While Boost Python has all the facilities needed to expose indexable
-      C++ containers such as the ubiquitous std::vector to Python, the
-      procedure is not as straightforward as we'd like it to be. Python
-      containers do not map easily to C++ containers. Emulating Python
-      containers in C++ (see Python Reference Manual, <a href=
-      "http://www.python.org/doc/current/ref/sequence-types.html">Emulating
-      container types</a>) using Boost Python is non trivial. There are a lot
-      of issues to consider before we can map a C++ container to Python.
-      These involve implementing wrapper functions for the methods
-      <strong>__len__</strong>, <strong>__getitem__</strong>,
-      <strong>__setitem__</strong>, <strong>__delitem__,</strong>
-      <strong>__iter__</strong> and <strong>__contains</strong>.
-    </p>
-    <p>
-      The goals:
-    </p>
-    <ul>
-      <li>
-        <div>
-          Make indexable C++ containers behave exactly as one would expect a
-          Python container to behave.
-        </div>
-      </li>
-      <li>
-        Provide default reference semantics for container element indexing
-        (<tt>__getitem__</tt>) such that <tt>c[i]</tt> can be mutable.
-        Require: 
-        <div>
-          <pre>
-    val = c[i]
-    c[i].m()
-    val == c[i]
-          </pre>
-        </div>where <tt>m</tt> is a non-const (mutating) member function
-        (method).
-      </li>
-      <li>
-        Return safe references from <tt>__getitem__</tt> such that subsequent
-        adds and deletes to and from the container will not result in
-        dangling references (will not crash Python).
-      </li>
-      <li>
-        Support slice indexes.
-      </li>
-      <li>
-        Accept Python container arguments (e.g. lists, tuples) wherever
-        appropriate.
-      </li>
-      <li>
-        Allow for extensibility through re-definable policy classes.
-      </li>
-      <li>
-        Provide predefined support for the most common STL and STL like
-        indexable containers.
-      </li>
-    </ul>
-    <hr>
-    
-<h2> <a name="interface"></a>The Boost.Python Indexing Interface</h2>
-<h3> <a name="indexing_suite"></a>indexing_suite [ Header &lt;boost/python/indexing/indexing_suite.hpp&gt; 
-  ]</h3>
-    <p>
-      The <tt>indexing_suite</tt> class is the base protocol class for the
-      management of C++ containers intended to be integrated to Python. The
-      objective is make a C++ container look and feel and behave exactly as
-      we'd expect a Python container. The class automatically wraps these
-      special Python methods (taken from the Python reference: <a href=
-      "http://www.python.org/doc/current/ref/sequence-types.html">Emulating
-      container types</a>):
-    </p>
-    <dl>
-      <dd>
-        <dl>
-          <dt>
-            <b><a name="l2h-126"><tt class=
-            "method">__len__</tt></a></b>(<var>self</var>)
-          </dt>
-          <dd>
-            Called to implement the built-in function <tt class=
-            "function">len()</tt><a name="l2h-134">&nbsp;</a> Should return
-            the length of the object, an integer <code>&gt;=</code> 0. Also,
-            an object that doesn't define a <tt class=
-            "method">__nonzero__()</tt> method and whose <tt class=
-            "method">__len__()</tt> method returns zero is considered to be
-            false in a Boolean context. <a name="l2h-128">&nbsp;</a>
-          </dd>
-        </dl>
-        <dl>
-          <dt>
-            <b><a name="l2h-129"><tt class=
-            "method">__getitem__</tt></a></b>(<var>self, key</var>)
-          </dt>
-          <dd>
-            Called to implement evaluation of
-            <code><var>self</var>[<var>key</var>]</code>. For sequence types,
-            the accepted keys should be integers and slice
-                objects.<a name="l2h-135">&nbsp;</a> Note that the special
-                interpretation of negative indexes (if the class wishes to
-                emulate a sequence type) is up to the <tt class=
-                "method">__getitem__()</tt> method. If <var>key</var> is of
-                an inappropriate type, <tt class="exception">TypeError</tt>
-                may be raised; if of a value outside the set of indexes for
-                the sequence (after any special interpretation of negative
-                values), <tt class="exception">IndexError</tt> should be
-                raised. <span class="note"><b class="label">Note:</b>
-                <tt class="keyword">for</tt> loops expect that an <tt class=
-                "exception">IndexError</tt> will be raised for illegal
-                indexes to allow proper detection of the end of the
-                sequence.</span>
-          </dd>
-        </dl>
-        <dl>
-          <dt>
-            <b><a name="l2h-130"><tt class=
-            "method">__setitem__</tt></a></b>(<var>self, key, value</var>)
-          </dt>
-          <dd>
-            Called to implement assignment to
-            <code><var>self</var>[<var>key</var>]</code>. Same note as for
-            <tt class="method">__getitem__()</tt>. This should only be
-            implemented for mappings if the objects support changes to the
-            values for keys, or if new keys can be added, or for sequences if
-            elements can be replaced. The same exceptions should be raised
-            for improper <var>key</var> values as for the <tt class=
-            "method">__getitem__()</tt> method.
-          </dd>
-        </dl>
-        <dl>
-          <dt>
-            <b><a name="l2h-131"><tt class=
-            "method">__delitem__</tt></a></b>(<var>self, key</var>)
-          </dt>
-          <dd>
-            Called to implement deletion of
-            <code><var>self</var>[<var>key</var>]</code>. Same note as for
-            <tt class="method">__getitem__()</tt>. This should only be
-            implemented for mappings if the objects support removal of keys,
-            or for sequences if elements can be removed from the sequence.
-            The same exceptions should be raised for improper <var>key</var>
-            values as for the <tt class="method">__getitem__()</tt> method.
-          </dd>
-        </dl>
-        <dl>
-          <dt>
-            <b><a name="l2h-132"><tt class=
-            "method">__iter__</tt></a></b>(<var>self</var>)
-          </dt>
-          <dd>
-            This method is called when an iterator is required for a
-            container. This method should return a new iterator object that
-            can iterate over all the objects in the container. For mappings,
-            it should iterate over the keys of the container, and should also
-            be made available as the method <tt class=
-            "method">iterkeys()</tt>. 
-            <p>
-              Iterator objects also need to implement this method; they are
-              required to return themselves. For more information on iterator
-              objects, see ``<a class="ulink" href=
-              "http://www.python.org/doc/current/lib/typeiter.html">Iterator
-              Types</a>'' in the <em class="citetitle"><a href=
-              "http://www.python.org/doc/current/lib/lib.html" title=
-              "Python Library Reference">Python Library Reference</a></em>.
-            </p>
-          </dd>
-        </dl>
-        <dl>
-          <dt>
-            <b><a name="l2h-133"><tt class=
-            "method">__contains__</tt></a></b>(<var>self, item</var>)
-          </dt>
-          <dd>
-            Called to implement membership test operators. Should return true
-            if <var>item</var> is in <var>self</var>, false otherwise. For
-            mapping objects, this should consider the keys of the mapping
-            rather than the values or the key-item pairs.
-          </dd>
-        </dl>
-      </dd>
-    </dl>
-    
-<h3> <a name="indexing_suite_subclasses"></a>indexing_suite sub-classes</h3>
-    <p>
-      The <tt>indexing_suite</tt> is not meant to be used as is. A couple of
-      policy functions must be supplied by subclasses of
-      <tt>indexing_suite</tt>. However, a set of <tt>indexing_suite</tt>
-      subclasses for the standard indexable STL containers will be provided,
-      In most cases, we can simply use the available predefined suites. In
-      some cases, we can refine the predefined suites to suit our needs.
-    </p>
-    
-<h3> <a name="vector_indexing_suite"></a>vector_indexing_suite [ Header &lt;boost/python/indexing/vector_indexing_suite.hpp&gt; 
-  ] </h3>
-<p>
-      The <tt>vector_indexing_suite</tt> class is a predefined
-      <tt>indexing_suite</tt> derived class designed to wrap
-      <tt>std::vector</tt> (and <tt>std::vector</tt> like [i.e. a class with
-      std::vector interface]) classes (currently, this is the only predefined
-      suite available). It provides all the policies required by the
-      <tt>indexing_suite</tt>.
-    </p>
-    <p>
-      Example usage:
-    </p>
-    <pre>
-    class X {...};
-    ...
-
-    class_&lt;std::vector&lt;X&gt; &gt;("XVec")
-        .def(vector_indexing_suite&lt;std::vector&lt;X&gt; &gt;())
-    ;
-</pre>
-    <p>
-      <tt>XVec</tt> is now a full-fledged Python container (see the
-         <a href="../../test/vector_indexing_suite.cpp">example in full</a>,
-         along with its <a href="../../test/vector_indexing_suite.py">python
-         test</a>).
-    </p>
-    <hr>
-    <h2>
-      <a name="indexing_suite_class"></a>indexing_suite class
-    </h2>
-    <h3>
-      Class template<br>
-       <tt>indexing_suite&lt;<br>
-       class <font color="#007F00">Container</font><br>
-       , class <font color="#007F00">DerivedPolicies<br></font></tt> <tt>,
-      bool <font color="#007F00">NoProxy</font><br>
-       , bool <font color="#007F00">NoProxy</font>,<br>
-       , class <font color="#007F00">Element</font><br>
-       , class <font color="#007F00">Key</font><br>
-       , class <font color="#007F00">Index</font></tt>
-    </h3>
-    <table width="100%" border="1">
-      <tr>
-        <td>
-          <strong>Template Parameter</strong><br>
-        </td>
-        <td>
-          <strong>Requirements</strong>
-        </td>
-        <td>
-          <strong>Semantics</strong>
-        </td>
-        <td>
-          <strong>Default</strong>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <font color="#007F00"><tt>Container</tt></font>
-        </td>
-        <td>
-          A class type
-        </td>
-        <td>
-          The container type to be wrapped to Python.
-        </td>
-        <td>&nbsp;
-          
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <font color="#007F00"><tt>DerivedPolicies</tt></font>
-        </td>
-        <td>
-          A subclass of indexing_suite
-        </td>
-        <td>
-          Derived classes provide the policy hooks. See <a href=
-          "#DerivedPolicies">DerivedPolicies</a> below.
-        </td>
-        <td>&nbsp;
-          
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <font color="#007F00"><tt>NoProxy</tt></font>
-        </td>
-        <td>
-          A boolean
-        </td>
-        <td>
-          By default indexed elements have Python reference semantics and are
-          returned by proxy. This can be disabled by supplying
-          <strong>true</strong> in the <tt>NoProxy</tt> template parameter.
-        </td>
-        <td>
-          false
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <font color="#007F00"><tt>Element</tt></font>
-        </td>
-        <td>&nbsp;
-          
-        </td>
-        <td>
-          The container's element type.
-        </td>
-        <td>
-          <tt>Container::value_type</tt>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <font color="#007F00"><tt>Key</tt></font>
-        </td>
-        <td>&nbsp;
-          
-        </td>
-        <td>
-          The container's key type.
-        </td>
-        <td>
-          <tt>Container::value_type</tt>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <font color="#007F00"><tt>Index</tt></font>
-        </td>
-        <td>&nbsp;
-          
-        </td>
-        <td>
-          The container's index type.
-        </td>
-        <td>
-          <tt>Container::size_type</tt>
-        </td>
-      </tr>
-    </table>
-    <pre>
-    template &lt;<br>          class Container
-        , class DerivedPolicies
-        , bool NoProxy = false
-        , class Element = typename Container::value_type
-        , class Key = typename Container::value_type
-        , class Index = typename Container::size_type
-    &gt;<br>    class indexing_suite
-        : unspecified
-    {
-    public:
-
-        indexing_suite(); // default constructor
-    }
-    </pre>
-    <h2>
-      <tt><a name="DerivedPolicies"></a>DerivedPolicies</tt>
-    </h2>
-    <dl>
-      <dd>
-        Derived classes provide the hooks needed by
-        the<tt>indexing_suite:</tt>
-      </dd>
-    </dl>
-    <pre>
-        static element_type&amp;
-        get_item(Container&amp; container, index_type i);
-
-        static object
-        get_slice(Container&amp; container, index_type from, index_type to);
-
-        static void
-        set_item(Container&amp; container, index_type i, element_type const&amp; v);
-
-        static void
-        set_slice(
-            Container&amp; container, index_type from,
-            index_type to, element_type const&amp; v
-        );
-
-        template &lt;class Iter&gt;
-        static void<br>        set_slice(Container&amp; container, index_type from,
-            index_type to, Iter first, Iter last
-        );
-
-        static void
-        delete_item(Container&amp; container, index_type i);
-
-        static void
-        delete_slice(Container&amp; container, index_type from, index_type to);
-
-        static size_t
-        size(Container&amp; container);
-
-        template &lt;class T&gt;
-        static bool
-        contains(Container&amp; container, T const&amp; val);
-
-        static index_type
-        convert_index(Container&amp; container, PyObject* i);
-
-        static index_type
-        adjust_index(index_type current, index_type from,
-            index_type to, size_type len
-        );
-</pre>
-    <blockquote>
-      <p>
-        Most of these policies are self explanatory. <tt>However,
-        <strong>convert_index</strong></tt> and
-        <tt><strong>adjust_index</strong></tt> deserve some explanation.
-      </p>
-      <p>
-        <strong><tt>convert_index</tt></strong> converts a Python index into
-        a C++ index that the container can handle. For instance, negative
-        indexes in Python, by convention, start counting from the right(e.g.
-        <tt>C[-1]</tt> indexes the rightmost element in <tt>C</tt>).
-        <strong><tt>convert_index</tt></strong> should handle the necessary
-        conversion for the C++ container (e.g. convert <tt>-1</tt> to
-        <tt>C.size()-1</tt>). <tt><strong>convert_index</strong></tt> should
-        also be able to convert the type of the index (A dynamic Python type)
-        to the actual type that the C++ container expects.
-      </p>
-      <p>
-        When a container expands or contracts, held indexes to its elements
-        must be adjusted to follow the movement of data. For instance, if we
-        erase 3 elements, starting from index 0 from a 5 element vector, what
-        used to be at index 4 will now be at index 1:
-      </p>
-      <pre>
-    [a][b][c][d][e] ---&gt; [d][e]
-                 ^           ^
-                 4           1
-</pre>
-      <p>
-        <strong><tt>adjust_index</tt></strong> takes care of the adjustment.
-        Given a current index, the function should return the adjusted index
-        when data in the container at index <tt>from</tt>..<tt>to</tt> is
-        replaced by <tt>len</tt> elements.
-      </p>
-    </blockquote>
-    <div>
-      <hr>
-      <h2>
-        <a name="vector_indexing_suite_class"></a>vector_indexing_suite class
-      </h2>
-      <h3>
-        Class template <tt><br>
-         vector_indexing_suite&lt;<br>
-         class <font color="#007F00">Container</font><br>
-         , bool <font color="#007F00">NoProxy</font><br>
-         , class <font color="#007F00">DerivedPolicies</font>&gt;</tt>
-      </h3>
-      <table width="100%" border="1">
-        <tr>
-          <td>
-            <strong>Template Parameter</strong><br>
-          </td>
-          <td>
-            <strong>Requirements</strong>
-          </td>
-          <td>
-            <strong>Semantics</strong>
-          </td>
-          <td>
-            <strong>Default</strong>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <font color="#007F00"><tt>Container</tt></font>
-          </td>
-          <td>
-            A class type
-          </td>
-          <td>
-            The container type to be wrapped to Python.
-          </td>
-          <td>&nbsp;
-            
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <font color="#007F00"><tt>NoProxy</tt></font>
-          </td>
-          <td>
-            A boolean
-          </td>
-          <td>
-            By default indexed elements have Python reference semantics and
-            are returned by proxy. This can be disabled by supplying
-            <strong>true</strong> in the <tt>NoProxy</tt> template parameter.
-          </td>
-          <td>
-            false
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <font color="#007F00"><tt>DerivedPolicies</tt></font>
-          </td>
-          <td>
-            A subclass of indexing_suite
-          </td>
-          <td>
-            The <tt>vector_indexing_suite</tt> may still be derived to
-            further tweak any of the predefined policies. Static polymorphism
-            through CRTP (James Coplien. "Curiously Recurring Template
-            Pattern". C++ Report, Feb. 1995) enables the base
-            <tt>indexing_suite</tt> class to call policy function of the most
-            derived class
-          </td>
-          <td>&nbsp;
-            
-          </td>
-        </tr>
-      </table>
-      <pre>
-    template &lt;<br>        class Container,<br>        bool NoProxy = false,<br>        class DerivedPolicies = unspecified_default<br>    class vector_indexing_suite<br>        : public indexing_suite&lt;Container, DerivedPolicies, NoProxy&gt;<br>    {<br>    public:<br><br>        typedef typename Container::value_type element_type;<br>        typedef typename Container::value_type key_type;<br>        typedef typename Container::size_type index_type;<br>        typedef typename Container::size_type size_type;<br>        typedef typename Container::difference_type difference_type;<br>    <br>        static element_type&amp;<br>        get_item(Container&amp; container, index_type i);
-
-        static object
-        get_slice(Container&amp; container, index_type from, index_type to);
-
-        static void<br>        set_item(Container&amp; container, index_type i, element_type const&amp; v);
-
-        static void
-        set_slice(Container&amp; container, index_type from, 
-            index_type to, element_type const&amp; v);
-
-        template &lt;class Iter&gt;<br>        static void<br>        set_slice(Container&amp; container, index_type from,<br>            index_type to, Iter first, Iter last);
-
-        static void 
-        delete_item(Container&amp; container, index_type i);
-
-        static void 
-        delete_slice(Container&amp; container, index_type from, index_type to);<br>     
-        static size_t
-        size(Container&amp; container);
-     
-        static bool
-        contains(Container&amp; container, key_type const&amp; key);
-     
-        static index_type
-        convert_index(Container&amp; container, PyObject* i);
-     
-        static index_type
-        adjust_index(index_type current, index_type from, 
-            index_type to, size_type len);
-    };
-      </pre>
-      <hr>
-      &copy; Copyright Joel de Guzman 2003. Permission to copy, use, modify,
-      sell and distribute this document is granted provided this copyright
-      notice appears in all copies. This document is provided "as is" without
-      express or implied warranty, and with no claim as to its suitability
-      for any purpose.
-    </div>
-  </body>
-</html>
diff --git a/doc/v2/init.html b/doc/v2/init.html
deleted file mode 100644
index 644a54e7..00000000
--- a/doc/v2/init.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/init.hpp&gt;</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Headers &lt;boost/python/init.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-              <dt><a href=
-              "#init-expressions"><em>init-expressions</em></a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#init-spec">Class template <code>init</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#init-spec-synopsis">Class template
-              <code>init</code> synopsis</a></dt>
-
-              <dt><a href="#init-spec-ctors">Class <code>init</code>
-              constructors</a></dt>
-
-            </dl>
-          </dd>
-
-          <dt><a href="#optional-spec">Class template
-          <code>optional</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#optional-spec-synopsis">Class template
-              <code>optional</code> synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/init.hpp&gt;</code> defines the interface for
-    exposing C++ constructors to Python as extension class
-    <code>__init__</code> functions.</p>
-
-    <h2><a name="init-expressions"><em>init-expressions</em></a></h2>
-    An <em>init-expression</em> is used to describe a family of
-    <code>__init__</code> methods to be generated for an extension class, and
-    the result has the following properties: 
-
-    <blockquote>
-      <dl class="properties">
-        <dt><b>docstring:</b> An <a href="definitions.html#ntbs">ntbs</a>
-        whose value will bound to the method's <code>__doc__</code>
-        attribute</dt>
-
-        <dt><b>keywords:</b> A <a href=
-        "args.html#keyword-expression">keyword-expression</a> which will be
-        used to name (a trailing subsequence of) the arguments to the
-        generated <code>__init__</code> function(s).</dt>
-
-        <dt><b>call policies:</b> An instance of a model of <a href=
-        "CallPolicies.html">CallPolicies</a>.</dt>
-
-        <dt><b>argument types:</b> An MPL sequence of C++ argument types
-        which will be used to construct the wrapped C++ object. An init
-        expression has one or more 
-        <b>valid prefixes</b> which are given by a sequence of
-        prefixes of its argument types.</dt>
-      </dl>
-    </blockquote>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="init-spec"></a>Class template <code>init&lt;T1 =</code>
-    <i>unspecified</i><code>,&nbsp;T2 =</code>
-    <i>unspecified</i><code>,</code>...<code>Tn</code> =
-    <i>unspecified</i><code>&gt;</code></h3>
-
-    <p>A <a href="../../../mpl/doc/ref/Sequences.html">MPL sequence</a> which
-    can be used to specify a family of one or more <code>__init__</code>
-    functions. Only the last <code>T</code><i><small>i</small></i> supplied
-    may be an instantiation of <a href=
-    "#optional-spec"><code>optional</code></a><code>&lt;</code>...<code>&gt;</code>.</p>
-
-    <h4><a name="init-spec-synopsis"></a>Class template <code>init</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;T1 = <i>unspecified</i>,...T<i>n</i> = <i>unspecified</i>&gt;
-  struct init
-  {
-      init(char const* doc = 0);
-      template &lt;class Keywords&gt; init(Keywords const&amp; kw, char const* doc = 0);
-      template &lt;class Keywords&gt; init(char const* doc, Keywords const&amp; kw);
-
-      template &lt;class CallPolicies&gt;
-      <em>unspecified</em> operator[](CallPolicies const&amp; policies) const
-  };
-}}
-</pre>
-
-    <h4><a name="init-spec-ctors"></a>Class template <code>init</code>
-    constructors</h4>
-<pre>
-init(char const* doc = 0);
-template &lt;class Keywords&gt; init(Keywords const&amp; kw, char const* doc = 0);
-template &lt;class Keywords&gt; init(char const* doc, Keywords const&amp; kw);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> If supplied, <code>doc</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a>. If supplied, <code>kw</code> is the
-      result of a <a href="args.html#keyword-expression"></a></dt>
-
-      <dt><b>Effects:</b> The result is an <em>init-expression</em> whose
-      <em>docstring</em> is <code>doc</code> and whose <em>keywords</em> are
-      a reference to <code>kw</code>. If the first form is used, the
-      resulting expression's <em>keywords</em> are empty. The expression's
-      <em>call policies</em> are an instance of <a href=
-      "default_call_policies.html#default_call_policies-spec">default_call_policies</a>.
-      If <code>T</code><i><small>n</small></i> is <a href=
-      "#optional-spec"><code>optional</code></a><code>&lt;U1,&nbsp;U2,</code>...
-      <code>U</code><small><i>m</i></small><code>&gt;</code>, the
-      expression's <em>valid prefixes</em> are given by:</dt>
-
-      <dd>
-        <blockquote>
-          (<code>T1,&nbsp;T2,</code>...<code>T</code><i><small>n-1</small></i>),
-          (<code>T1,&nbsp;T2,</code>...<code>T</code><i><small>n-1</small></i>
-          <code>,&nbsp;U1</code>),
-          (<code>T1,&nbsp;T2,</code>...<code>T</code><i><small>n-1</small></i>
-          <code>,&nbsp;U1,&nbsp;U2</code>),
-          ...(<code>T1,&nbsp;T2,</code>...<code>T</code><i><small>n-1</small></i>
-          <code>,&nbsp;U1,&nbsp;U2,</code>...<code>U</code><i><small>m</small></i>).
-        </blockquote>
-        Otherwise, the expression has one <em>valid prefix</em> given by the
-        the template arguments the user specified.
-      </dd>
-    </dl>
-
-    <h4><a name="init-spec-observers"></a>Class template <code>init</code>
-    observer functions</h4>
-<pre>
-template &lt;class Policies&gt;
-<em>unspecified</em> operator[](Policies const&amp; policies) const
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> Policies is a model of <a href=
-      "CallPolicies.html">CallPolicies</a>.</dt>
-
-      <dt><b>Effects:</b> Returns a new <a href=
-      "#init-expressions"><em>init-expression</em></a> with all the same
-      properties as the <code>init</code> object except that its <em>call
-      policies</em> are replaced by a reference to
-      <code>policies</code>.</dt>
-    </dl>
-
-    <h3><a name="optional-spec"></a>Class template <code>optional&lt;T1
-    =</code> <i>unspecified</i><code>,&nbsp;T2 =</code>
-    <i>unspecified</i><code>,</code>...<code>Tn</code> =
-    <i>unspecified</i><code>&gt;</code></h3>
-
-    <p>A <a href="../../../mpl/doc/ref/Sequences.html">MPL sequence</a> which
-    can be used to specify the optional arguments to an <code>__init__</code>
-    function.</p>
-
-    <h4><a name="optional-spec-synopsis"></a>Class template
-    <code>optional</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;T1 = <i>unspecified</i>,...T<i>n</i> = <i>unspecified</i>&gt;
-  struct optional {};
-}}
-</pre>
-
-    <h2><a name="examples"></a>Example(s)</h2>
-
-    <p>Given the C++ declarations:</p>
-<pre>
-class Y;
-class X
-{
- public:
-   X(int x, Y* y) : m_y(y) {}
-   X(double);
- private:
-   Y* m_y;
-};
-</pre>
-    A corresponding Boost.Python extension class can be created with: 
-<pre>
-using namespace boost::python;
-
-class_&lt;X&gt;("X", "This is X's docstring.",
-          init&lt;int,char const*&gt;(args("x","y"), "X.__init__'s docstring")[
-                with_custodian_and_ward&lt;1,3&gt;()]
-          )
-   .def(init&lt;double&gt;())
-   ;
-</pre>
-    <hr>
-    Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-     
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/instance_holder.html b/doc/v2/instance_holder.html
deleted file mode 100755
index 4fabad4a..00000000
--- a/doc/v2/instance_holder.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content=
-    "text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/instance_holder.hpp&gt;</title>
-<style type="text/css">
- p.c4 {font-style: italic}
- span.c3 {color: #ff0000}
- h2.c2 {text-align: center}
- h1.c1 {text-align: center}
-</style>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%"
-    summary="header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width= 
-          "277" alt="C++ Boost" src="../../../../c++boost.gif" border=
-          "0"></a></h3>
-
-        <td valign="top">
-          <h1 class="c1"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 class="c2">Header &lt;boost/python/instance_holder.hpp&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a>
-
-      <dt><a href="#classes">Classes</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#instance_holder-spec">Class
-          <code>instance_holder</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#instance_holder-spec-synopsis">Class
-              <code>instance_holder</code> synopsis</a>
-
-              <dt><a href="#instance_holder-spec-ctors">Class
-              <code>instance_holder</code> destructor</a>
-
-              <dt><a href="#instance_holder-spec-modifiers">Class
-              <code>instance_holder</code> modifier functions</a>
-
-              <dt><a href="#instance_holder-spec-observers">Class
-              <code>instance_holder</code> observer functions</a>
-            </dl>
-        </dl>
-
-      <dt><a href="#examples">Example</a>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/instance_holder.hpp&gt;</code> provides
-    <code>class&nbsp;instance_holder</code>, the base class for types
-    which hold C++ instances of wrapped classes.
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="instance_holder-spec"></a>Class <code>instance_holder</code></h3>
-
-    <p><code>instance_holder</code> is an abstract base class whose
-    concrete derived classes hold C++ class instances within their
-    Python object wrappers. To allow multiple inheritance in Python
-    from C++ class wrappers, each such Python object contains a chain
-    of <code>instance_holder</code>s. When an <code>__init__</code>
-    function for a wrapped C++ class is invoked, a new
-    <code>instance_holder</code> instance is created and installed in
-    the Python object using its <code><a
-    href="#instance_holder-spec-modifiers">install</a></code>()
-    function. Each concrete class derived from
-    <code>instance_holder</code> must provide a <code><a
-    href="#instance_holder-spec-observers">holds</a>()</code>
-    implementation which allows Boost.Python to query it for the
-    type(s) it is holding. In order to support the held type's wrapped
-    constructor(s), the class must also provide constructors that can
-    accept an initial <code>PyObject*</code> argument referring to the
-    owning Python object, and which forward the rest of their
-    arguments to the constructor of the held type. The initial
-    argument is needed to enable virtual function overriding in
-    Python, and may be ignored, depending on the specific
-    <code>instance_holder</code> subclass.
-
-    <h4><a name="instance_holder-spec-synopsis"></a>Class instance_holder
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  class instance_holder : <a href="../../../utility/utility.htm#Class noncopyable">noncopyable</a>
-  {
-   public:
-      // destructor
-      virtual ~instance_holder();
-
-      // instance_holder modifiers
-      void install(PyObject* inst) throw();
-
-      // instance_holder observers
-      virtual void* holds(type_info) = 0;
-  };
-}}
-</pre>
-
-    <h4><a name="instance_holder-spec-ctors">Class <code>instance_holder</code>
-    destructor</a></h4>
-<pre>
-virtual ~instance_holder();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> destroys the object
-    </dl>
-
-    <h4><a name="instance_holder-spec-modifiers">Class
-    <code>instance_holder</code> modifiers</a></h4>
-<pre>
-void install(PyObject* inst) throw();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>inst</code> is a Python instance of a
-      wrapped C++ class type, or is a type derived from a wrapped C++
-      class type.
-      <dt><b>Effects:</b> installs the new instance at the head of the
-      Python object's chain of held instances.
-      <dt><b>Throws:</b> nothing
-    </dl>
-
-    <h4><a name="instance_holder-spec-observers">Class <code>instance_holder</code>
-    observers</a></h4>
-<pre>
-virtual void* holds(type_info x) = 0;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> A pointer to an object of the type described
-      by <code>x</code> if <code>*this</code> contains such an object,
-      0 otherwise.
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2> 
-
-The following is a simplified version of the instance holder template
-used by Boost.Python to wrap classes held by smart pointers:
-<pre>
-template &lt;class SmartPtr, class Value&gt;
-struct pointer_holder : instance_holder
-{
-   // construct from the SmartPtr type
-   pointer_holder(SmartPtr p)
-       :m_p(p)
-
-   // Forwarding constructors for the held type
-   pointer_holder(PyObject*)
-       :m_p(new Value())
-   {
-   }
-
-   template&lt;class A0&gt;
-   pointer_holder(PyObject*,A0 a0)
-       :m_p(new Value(a0))
-   {
-   }
-
-   template&lt;class A0,class A1&gt;
-   pointer_holder(PyObject*,A0 a0,A1 a1)
-       :m_p(new Value(a0,a1))
-   {
-   }
-   ...
-
- private: // required holder implementation
-   void* holds(type_info dst_t)
-   {
-       // holds an instance of the SmartPtr type...
-       if (dst_t == python::type_id&lt;SmartPtr&gt;())
-           return &amp;this-&gt;m_p;
-
-       // ...and an instance of the SmartPtr's element_type, if the
-       // pointer is non-null
-       return python::type_id&lt;Value&gt;() == dst_t ? &amp;*this-&gt;m_p : 0;
-   }
-
- private: // data members
-   SmartPtr m_p;
-};
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p class="c4">&copy; Copyright <a href= 
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All
-    Rights Reserved.
-
diff --git a/doc/v2/iterator.html b/doc/v2/iterator.html
deleted file mode 100644
index f6d80185..00000000
--- a/doc/v2/iterator.html
+++ /dev/null
@@ -1,397 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/iterator.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/iterator.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#iterator-spec">Class template
-          <code>iterator</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#iterator-spec-synopsis">Class
-              <code>iterator</code> synopsis</a></dt>
-
-              <dt><a href="#iterator-spec-ctors">Class template
-              <code>iterator</code> constructor</a></dt>
-            </dl>
-          </dd>
-        </dl>
-
-        <dl class="page-index">
-          <dt><a href="#iterators-spec">Class template
-          <code>iterators</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#iterators-spec-synopsis">Class
-              <code>iterators</code> synopsis</a></dt>
-
-              <dt><a href="#iterators-spec-types">Class template
-              <code>iterators</code> nested types</a></dt>
-
-              <dt><a href="#iterators-spec-statics">Class template
-              <code>iterators</code> static functions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#range-spec">range</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Examples</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/iterator.hpp&gt;</code> provides types and
-    functions for creating <a href=
-    "http://www.python.org/doc/current/lib/typeiter.html">Python
-    iterators</a> from <a href=
-    "http://www.sgi.com/tech/stl/Container.html">C++ Containers</a> and <a
-    href="http://www.sgi.com/tech/stl/Iterators.html">Iterators</a>. Note
-    that if your <code>class_</code> supports random-access iterators,
-    implementing <code><a href=
-    "http://www.python.org/doc/current/ref/sequence-types.html#l2h-128">__getitem__</a></code>
-    (also known as the Sequence Protocol) may serve you better than using
-    this facility: Python will automatically create an iterator type for you
-    (see <a href=
-    "http://www.python.org/doc/current/lib/built-in-funcs.html#l2h-35">iter()</a>),
-    and each access can be range-checked, leaving no possiblity of accessing
-    through an invalidated C++ iterator.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="iterator-spec"></a>Class Template <code>iterator</code></h3>
-
-    <p>Instances of <code>iterator&lt;C,P&gt;</code> hold a reference to a
-    callable Python object which, when invoked from Python, expects a single
-    argument <code>c</code> convertible to <code>C</code> and creates a
-    Python iterator that traverses [<code>c.begin()</code>,
-    <code>c.end()</code>). The optional <a href=
-    "CallPolicies.html">CallPolicies</a> <code>P</code> can be used to
-    control how elements are returned during iteration.</p>
-
-    <p>In the table below, <code><b>c</b></code> is an instance of
-    <code>Container</code>.</p>
-
-    <table border="1" summary="iterator template parameters">
-      <tr>
-        <th>Template Parameter</th>
-
-        <th>Requirements</th>
-
-        <th>Semantics</th>
-
-        <th>Default</th>
-      </tr>
-
-      <tr>
-        <td><code>Container</code></td>
-
-        <td>[c.begin(),c.end()) is a valid <a href=
-        "http://www.sgi.com/tech/stl/Iterators.html">Iterator range</a>.</td>
-
-        <td>The result will convert its argument to <code>c</code> and call
-        <code>c.begin()</code> and <code>c.end()</code> to acquire iterators.
-        To invoke <code>Container</code>'s <code>const</code>
-        <code>begin()</code> and <code>end()</code> functions, make it
-        <code>const</code>.</td>
-      </tr>
-
-      <tr>
-        <td><code>NextPolicies</code></td>
-
-        <td>A default-constructible model of <a href=
-        "CallPolicies.html#CallPolicies-concept">CallPolicies</a>.</td>
-
-        <td>Applied to the resulting iterators' <code>next()</code>
-        method.</td>
-
-        <td>An unspecified model of <a href=
-        "CallPolicies.html#CallPolicies-concept">CallPolicies</a> which
-        always makes a copy of the result of deferencing the underlying C++
-        iterator</td>
-      </tr>
-    </table>
-
-    <h4><a name="iterator-spec-synopsis"></a>Class Template iterator
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;class Container
-             , class NextPolicies = <i>unspecified</i>&gt;
-  struct iterator : <a href="object.html#object-spec">object</a>
-  {
-      iterator();
-  };
-}}
-</pre>
-
-    <h4><a name="iterator-spec-constructors"></a>Class Template iterator
-    constructor</h4>
-<pre>
-iterator()
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b></dt>
-
-      <dd>
-        Initializes its base class with the result of: 
-<pre>
-range&lt;NextPolicies&gt;(&amp;iterators&lt;Container&gt;::begin, &amp;iterators&lt;Container&gt;::end)
-</pre>
-      </dd>
-
-      <dt><b>Postconditions:</b> <code>this-&gt;get()</code> points to a
-      Python callable object which creates a Python iterator as described
-      above.</dt>
-
-      <dt><b>Rationale:</b> Provides an easy way to create iterators for the
-      common case where a C++ class being wrapped provides
-      <code>begin()</code> and <code>end()</code>.</dt>
-    </dl>
-    <!-- -->
-
-    <h3><a name="iterators-spec"></a>Class Template
-    <code>iterators</code></h3>
-
-    <p>A utility class template which provides a way to reliably call its
-    argument's <code>begin()</code> and <code>end()</code> member functions.
-    Note that there is no portable way to take the address of a member
-    function of a C++ standard library container, so
-    <code>iterators&lt;&gt;</code> can be particularly helpful when wrapping
-    them.</p>
-
-    <p>In the table below, <code><b>x</b></code> is an instance of
-    <code>C</code>.</p>
-
-    <table border="1" summary="iterator template parameters">
-      <tr>
-        <th>Required Valid Expression</th>
-
-        <th>Type</th>
-      </tr>
-
-      <tr>
-        <td><code>x.begin()</code></td>
-
-        <td>Convertible to <code>C::const_iterator</code> if <code>C</code>
-        is a <code>const</code> type; convertible to <code>C::iterator</code>
-        otherwise.</td>
-      </tr>
-
-      <tr>
-        <td><code>x.end()</code></td>
-
-        <td>Convertible to <code>C::const_iterator</code> if <code>C</code>
-        is a <code>const</code> type; convertible to <code>C::iterator</code>
-        otherwise.</td>
-      </tr>
-    </table>
-
-    <h4><a name="iterators-spec-synopsis"></a>Class Template iterators
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;class C&gt;
-  struct iterators
-  {
-      typedef typename C::[const_]iterator iterator;
-      static iterator begin(C&amp; x);
-      static iterator end(C&amp; x);
-  };
-}}
-
-</pre>
-
-    <h4><a name="iterators-spec-types"></a>Class Template iterators nested
-    types</h4>
-    If C is a <code>const</code> type, 
-<pre>
-typedef typename C::const_iterator iterator;
-</pre>
-    Otherwise: 
-<pre>
-typedef typename C::iterator iterator;
-</pre>
-
-    <h4><a name="iterators-spec-statics"></a>Class Template iterators static
-    functions</h4>
-<pre>
-static iterator begin(C&amp;);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>x.begin()</code></dt>
-    </dl>
-<pre>
-static iterator end(C&amp;);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>x.end()</code></dt>
-    </dl>
-    <!-- -->
-
-    <h2><a name="functions"></a>Functions</h2>
-<pre>
-<a name=
-"range-spec">template</a> &lt;class NextPolicies, class Target, class Accessor1, class Accessor2&gt;
-<a href=
-"object.html#object-spec">object</a> range(Accessor1 start, Accessor2 finish);
-
-template &lt;class NextPolicies, class Accessor1, class Accessor2&gt;
-<a href=
-"object.html#object-spec">object</a> range(Accessor1 start, Accessor2 finish);
-
-template &lt;class Accessor1, class Accessor2&gt;
-<a href=
-"object.html#object-spec">object</a> range(Accessor1 start, Accessor2 finish);
-</pre>
-
-    <dl class="range-semantics">
-      <dt><b>Requires:</b> <code>NextPolicies</code> is a
-      default-constructible model of <a href=
-      "CallPolicies.html#CallPolicies-concept">CallPolicies</a>.</dt>
-
-      <dt><b>Effects:</b></dt>
-
-      <dd>
-        <dl>
-          <dt>The first form creates a Python callable object which, when
-          invoked, converts its argument to a <code>Target</code> object
-          <code>x</code>, and creates a Python iterator which traverses
-          [<code><a href=
-          "../../../bind/bind.html">bind</a>(start,_1)(x)</code>,&nbsp;<code><a
-           href="../../../bind/bind.html">bind</a>(finish,_1)(x)</code>),
-          applying <code>NextPolicies</code> to the iterator's
-          <code>next()</code> function.</dt>
-
-          <dt>The second form is identical to the first, except that
-          <code>Target</code> is deduced from <code>Accessor1</code> as
-          follows:</dt>
-
-          <dd>
-            <ol>
-              <li>If <code>Accessor1</code> is a function type,
-              <code>Target</code> is the type of its first argument.</li>
-
-              <li>If <code>Accessor1</code> is a data member pointer of the
-              form <code>R&nbsp;(T::*)</code>, <code>Target</code> is
-              identical to <code>T</code>.</li>
-
-              <li>If <code>Accessor1</code> is a member function pointer of
-              the form
-              <code>R&nbsp;(T::*)(</code><i>arguments...</i><code>)</code>&nbsp;
-              <i>cv-opt</i>, where <i>cv-opt</i> is an optional
-              <code>cv-qualifier</code>, <code>Target</code> is identical to
-              <code>T</code>.</li>
-            </ol>
-          </dd>
-
-          <dt>The third form is identical to the second, except that
-          <code>NextPolicies</code> is an unspecified model of <a href=
-          "CallPolicies.html#CallPolicies-concept">CallPolicies</a> which
-          always makes a copy of the result of deferencing the underlying C++
-          iterator</dt>
-        </dl>
-      </dd>
-
-      <dt><b>Rationale:</b> The use of <code><a href=
-      "../../../bind/bind.html">boost::bind</a>()</code> allows C++ iterators
-      to be accessed through functions, member functions or data member
-      pointers. Customization of <code>NextPolicies</code> (e.g. using
-      <code><a href=
-      "return_internal_reference.html#return_internal_reference-spec">return_internal_reference</a></code>)
-      is useful when it is expensive to copy sequence elements of a wrapped
-      class type. Customization of <code>Target</code> is useful when
-      <code>Accessor1</code> is a function object, or when a base class of
-      the intended target type would otherwise be deduced.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Examples</h2>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-
-#include &lt;vector&gt;
-
-using namespace boost::python;
-BOOST_PYTHON_MODULE(demo)
-{
-    class_&lt;std::vector&lt;double&gt; &gt;("dvec")
-        .def("__iter__", iterator&lt;std::vector&lt;double&gt; &gt;())
-        ;
-}
-</pre>
-    A more comprehensive example can be found in: 
-
-    <dl>
-      <dt><code><a href=
-      "../../test/iterator.cpp">libs/python/test/iterator.cpp</a></code></dt>
-
-      <dt><code><a href=
-      "../../test/input_iterator.cpp">libs/python/test/input_iterator.cpp</a></code></dt>
-
-      <dt><code><a href=
-      "../../test/iterator.py">libs/python/test/input_iterator.py</a></code></dt>
-
-      <dd>
-        <p>Revised 
-        <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-        </p>
-
-        <p><i>&copy; Copyright <a href=
-        "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All
-        Rights Reserved.</i></p>
-      </dd>
-    </dl>
-  </body>
-</html>
-
diff --git a/doc/v2/list.html b/doc/v2/list.html
deleted file mode 100644
index f999996d..00000000
--- a/doc/v2/list.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/list.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/list.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#list-spec">Class <code>list</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#list-spec-synopsis">Class <code>list</code>
-              synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Exposes a <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> for the Python
-    <a href=
-    "http://www.python.org/doc/current/lib/typesseq-mutable.html">list</a>
-    type.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="list-spec"></a>Class <code>list</code></h3>
-
-    <p>Exposes the <a href=
-    "http://www.python.org/doc/current/lib/typesseq-mutable.html">mapping
-    protocol</a> of Python's built-in <code>list</code> type. The semantics
-    of the constructors and member functions defined below can be fully
-    understood by reading the <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> concept
-    definition. Since <code>list</code> is publicly derived from <code><a
-    href="object.html#object-spec">object</a></code>, the public object
-    interface applies to <code>list</code> instances as well.</p>
-
-    <h4><a name="list-spec-synopsis"></a>Class <code>list</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  class list : public object
-  {
-   public:
-      list(); // new list
-
-      template &lt;class T&gt;
-      explicit list(T const&amp; sequence);
-
-      template &lt;class T&gt;
-      void append(T const&amp; x);
-
-      template &lt;class T&gt;
-      long count(T const&amp; value) const;
-
-      template &lt;class T&gt;
-      void extend(T const&amp; x);
-
-      template &lt;class T&gt;
-      long index(T const&amp; x) const;
-
-      template &lt;class T&gt;
-      void insert(object const&amp; index, T const&amp; x); // insert object before index
-
-      object pop(); // remove and return item at index (default last)
-      object pop(long index);
-      object pop(object const&amp; index);
-
-      template &lt;class T&gt;
-      void remove(T const&amp; value);
-
-      void reverse(); // reverse *IN PLACE*
-
-      void sort(); //  sort *IN PLACE*; if given, cmpfunc(x, y) -&gt; -1, 0, 1
-
-      template &lt;class T&gt;
-      void sort(T const&amp; value);
-  };
-}}
-</pre>
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-using namespace boost::python;
-
-// Return the number of zeroes in the list
-long zeroes(list l)
-{
-   return l.count(0);
-}
-</pre>
-
-    <p>Revised 1 October, 2002</p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/long.html b/doc/v2/long.html
deleted file mode 100644
index a9683fd3..00000000
--- a/doc/v2/long.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/long.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/long.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#long_-spec">Class <code>long_</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#long_-spec-synopsis">Class <code>long_</code>
-              synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Exposes a <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> for the Python
-    <a href=
-    "http://www.python.org/doc/current/lib/typesnumeric.html">long</a>
-    integer type.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="long_-spec"></a>Class <code>long_</code></h3>
-
-    <p>Exposes the <a href=
-    "http://www.python.org/doc/current/lib/typesnumeric.html">numeric type
-    protocol</a> of Python's built-in <code>long</code> type. The semantics
-    of the constructors and member functions defined below can be fully
-    understood by reading the <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> concept
-    definition. Since <code>long_</code> is publicly derived from <code><a
-    href="object.html#object-spec">object</a></code>, the public object
-    interface applies to <code>long_</code> instances as well.</p>
-
-    <h4><a name="long_-spec-synopsis"></a>Class <code>long_</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  class long_ : public object
-  {
-   public:
-      long_(); // new long_
-
-      template &lt;class T&gt;
-      explicit long_(T const&amp; rhs);
-
-      template &lt;class T, class U&gt;
-      long_(T const&amp; rhs, U const&amp; base);
-  };
-}}
-</pre>
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-namespace python = boost::python;
-
-// compute a factorial without overflowing
-python::long_ fact(long n)
-{
-   if (n == 0)
-      return python::long_(1);
-   else
-      return n * fact(n - 1);
-}
-</pre>
-
-    <p>Revised 1 October, 2002</p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/lvalue_from_pytype.html b/doc/v2/lvalue_from_pytype.html
deleted file mode 100755
index 9ccccd7a..00000000
--- a/doc/v2/lvalue_from_pytype.html
+++ /dev/null
@@ -1,299 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/lvalue_from_python.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/lvalue_from_pytype.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#lvalue_from_pytype-spec">Class Template
-          <code>lvalue_from_pytype</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#lvalue_from_pytype-spec-synopsis">Class Template
-              <code>lvalue_from_pytype</code> synopsis</a></dt>
-
-              <dt><a href="#lvalue_from_pytype-spec-ctors">Class Template
-              <code>lvalue_from_pytype</code> constructor</a></dt>
-            </dl>
-          </dd>
-        </dl>
-
-        <dl class="page-index">
-          <dt><a href="#extract_identity-spec">Class Template
-          <code>extract_identity</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#extract_identity-spec-synopsis">Class Template
-              <code>extract_identity</code> synopsis</a></dt>
-
-              <dt><a href="#extract_identity-spec-statics">Class Template
-              <code>extract_identity</code> static functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#extract_member-spec">Class Template
-          <code>extract_member</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#extract_member-spec-synopsis">Class Template
-              <code>extract_member</code> synopsis</a></dt>
-
-              <dt><a href="#extract_member-spec-statics">Class Template
-              <code>extract_member</code> static functions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-    <code>&lt;boost/python/lvalue_from_pytype.hpp&gt;</code> supplies a
-    facility for extracting C++ objects from within Python instances of a
-    given type. This is typically useful for dealing with "traditional"
-    Python extension types. 
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="lvalue_from_pytype-spec"></a>Class template
-    <code>lvalue_from_pytype</code></h3>
-
-    <p>Class template <code>lvalue_from_pytype</code> will register
-    from_python converters which, given an object of the given Python type,
-    can extract references and pointers to a particular C++ type. Its
-    template arguments are:</p>
-
-    <table border="1" summary="lvalue_from_pytype template parameters">
-      <caption>
-        <b><code>lvalue_from_pytype</code> Requirements</b><br>
-         In the table below, <b><code>x</code></b> denotes an object of type
-        <code>PythonObject&amp;</code>
-      </caption>
-
-      <tr>
-        <th>Parameter</th>
-
-        <th>Requirements</th>
-
-        <th>Semantics</th>
-      </tr>
-
-      <tr>
-        <td><code>Extractor</code></td>
-
-        <td>a model of <a href=
-        "Extractor.html#Extractor-concept">Extractor</a> whose execute
-        function returns a reference type.</td>
-
-        <td>Extracts the lvalue from the Python object once its type has been
-        confirmed</td>
-      </tr>
-
-      <tr>
-        <td><code>python_type</code></td>
-
-        <td>A compile-time constant <code><a href=
-        "http://www.python.org/doc/2.2/ext/dnt-type-methods.html">PyTypeObject</a>*</code></td>
-
-        <td>The Python type of instances convertible by this converter.
-        Python subtypes are also convertible.</td>
-      </tr>
-    </table>
-
-    <h4><a name="lvalue_from_pytype-spec-synopsis"></a>Class template
-    <code>lvalue_from_pytype</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-   template &lt;class Extractor, PyTypeObject const* python_type&gt;
-   struct lvalue_from_pytype
-   {
-       lvalue_from_pytype();
-   };
-}}
-</pre>
-
-    <h4><a name="lvalue_from_pytype-spec-ctors"></a>Class template
-    <code>lvalue_from_pytype</code> constructor</h4>
-<pre>
-lvalue_from_pytype();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> Registers converters which can convert Python
-      objects of the given type to lvalues of the type returned by
-      <code>Extractor::execute</code>.</dt>
-    </dl>
-
-    <h3><a name="extract_identity-spec"></a>Class template
-    <code>extract_identity</code></h3>
-
-    <p><code>extract_identity</code> is a model of <a href=
-    "Extractor.html#Extractor-concept">Extractor</a> which can be used in the
-    common case where the C++ type to be extracted is the same as the Python
-    object type.</p>
-
-    <h4><a name="extract_identity-spec-synopsis"></a>Class template
-    <code>extract_identity</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-   template &lt;class InstanceType&gt;
-   struct extract_identity
-   {
-      static InstanceType&amp; execute(InstanceType&amp; c);
-   };
-}}
-</pre>
-
-    <h4><a name="extract_identity-spec-statics"></a>Class template
-    <code>extract_identity</code> static functions</h4>
-<pre>
-InstanceType&amp; execute(InstanceType&amp; c);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>c</code></dt>
-    </dl>
-
-    <h3><a name="extract_member-spec"></a>Class template
-    <code>extract_member</code></h3>
-
-    <p><code>extract_member</code> is a model of <a href=
-    "Extractor.html#Extractor-concept">Extractor</a> which can be used in the
-    common case in the common case where the C++ type to be extracted is a
-    member of the Python object.</p>
-
-    <h4><a name="extract_member-spec-synopsis"></a>Class template
-    <code>extract_member</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-   template &lt;class InstanceType, class MemberType, MemberType (InstanceType::*member)&gt;
-   struct extract_member
-   {
-      static MemberType&amp; execute(InstanceType&amp; c);
-   };
-}}
-</pre>
-
-    <h4><a name="extract_member-spec-statics"></a>Class template
-    <code>extract_member</code> static functions</h4>
-<pre>
-static MemberType&amp; execute(InstanceType&amp; c);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>c.*member</code></dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-    This example presumes that someone has implemented the standard <a href=
-    "http://www.python.org/doc/2.2/ext/dnt-basics.html">noddy example
-    module</a> from the Python documentation, and we want to build a module
-    which manipulates <code>Noddy</code>s. Since
-    <code>noddy_NoddyObject</code> is so simple that it carries no
-    interesting information, the example is a bit contrived: it assumes you
-    want to keep track of one particular object for some reason. This module
-    would have to be dynamically linked to the module which defines
-    <code>noddy_NoddyType</code>. 
-
-    <h3>C++ module definition</h3>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/handle.hpp&gt;
-#include &lt;boost/python/borrowed.hpp&gt;
-#include &lt;boost/python/lvalue_from_pytype.hpp&gt;
-
-// definition lifted from the Python docs
-typedef struct {
-   PyObject_HEAD
-} noddy_NoddyObject;
-
-using namespace boost::python;
-static handle&lt;noddy_NoddyObject&gt; cache;
-
-bool is_cached(noddy_NoddyObject* x)
-{
-   return x == cache.get();
-}
-
-void set_cache(noddy_NoddyObject* x)
-{
-   cache = handle&lt;noddy_NoddyObject&gt;(borrowed(x));
-}
-
-BOOST_PYTHON_MODULE(noddy_cache)
-{
-   def("is_cached", is_cached);
-   def("set_cache", set_cache);
-
-   // register Noddy lvalue converter
-   lvalue_from_pytype&lt;extract_identity&lt;noddy_NoddyObject&gt;,&amp;noddy_NoddyType&gt;();
-}
-</pre>
-
-    <h3>Python code</h3>
-<pre>
-&gt;&gt;&gt; import noddy
-&gt;&gt;&gt; n = noddy.new_noddy()
-&gt;&gt;&gt; import noddy_cache
-&gt;&gt;&gt; noddy_cache.is_cached(n)
-0
-&gt;&gt;&gt; noddy_cache.set_cache(n)
-&gt;&gt;&gt; noddy_cache.is_cached(n)
-1
-&gt;&gt;&gt; noddy_cache.is_cached(noddy.new_noddy())
-0
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  20 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/make_function.html b/doc/v2/make_function.html
deleted file mode 100644
index d64e859a..00000000
--- a/doc/v2/make_function.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/make_function.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/make_function.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#make_function-spec">make_function</a></dt>
-
-          <dt><a href="#make_constructor-spec">make_constructor</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code><a href="#make_function-spec">make_function</a>()</code> and
-    <code><a href="#make_constructor-spec">make_constructor</a>()</code> are
-    the functions used internally by <code><a href=
-    "def.html#def-spec">def</a>()</code> and <code>class_&lt;&gt;::<a href=
-    "class.html#class_-spec-modifiers">def</a>()</code> to produce Python
-    callable objects which wrap C++ functions and member functions.</p>
-
-    <h2><a name="functions"></a>Functions</h2>
-<pre>
-<a name="make_function-spec">template &lt;class F&gt;</a>
-<a href="object.html#object-spec">object</a> make_function(F f)
-
-template &lt;class F, class Policies&gt;
-<a href=
-"object.html#object-spec">object</a> make_function(F f, Policies const&amp; policies)
-
-template &lt;class F, class Policies, class KeywordsOrSignature&gt;
-<a href=
-"object.html#object-spec">object</a> make_function(F f, Policies const&amp; policies, KeywordsOrSignature const&amp; ks)
-
-template &lt;class F, class Policies, class Keywords, class Signature&gt;
-<a href=
-"object.html#object-spec">object</a> make_function(F f, Policies const&amp; policies, Keywords const&amp; kw, Signature const&amp; sig)
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>F</code> is a function pointer or member
-      function pointer type. If <code>policies</code> are supplied, it must
-      be a model of <a href="CallPolicies.html">CallPolicies</a>. If
-      <code>kewords</code> are supplied, it must be the result of a <a href=
-      "args.html#keyword-expression"><em>keyword-expression</em></a>
-      specifying no more arguments than the <a href=
-      "definitions.html#arity">arity</a> of <code>f</code>.</dt>
-
-      <dt><b>Effects:</b> Creates a Python callable object which, when called
-      from Python, converts its arguments to C++ and calls <code>f</code>. If
-      <code>F</code> is a pointer-to-member-function type, the target
-      object of the function call (<code>*this</code>) will be taken
-      from the first Python argument, and subsequent Python arguments
-      will be used as the arguments
-      to <code>f</code>. <ul>
-<li>        If <code>policies</code> are supplied, it
-      will be applied to the function as described <a href=
-      "CallPolicies.html">here</a>. 
-<li>If <code>keywords</code> are
-      supplied, the keywords will be applied in order to the final
-      arguments of the resulting function.  
-<li>If <code>Signature</code>
-      is supplied, it should be an instance of an <a
-      href="../../mpl/doc/ref/Sequence.html">MPL front-extensible
-      sequence</a> representing the function's return type followed by
-      its argument types.  Pass a <code>Signature</code> when wrapping
-      function object types whose signatures can't be deduced, or when
-      you wish to override the types which will be passed to the
-      wrapped function.
-</ul></dt>
-
-      <dt><b>Returns:</b> An instance of <a href=
-      "object.html#object-spec">object</a> which holds the new Python
-      callable object.</dt>
-
-      <dt><b>Caveats:</b> An argument of pointer type may
-      be <code>0</code> if <code>None</code> is passed from Python.
-      An argument type which is a constant reference may refer to a
-      temporary which was created from the Python object for just the
-      duration of the call to the wrapped function, for example
-      a <code>std::vector</code> conjured up by the conversion process
-      from a Python list.  Use a non-<code>const</code> reference
-      argument when a persistent lvalue is required.
-    </dl>
-
-<pre>
-<a name=
-"make_constructor-spec"></a>template &lt;class T, class ArgList, class Generator&gt;
-<a href="object.html#object-spec">object</a> make_constructor();
- 
-template &lt;class ArgList, class Generator, class Policies&gt;
-<a href=
-"object.html#object-spec">object</a> make_constructor(Policies const&amp; policies)
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>T</code> is a class type.
-      <code>Policies</code> is a model of <a href=
-      "CallPolicies.html">CallPolicies</a>. <code>ArgList</code> is an <a
-      href="../../../mpl/doc/Sequences.html">MPL sequence</a> of C++ argument
-      types (<i>A1,&nbsp;A2,...&nbsp;AN</i>) such that if
-      <code>a1,&nbsp;a2</code>...&nbsp;<code>aN</code> are objects of type
-      <i>A1,&nbsp;A2,...&nbsp;AN</i> respectively, the expression <code>new
-      Generator::apply&lt;T&gt;::type(a1,&nbsp;a2</code>...&nbsp;<code>aN</code>)
-      is valid. Generator is a model of <a href=
-      "HolderGenerator.html">HolderGenerator</a>.</dt>
-
-      <dt><b>Effects:</b> Creates a Python callable object which, when called
-      from Python, expects its first argument to be a Boost.Python extension
-      class object. It converts its remaining its arguments to C++ and passes
-      them to the constructor of a dynamically-allocated
-      <code>Generator::apply&lt;T&gt;::type</code> object, which is then
-      installed in the extension class object. In the second form, the
-      <code>policies</code> are applied to the arguments and result (<a href=
-      "http://www.python.org/doc/current/lib/bltin-null-object.html">None</a>)
-      of the Python callable object</dt>
-
-      <dt><b>Returns:</b> An instance of <a href=
-      "object.html#object-spec">object</a> which holds the new Python
-      callable object.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <p>C++ function exposed below returns a callable object wrapping one of
-    two functions.</p>
-<pre>
-#include &lt;boost/python/make_function.hpp&gt;
-#include &lt;boost/python/module.hpp&gt;
-
-char const* foo() { return "foo"; }
-char const* bar() { return "bar"; }
-
-using namespace boost::python;
-object choose_function(bool selector)
-{
-    if (selector)
-        return boost::python::make_function(foo);
-    else
-        return boost::python::make_function(bar);
-}
-
-BOOST_PYTHON_MODULE(make_function_test)
-{
-    def("choose_function", choose_function);
-}
-</pre>
-    It can be used this way in Python: 
-<pre>
-&gt;&gt;&gt; from make_function_test import *
-&gt;&gt;&gt; f = choose_function(1)
-&gt;&gt;&gt; g = choose_function(0)
-&gt;&gt;&gt; f()
-'foo'
-&gt;&gt;&gt; g()
-'bar'
-</pre>
-
-    <p>
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/manage_new_object.html b/doc/v2/manage_new_object.html
deleted file mode 100644
index 6b94a4d4..00000000
--- a/doc/v2/manage_new_object.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/manage_new_object.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/manage_new_object.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#manage_new_object-spec">Class
-          <code>manage_new_object</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#manage_new_object-spec-synopsis">Class
-              <code>manage_new_object</code> synopsis</a></dt>
-
-              <dt><a href="#manage_new_object-spec-metafunctions">Class
-              <code>manage_new_object</code> metafunctions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="manage_new_object-spec"></a>Class
-    <code>manage_new_object</code></h3>
-
-    <p><code>manage_new_object</code> is a model of <a href=
-    "ResultConverter.html#ResultConverterGenerator-concept">ResultConverterGenerator</a>
-    which can be used to wrap C++ functions which return a pointer to an
-    object allocated with a <i>new-expression</i>, and expect the caller to
-    take responsibility for deleting that object.</p>
-
-    <h4><a name="manage_new_object-spec-synopsis"></a>Class
-    <code>manage_new_object</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    struct manage_new_object
-    {
-        template &lt;class T&gt; struct apply;
-    };
-}}
-</pre>
-
-    <h4><a name="manage_new_object-spec-metafunctions"></a>Class
-    <code>manage_new_object</code> metafunctions</h4>
-<pre>
-template &lt;class T&gt; struct apply
-</pre>
-
-    <dl class="metafunction-semantics">
-      <dt><b>Requires:</b> <code>T</code> is <code>U*</code> for some
-      <code>U</code>.</dt>
-
-      <dt><b>Returns:</b> <code>typedef <a href=
-      "to_python_indirect.html#to_python_indirect-spec">to_python_indirect</a>&lt;T&gt;
-      type;</code></dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <p>In C++:</p>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/manage_new_object.hpp&gt;
-#include &lt;boost/python/return_value_policy.hpp&gt;
-
-
-struct Foo {
-   Foo(int x) : x(x){}
-   int get_x() { return x; }
-   int x;
-};
-
-Foo* make_foo(int x) { return new Foo(x); }
-
-// Wrapper code
-using namespace boost::python;
-BOOST_PYTHON_MODULE(my_module)
-{
-    def("make_foo", make_foo, return_value_policy&lt;manage_new_object&gt;())
-    class_&lt;Foo&gt;("Foo")
-        .def("get_x", &amp;Foo::get_x)
-        ;
-}
-</pre>
-    In Python: 
-<pre>
-&gt;&gt;&gt; from my_module import *
-&gt;&gt;&gt; f = make_foo(3)     # create a Foo object
-&gt;&gt;&gt; f.get_x()
-3
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/module.html b/doc/v2/module.html
deleted file mode 100644
index bb041f32..00000000
--- a/doc/v2/module.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/module.hpp&gt;</title>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/module.hpp&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a>
-
-      <dt><a href="#macros">Macros</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href=
-          "#BOOST_PYTHON_MODULE-spec">BOOST_PYTHON_MODULE</a>
-        </dl>
-
-      <dt><a href="#examples">Example(s)</a>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>This header provides the basic facilities needed to create a
-    Boost.Python extension module.
-
-    <h2><a name="macros"></a>Macros</h2>
-
-    <p><a name=
-    "BOOST_PYTHON_MODULE-spec"><code>BOOST_PYTHON_MODULE(name)</code></a>
-    is used to declare Python <a href=
-    "http://www.python.org/doc/2.2/ext/methodTable.html#SECTION003400000000000000000">
-    module initialization functions</a>. The <code>name</code> argument must
-    exactly match the name of the module to be initialized, and must conform to
-    Python's <a href=
-    "http://www.python.org/doc/2.2/ref/identifiers.html">identifier naming
-    rules</a>. Where you would normally write
-<pre>
-extern &quot;C&quot; void init<i>name</i>()
-{
-   ...
-}
-</pre>
-    Boost.Python modules should be initialized with 
-<pre>
-BOOST_PYTHON_MODULE(<i>name</i>)
-{
-   ...
-}
-</pre>
-
-This macro generates two functions in the scope where it is used:
-<code>extern&nbsp;&quot;C&quot;&nbsp;void&nbsp;init<i>name</i>()</code>,
-and <code>void&nbsp;init_module_<i>name</i>()</code>, whose body must
-follow the macro invocation. <code>init_<i>name</i></code> passes
-<code>init_module_<i>name</i></code> to <code><a
-href="errors.html#handle_exception">handle_exception</a>()</code> so
-that any C++ exceptions generated are safely processeed. During the
-body of <code>init_<i>name</i></code>, the current <code><a
-href="scope.html#scope-spec">scope</a></code> refers to the module
-being initialized.
-
-    <h2><a name="examples"></a>Example(s)</h2>
-
-    <p>C++ module definition:
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-
-BOOST_PYTHON_MODULE(xxx)
-{
-    throw &quot;something bad happened&quot;
-}
-</pre>
-
-Interactive Python: 
-<pre>
-&gt;&gt;&gt; import xxx
-Traceback (most recent call last):
-  File "<stdin>", line 1, in ?
-RuntimeError: Unidentifiable C++ Exception
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
diff --git a/doc/v2/numeric.html b/doc/v2/numeric.html
deleted file mode 100644
index a1d59ca9..00000000
--- a/doc/v2/numeric.html
+++ /dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/numeric.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/numeric.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#array-spec">Class <code>array</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#array-spec-synopsis">Class <code>array</code>
-              synopsis</a></dt>
-
-              <dt><a href="#array-spec-observers">Class <code>array</code>
-              observer functions</a></dt>
-
-              <dt><a href="#array-spec-statics">Class <code>array</code>
-              static functions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Exposes a <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> for the Python
-    <a href=
-    "http://www.python.org/dev/doc/devel/lib/typesmapping.html">array</a>
-    type.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="array-spec"></a>Class <code>array</code></h3>
-
-    <p>Provides access to the array types of <a href=
-    "http://www.pfdubois.com/numpy/">Numerical Python</a>'s <a href=
-    "http://www.pfdubois.com/numpy/#Numeric">Numeric</a> and <a href=
-    "http://stsdas.stsci.edu/numarray/index.html">NumArray</a> modules. With
-    the exception of the functions documented <a href=
-    "#array-spec-observers">below</a>, the semantics of the constructors and
-    member functions defined below can be fully understood by reading the <a
-    href="ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> concept
-    definition. Since <code>array</code> is publicly derived from <code><a
-    href="object.html#object-spec">object</a></code>, the public object
-    interface applies to <code>array</code> instances as well.</p>
-
-    <p><a name="default_search"></a>The default behavior is to use
-    <code>Numeric.ArrayType</code> as the associated Python type if the
-    <code>Numeric</code> module is installed in the default location.
-    Otherwise it falls back to use <code>numarray.NDArray</code>. If neither
-    extension module is installed, conversions to arguments of type
-    <code>numeric::array</code> will cause overload resolution to reject the
-    overload, and other attempted uses of <code>numeric::array</code> will <a
-    href="definitions.html#raise">raise</a> an appropriate Python exception.
-    The associated Python type can be set manually using the <code><a href=
-    "#array-spec-statics">set_module_and_type</a>(...)</code> static
-    function.</p>
-
-    <h4><a name="array-spec-synopsis"></a>Class <code>array</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace numeric
-{
-   class array : public object
-   {
-    public:
-      object astype();
-      template &lt;class Type&gt;
-      object astype(Type const&amp; type_);
-
-      template &lt;class Type&gt;
-      object new_(Type const&amp; type_) const;
-
-      template &lt;class Sequence&gt; 
-      void resize(Sequence const&amp; x);
-      void resize(long x1);
-      void resize(long x1, long x2);
-      ...
-      void resize(long x1, long x2,...long x<i>n</i>);
-
-      template &lt;class Sequence&gt; 
-      void setshape(Sequence const&amp; x);
-      void setshape(long x1);
-      void setshape(long x1, long x2);
-      ...
-      void setshape(long x1, long x2,...long x<i>n</i>);
-
-      template &lt;class Indices, class Values&gt;
-      void put(Indices const&amp; indices, Values const&amp; values);
-
-      template &lt;class Sequence&gt;
-      object take(Sequence const&amp; sequence, long axis = 0);
-
-      template &lt;class File&gt;
-      void tofile(File const&amp; f) const;
-
-      object factory();
-      template &lt;class Buffer&gt;
-      object factory(Buffer const&amp;);
-      template &lt;class Buffer, class Type&gt;
-      object factory(Buffer const&amp;, Type const&amp;);
-      template &lt;class Buffer, class Type, class Shape&gt;
-      object factory(Buffer const&amp;, Type const&amp;, Shape const&amp;, bool copy = true, bool savespace = false);
-      template &lt;class Buffer, class Type, class Shape&gt;
-      object factory(Buffer const&amp;, Type const&amp;, Shape const&amp;, bool copy, bool savespace, char typecode);
-
-      template &lt;class T1&gt;
-      explicit array(T1 const&amp; x1);
-      template &lt;class T1, class T2&gt;
-      explicit array(T1 const&amp; x1, T2 const&amp; x2);
-      ...
-      template &lt;class T1, class T2,...class T<i>n</i>&gt;
-      explicit array(T1 const&amp; x1, T2 const&amp; x2,...T<i>n</i> const&amp; xn);
-
-      static void set_module_and_type();
-      static void set_module_and_type(char const* package_path = 0, char const* type_name = 0);
-
-      object argmax(long axis=-1);
-
-      object argmin(long axis=-1);
-
-      object argsort(long axis=-1);
-
-      void byteswap();
-
-      object copy() const;
-
-      object diagonal(long offset = 0, long axis1 = 0, long axis2 = 1) const;
-
-      void info() const;
-
-      bool is_c_array() const;
-      bool isbyteswapped() const;
-      void sort();
-      object trace(long offset = 0, long axis1 = 0, long axis2 = 1) const;
-      object type() const;
-      char typecode() const;
-      
-      object getflat() const;
-      long getrank() const;
-      object getshape() const;
-      bool isaligned() const;
-      bool iscontiguous() const;
-      long itemsize() const;
-      long nelements() const;
-      object nonzero() const;
-   
-      void ravel();
-   
-      object repeat(object const&amp; repeats, long axis=0);
-   
-      void setflat(object const&amp; flat);
-   
-      void swapaxes(long axis1, long axis2);
-   
-      str tostring() const;
-   
-      void transpose(object const&amp; axes = object());
-   
-      object view() const;
-  };
-}}}
-</pre>
-
-    <h4><a name="array-spec-observers"></a>Class <code>array</code> observer
-    functions</h4>
-<pre>
-object factory();
-template &lt;class Buffer&gt;
-object factory(Buffer const&amp;);
-template &lt;class Buffer, class Type&gt;
-object factory(Buffer const&amp;, Type const&amp;);
-template &lt;class Buffer, class Type, class Shape&gt;
-object factory(Buffer const&amp;, Type const&amp;, Shape const&amp;, bool copy = true, bool savespace = false);
-template &lt;class Buffer, class Type, class Shape&gt;
-object factory(Buffer const&amp;, Type const&amp;, Shape const&amp;, bool copy, bool savespace, char typecode);
-</pre>
-    These functions map to the underlying array type's <code>array()</code>
-    function family. They are not called "<code>array</code>" because of the
-    C++ limitation that you can't define a member function with the same name
-    as its enclosing class. 
-<pre>
-template &lt;class Type&gt;
-object new_(Type const&amp;) const;
-</pre>
-    This function maps to the underlying array type's <code>new()</code>
-    function. It is not called "<code>new</code>" because that is a keyword
-    in C++. 
-
-    <h4><a name="array-spec-statics"></a>Class <code>array</code> static
-    functions</h4>
-<pre>
-static void set_module_and_type(char const* package_path, char const* type_name);
-static void set_module_and_type();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>package_path</code> and
-      <code>type_name</code>, if supplied, is an <a href=
-      "definitions.html#ntbs">ntbs</a>.</dt>
-
-      <dt><b>Effects:</b> The first form sets the package path of the module
-      which supplies the type named by <code>type_name</code> to
-      <code>package_path</code>. The second form restores the <a href=
-      "#default_search">default search behavior</a>. The associated Python
-      type will be searched for only the first time it is needed, and
-      thereafter the first time it is needed after an invocation of
-      <code>set_module_and_type</code>.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-#include &lt;boost/python/numeric.hpp&gt;
-#include &lt;boost/python/tuple.hpp&gt;
-
-// sets the first element in a 2d numeric array
-void set_first_element(numeric::array&amp; y, double value)
-{
-    y[make_tuple(0,0)] = value;
-}
-</pre>
-
-    <p>Revised 03 October, 2002</p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/object.html b/doc/v2/object.html
deleted file mode 100644
index 93b9027e..00000000
--- a/doc/v2/object.html
+++ /dev/null
@@ -1,931 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/object.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/object.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#types">Types</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#slice_nil-spec">slice_nil</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#const_attribute_policies-spec">Class
-          <code>const_attribute_policies</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#const_attribute_policies-spec-synopsis">Class
-              <code>const_attribute_policies</code> synopsis</a></dt>
-
-              <dt><a href="#const_attribute_policies-spec-statics">Class
-              <code>const_attribute_policies</code> static functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#attribute_policies-spec">Class
-          <code>attribute_policies</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#attribute_policies-spec-synopsis">Class
-              <code>attribute_policies</code> synopsis</a></dt>
-
-              <dt><a href="#attribute_policies-spec-statics">Class
-              <code>attribute_policies</code> static functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#const_item_policies-spec">Class
-          <code>const_item_policies</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#const_item_policies-spec-synopsis">Class
-              <code>const_item_policies</code> synopsis</a></dt>
-
-              <dt><a href="#const_item_policies-spec-statics">Class
-              <code>const_item_policies</code> static functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#item_policies-spec">Class
-          <code>item_policies</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#item_policies-spec-synopsis">Class
-              <code>item_policies</code> synopsis</a></dt>
-
-              <dt><a href="#item_policies-spec-statics">Class
-              <code>item_policies</code> static functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#const_slice_policies-spec">Class
-          <code>const_slice_policies</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#const_slice_policies-spec-synopsis">Class
-              <code>const_slice_policies</code> synopsis</a></dt>
-
-              <dt><a href="#const_slice_policies-spec-statics">Class
-              <code>const_slice_policies</code> static functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#slice_policies-spec">Class
-          <code>slice_policies</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#slice_policies-spec-synopsis">Class
-              <code>slice_policies</code> synopsis</a></dt>
-
-              <dt><a href="#slice_policies-spec-statics">Class
-              <code>slice_policies</code> static functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#object_operators-spec">Class
-          <code>object_operators</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#object_operators-spec-synopsis">Class
-              <code>object_operators</code> synopsis</a></dt>
-
-              <dt><a href="#object_operators-spec-observers">Class
-              <code>object_operators</code> observer functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#object-spec">Class <code>object</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#object-spec-synopsis">Class <code>object</code>
-              synopsis</a></dt>
-
-              <dt><a href="#object-spec-ctors">Class <code>object</code>
-              constructors and destructor</a></dt>
-
-              <dt><a href="#object-spec-modifiers">Class template
-              <code>object</code> modifier functions</a></dt>
-
-              <dt><a href="#object-spec-observers">Class template
-              <code>object</code> observer functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#proxy-spec">Class template
-          <code>proxy</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#proxy-spec-synopsis">Class template
-              <code>proxy</code> synopsis</a></dt>
-
-              <dt><a href="#proxy-spec-modifiers">Class template
-              <code>proxy</code> modifier functions</a></dt>
-
-              <dt><a href="#proxy-spec-observers">Class template
-              <code>proxy</code> observer functions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#del-spec">del</a></dt>
-
-          <dt><a href="#comparisons-spec">comparisons</a></dt>
-
-          <dt><a href="#binary-spec">binary operations</a></dt>
-
-          <dt><a href="#assignment-spec">assignment operations</a></dt>
-        </dl>
-
-        <dl class="page-index">
-          <dt><a href="#operators-spec">operators</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Exposes the generic Python object wrapper class <code>object</code>,
-    and related classes. In order to avoid some potenential problems with
-    argument-dependent lookup and the generalized operators defined on
-    <code>object</code>, all these facilities are defined in
-    <code>namespace&nbsp;boost::python::api</code>, and <code>object</code>
-    is imported into <code>namespace&nbsp;boost::python</code> with a
-    <i>using-declaration</i>.</p>
-
-    <h2><a name="types"></a>Types</h2>
-
-    <p><a name="slice_nil-spec"></a></p>
-<pre>
-enum slice_nil { _ };
-</pre>
-    A type that can be used to get the effect of leaving out an index in a
-    Python slice expression: 
-<pre>
-&gt;&gt;&gt; x[:-1]
-</pre>
-    C++ equivalent: 
-<pre>
-x.slice(_,-1)
-</pre>
-
-    <h2><a name="classes"></a>Classes</h2>
-    <!-- begin -->
-
-    <h3><a name="const_attribute_policies-spec"></a>Class
-    <code>const_attribute_policies</code></h3>
-
-    <p>The policies which are used for proxies representing an attribute
-    access to a <code>const&nbsp;object</code>.</p>
-
-    <h4><a name="class-spec-synopsis"></a>Class
-    <code>const_attribute_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  struct const_attribute_policies
-  {
-      typedef char const* key_type;
-      static object get(object const&amp; target, char const* key);
-  };
-}}}
-</pre>
-
-    <h4><a name="const_attribute_policies-spec-statics"></a>Class
-    <code>const_attribute_policies</code> static functions</h4>
-<pre>
-static object get(object const&amp; target, char const* key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>key</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a>.</dt>
-
-      <dt><b>Effects:</b> accesses the attribute of <code>target</code> named
-      by <code>key</code>.</dt>
-
-      <dt><b>Returns:</b> An <code>object</code> managing the result of the
-      attribute access.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-
-    <h3><a name="attribute_policies-spec"></a>Class
-    <code>attribute_policies</code></h3>
-
-    <p>The policies which are used for proxies representing an attribute
-    access to a mutable <code>object</code>.</p>
-
-    <h4><a name="attribute_policies-spec-synopsis"></a>Class
-    <code>attribute_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  struct attribute_policies : const_attribute_policies
-  {
-      static object const&amp; set(object const&amp; target, char const* key, object const&amp; value);
-      static void del(object const&amp;target, char const* key);
-  };
-}}}
-</pre>
-
-    <h4><a name="attribute_policies-spec-statics"></a>Class
-    <code>attribute_policies</code> static functions</h4>
-<pre>
-static object const&amp; set(object const&amp; target, char const* key, object const&amp; value);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>key</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a>.</dt>
-
-      <dt><b>Effects:</b> sets the attribute of <code>target</code> named by
-      <code>key</code> to <code>value</code>.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-<pre>
-static void del(object const&amp;target, char const* key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>key</code> is an <a href=
-      "definitions.html#ntbs">ntbs</a>.</dt>
-
-      <dt><b>Effects:</b> deletes the attribute of <code>target</code> named
-      by <code>key</code>.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-    <!-- end -->
-    <!-- begin -->
-
-    <h3><a name="const_item_policies-spec"></a>Class
-    <code>const_item_policies</code></h3>
-
-    <p>The policies which are used for proxies representing an item access
-    (via the Python bracket operators <code>[]</code>) to a
-    <code>const&nbsp;object</code>.</p>
-
-    <h4><a name="const_item_policies-spec-synopsis"></a>Class
-    <code>const_item_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  struct const_item_policies
-  {
-      typedef object key_type;
-      static object get(object const&amp; target, object const&amp; key);
-  };
-}}}
-</pre>
-
-    <h4><a name="const_item_policies-spec-statics"></a>Class
-    <code>const_item_policies</code> static functions</h4>
-<pre>
-static object get(object const&amp; target, object const&amp; key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> accesses the item of <code>target</code> specified
-      by <code>key</code>.</dt>
-
-      <dt><b>Returns:</b> An <code>object</code> managing the result of the
-      item access.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-
-    <h3><a name="item_policies-spec"></a>Class
-    <code>item_policies</code></h3>
-
-    <p>The policies which are used for proxies representing an item access
-    (via the Python bracket operators <code>[]</code>) to a mutable
-    <code>object</code>.</p>
-
-    <h4><a name="item_policies-spec-synopsis"></a>Class
-    <code>item_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  struct item_policies : const_item_policies
-  {
-      static object const&amp; set(object const&amp; target, object const&amp; key, object const&amp; value);
-      static void del(object const&amp; target, object const&amp; key);
-  };
-}}}
-</pre>
-
-    <h4><a name="item_policies-spec-statics"></a>Class
-    <code>item_policies</code> static functions</h4>
-<pre>
-static object const&amp; set(object const&amp; target, object const&amp; key, object const&amp; value);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> sets the item of <code>target</code> specified by
-      <code>key</code> to <code>value</code>.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-<pre>
-static void del(object const&amp; target, object const&amp; key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> deletes the item of <code>target</code> specified
-      by <code>key</code>.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-    <!-- end -->
-    <!-- begin -->
-
-    <h3><a name="const_slice_policies-spec"></a>Class
-    <code>const_slice_policies</code></h3>
-
-    <p>The policies which are used for proxies representing an slice access
-    (via the Python slice notation
-    <code>[</code><i>x</i><code>:</code><i>y</i><code>]</code>) to a
-    <code>const&nbsp;object</code>.</p>
-
-    <h4><a name="const_slice_policies-spec-synopsis"></a>Class
-    <code>const_slice_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  struct const_slice_policies
-  {
-      typedef std::pair&lt;handle&lt;&gt;, handle&lt;&gt; &gt; key_type;
-      static object get(object const&amp; target, key_type const&amp; key);
-  };
-}}}
-</pre>
-
-    <h4><a name="const_slice_policies-spec-statics"></a>Class
-    <code>const_slice_policies</code> static functions</h4>
-<pre>
-static object get(object const&amp; target, key_type const&amp; key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> accesses the slice of <code>target</code> specified
-      by <code>key</code>.</dt>
-
-      <dt><b>Returns:</b> An <code>object</code> managing the result of the
-      slice access.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-
-    <h3><a name="slice_policies-spec"></a>Class
-    <code>slice_policies</code></h3>
-
-    <p>The policies which are used for proxies representing an slice access
-    to a mutable <code>object</code>.</p>
-
-    <h4><a name="slice_policies-spec-synopsis"></a>Class
-    <code>slice_policies</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  struct slice_policies : const_slice_policies
-  {
-      static object const&amp; set(object const&amp; target, key_type const&amp; key, object const&amp; value);
-      static void del(object const&amp; target, key_type const&amp; key);
-  };
-}}}
-</pre>
-
-    <h4><a name="slice_policies-spec-statics"></a>Class
-    <code>slice_policies</code> static functions</h4>
-<pre>
-static object const&amp; set(object const&amp; target, key_type const&amp; key, object const&amp; value);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> sets the slice of <code>target</code> specified by
-      <code>key</code> to <code>value</code>.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-<pre>
-static void del(object const&amp; target, key_type const&amp; key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> deletes the slice of <code>target</code> specified
-      by <code>key</code>.</dt>
-
-      <dt><b>Throws:</b> <code><a href=
-      "errors.html#error_already_set-spec">error_already_set</a></code> if a
-      Python exception is raised.</dt>
-    </dl>
-    <!-- end -->
-
-    <h3><a name="object_operators-spec"></a>Class template
-    <code>object_operators&lt;U&gt;</code></h3>
-
-    <p>This is the base class of <code>object</code> and its
-    <code>proxy</code> template used to supply common interface: member
-    functions, and operators which must be defined within the class body. Its
-    template parameter <code>U</code> is expected to be a class derived from
-    <code>object_operators&lt;U&gt;</code>. In practice users should never
-    use this class directly, but it is documented here because it supplies
-    important interface to <code>object</code> and its proxies.</p>
-
-    <h4><a name="object_operators-spec-synopsis"></a>Class template
-    <code>object_operators</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  template &lt;class U&gt;
-  class object_operators
-  {
-   public:
-      // function call
-      //
-      object operator()() const;
-
-      template &lt;class A0&gt;
-      object operator()(A0 const&amp;) const;
-      template &lt;class A0, class A1&gt;
-      object operator()(A0 const&amp;, A1 const&amp;) const;
-      ...
-      template &lt;class A0, class A1,...class An&gt;
-      object operator()(A0 const&amp;, A1 const&amp;,...An const&amp;) const;
-
-      // truth value testing
-      //
-      typedef unspecified bool_type;
-      operator bool_type() const;
-
-      // Attribute access
-      //
-      proxy&lt;const_object_attribute&gt; attr(char const*) const;
-      proxy&lt;object_attribute&gt; attr(char const*);
-
-      // item access
-      //
-      template &lt;class T&gt;
-      proxy&lt;const_object_item&gt; operator[](T const&amp; key) const;
-    
-      template &lt;class T&gt;
-      proxy&lt;object_item&gt; operator[](T const&amp; key);
-
-      // slicing
-      //
-      template &lt;class T, class V&gt;
-      proxy&lt;const_object_slice&gt; slice(T const&amp; start, V const&amp; end) const
-    
-      template &lt;class T, class V&gt;
-      proxy&lt;object_slice&gt; slice(T const&amp; start, V const&amp; end);
-  };
-}}}
-</pre>
-
-    <h4><a name="object_operators-spec-observers"></a>Class template
-    <code>object_operators</code> observer functions</h4>
-<pre>
-object operator()() const;
-template &lt;class A0&gt;
-object operator()(A0 const&amp;) const;
-template &lt;class A0, class A1&gt;
-object operator()(A0 const&amp;, A1 const&amp;) const;
-...
-template &lt;class A0, class A1,...class An&gt;
-object operator()(A0 const&amp; a1, A1 const&amp; a2,...An const&amp; aN) const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      call&lt;object&gt;(object(*static_cast&lt;U*&gt;(this)).ptr(), a1,
-      a2,...aN)</dt>
-    </dl>
-<pre>
-operator bool_type() const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> Tests truth value of <code>*this</code>.</dt>
-
-      <dt><b>Returns:</b>
-      call&lt;object&gt;(object(*static_cast&lt;U*&gt;(this)).ptr(), a1,
-      a2,...aN)</dt>
-    </dl>
-<pre>
-proxy&lt;const_object_attribute&gt; attr(char const* name) const;
-proxy&lt;object_attribute&gt; attr(char const* name);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> name is an <a href=
-      "definitions.html#ntbs">ntbs</a>.</dt>
-
-      <dt><b>Effects:</b> accesses the named attribute of
-      <code>*this</code>.</dt>
-
-      <dt><b>Returns:</b> a proxy object which binds
-      <code>object(*static_cast&lt;U*&gt;(this))</code> as its target, and
-      <code>name</code> as its key.</dt>
-    </dl>
-<pre>
-template &lt;class T&gt;
-proxy&lt;const_object_item&gt; operator[](T const&amp; key) const;
-template &lt;class T&gt;
-proxy&lt;object_item&gt; operator[](T const&amp; key);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> accesses the item of <code>*this</code> indicated
-      by <code>key</code>.</dt>
-
-      <dt><b>Returns:</b> a proxy object which binds
-      <code>object(*static_cast&lt;U*&gt;(this))</code> as its target, and
-      <code>object(key)</code> as its key.</dt>
-    </dl>
-<pre>
-template &lt;class T, class V&gt;
-proxy&lt;const_object_slice&gt; slice(T const&amp; start; start, V const&amp; finish) const
-template &lt;class T, class V&gt;
-proxy&lt;object_slice&gt; slice(T const&amp; start; start, V const&amp; finish);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> accesses the slice of <code>*this</code> indicated
-      by <code>std::make_pair(object(start), object(finish))</code>.</dt>
-
-      <dt><b>Returns:</b> a proxy object which binds
-      <code>object(*static_cast&lt;U*&gt;(this))</code> as its target, and
-      <code>std::make_pair(object(start), object(finish))</code> as its
-      key.</dt>
-    </dl>
-    <!--  -->
-
-    <h3><a name="object-spec"></a>Class <code>object</code></h3>
-
-    <p>The intention is that <code>object</code> acts as much like a
-    Python variable as possible. Thus expressions you'd expect to work
-    in Python should generally work in the same way from C++. Most of
-    <code>object</code>'s interface is provided by its base class
-    <code><a
-    href="#object_operators-spec">object_operators</a>&lt;object&gt;</code>,
-    and the <a href="#functions">free functions</a> defined in this
-    header.
-</p> 
-
-    <h4><a name="object-spec-synopsis"></a>Class <code>object</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  class object : public object_operators&lt;object&gt;
-  {
-   public:
-      object();
-
-      object(object const&amp;);
-      
-      template &lt;class T&gt;
-      explicit object(T const&amp; x);
-
-      ~object();
-
-      object&amp; operator=(object const&amp;); 
-
-      PyObject* ptr() const;
-  };
-}}}
-</pre>
-
-    <h4><a name="object-spec-ctors"></a>Class <code>object</code>
-    constructors and destructor</h4>
-<pre>
-object();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> Constructs an object managing a reference to the
-      Python <code>None</code> object.</dt>
-
-      <dt><b>Throws:</b> nothing.</dt>
-    </dl>
-<pre>
-template &lt;class T&gt;
-explicit object(T const&amp; x);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> converts <code>x</code> to python and manages a
-      reference to it.</dt>
-
-      <dt><b>Throws:</b> <code>error_already_set</code> and sets a Python
-      <code>TypeError</code> exception if no such conversion is
-      possible.</dt>
-    </dl>
-<pre>
-~object();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> decrements the reference count of the
-      internally-held object.</dt>
-    </dl>
-
-    <h4><a name="object-spec-modifiers"></a>Class <code>object</code>
-    modifiers</h4>
-<pre>
-object&amp; operator=(object const&amp; rhs); 
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> increments the reference count of the object held
-      by <code>rhs</code> and decrements the reference count of the object
-      held by <code>*this</code>.</dt>
-    </dl>
-
-    <h4><a name="object-spec-observers"></a>Class <code>object</code>
-    observers</h4>
-<pre>
-PyObject* ptr() const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> a pointer to the internally-held Python
-      object.</dt>
-    </dl>
-    <!-- -->
-
-    <h3><a name="proxy-spec"></a>Class template <code>proxy</code></h3>
-
-    <p>This template is instantiated with various Policies described in this
-    document in order to implement attribute, item, and slice access for
-    <code>object</code>. It stores an object of type
-    <code>Policies::key_type</code>.</p>
-
-    <h4><a name="proxy-spec-synopsis"></a>Class template <code>proxy</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace api
-{
-  template &lt;class Policies&gt;
-  class proxy : public object_operators&lt;proxy&lt;Policies&gt; &gt;
-  {
-   public:
-      operator object() const;
-
-      proxy const&amp; operator=(proxy const&amp;) const;
-      template &lt;class T&gt;
-      inline proxy const&amp; operator=(T const&amp; rhs) const;
-      
-      void del() const;
-
-      template &lt;class R&gt;
-      proxy operator+=(R const&amp; rhs);
-      template &lt;class R&gt;
-      proxy operator-=(R const&amp; rhs);
-      template &lt;class R&gt;
-      proxy operator*=(R const&amp; rhs);
-      template &lt;class R&gt;
-      proxy operator/=(R const&amp; rhs);
-      template &lt;class R&gt;
-      proxy operator%=(R const&amp; rhs);
-      template &lt;class R&gt;
-      proxy operator&lt;&lt;=(R const&amp; rhs);
-      template &lt;class R&gt;
-      proxy operator&gt;&gt;=(R const&amp; rhs);
-      template &lt;class R&gt;
-      proxy operator&amp;=(R const&amp; rhs);
-      template &lt;class R&gt;
-      proxy operator|=(R const&amp; rhs);
-  };
-}}}
-</pre>
-
-    <h4><a name="proxy-spec-observers"></a>Class template <code>proxy</code>
-    observer functions</h4>
-<pre>
-operator object() const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> applies
-      <code>Policies::get(</code><i>target</i><code>,</code>&nbsp;<i>key</i>
-      <code>)</code> with the proxy's target and key objects.</dt>
-    </dl>
-
-    <h4><a name="proxy-spec-modifiers"></a>Class template <code>proxy</code>
-    modifier functions</h4>
-<pre>
-proxy const&amp; operator=(proxy const&amp; rhs) const;
-template &lt;class T&gt;
-inline proxy const&amp; operator=(T const&amp; rhs) const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>Policies::set(</code><i>target</i><code>,</code>&nbsp;<i>key</i>
-      <code>,&nbsp;object(rhs))</code> with the proxy's target and key
-      objects.</dt>
-    </dl>
-<pre>
-template &lt;class R&gt;
-proxy operator+=(R const&amp; rhs);
-template &lt;class R&gt;
-proxy operator-=(R const&amp; rhs);
-template &lt;class R&gt;
-proxy operator*=(R const&amp; rhs);
-template &lt;class R&gt;
-proxy operator/=(R const&amp; rhs);
-template &lt;class R&gt;
-proxy operator%=(R const&amp; rhs);
-template &lt;class R&gt;
-proxy operator&lt;&lt;=(R const&amp; rhs);
-template &lt;class R&gt;
-proxy operator&gt;&gt;=(R const&amp; rhs);
-template &lt;class R&gt;
-proxy operator&amp;=(R const&amp; rhs);
-template &lt;class R&gt;
-proxy operator|=(R const&amp; rhs);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> for a given operator@=,
-      <code>object(*this)&nbsp;@=&nbsp;rhs;</code></dt>
-      <dt><b>Returns:</b> <code>*this</code></dt>
-    </dl>
-<pre>
-void del() const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-      <code>Policies::del(</code><i>target</i><code>,</code>&nbsp;<i>key</i>
-      <code>)</code> with the proxy's target and key objects.</dt>
-    </dl>
-    <!-- -->
-
-    <h2><a name="functions"></a>Functions</h2>
-<pre>
-<a name="del-spec"></a>template &lt;class T&gt;
-void del(proxy&lt;T&gt; const&amp; x);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> x.del()</dt>
-    </dl>
-<pre>
-<a name="comparisons-spec"></a>
-template&lt;class L,class R&gt; bool operator&gt;(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; bool operator&gt;=(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; bool operator&lt;(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; bool operator&lt;=(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; bool operator==(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; bool operator!=(L const&amp;l,R const&amp;r);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> returns the result of applying the operator to
-      <code>object(l)</code> and <code>object(r)</code>, respectively, in
-      Python.</dt>
-    </dl>
-<pre>
-<a name="binary-spec"></a>
-template&lt;class L,class R&gt; object operator+(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; object operator-(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; object operator*(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; object operator/(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; object operator%(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; object operator&lt;&lt;(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; object operator&gt;&gt;(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; object operator&amp;(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; object operator^(L const&amp;l,R const&amp;r);
-template&lt;class L,class R&gt; object operator|(L const&amp;l,R const&amp;r);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> returns the result of applying the operator to
-      <code>object(l)</code> and <code>object(r)</code>, respectively, in
-      Python.</dt>
-    </dl>
-<pre>
-<a name="assignment-spec"></a>
-template&lt;class R&gt; object&amp; operator+=(object&amp;l,R const&amp;r);
-template&lt;class R&gt; object&amp; operator-=(object&amp;l,R const&amp;r);
-template&lt;class R&gt; object&amp; operator*=(object&amp;l,R const&amp;r);
-template&lt;class R&gt; object&amp; operator/=(object&amp;l,R const&amp;r);
-template&lt;class R&gt; object&amp; operator%=(object&amp;l,R const&amp;r);
-template&lt;class R&gt; object&amp; operator&lt;&lt;=(object&amp;l,R const&amp;r)
-template&lt;class R&gt; object&amp; operator&gt;&gt;=(object&amp;l,R const&amp;r);
-template&lt;class R&gt; object&amp; operator&amp;=(object&amp;l,R const&amp;r);
-template&lt;class R&gt; object&amp; operator^=(object&amp;l,R const&amp;r);
-template&lt;class R&gt; object&amp; operator|=(object&amp;l,R const&amp;r);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> assigns to l the result of applying the
-      corresponding Python inplace operator to <code>l</code> and
-      <code>object(r)</code>, respectively.</dt>
-
-      <dt><b>Returns:</b> <code>l</code>.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-    Python code: 
-<pre>
-def sum_items(seq):
-   result = 0
-   for x in seq:
-      result += x
-   return result
-</pre>
-    C++ version: 
-<pre>
-object sum_items(object seq)
-{
-   object result = object(0);
-   for (int i = 0; i &lt; seq.attr("__len__")(); ++i)
-      result += seq[i];
-   return result;
-}
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/opaque_pointer_converter.html b/doc/v2/opaque_pointer_converter.html
deleted file mode 100644
index 61dbb531..00000000
--- a/doc/v2/opaque_pointer_converter.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/opaque_pointer_converter.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/opaque_pointer_converter.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#opaque_pointer_converter-spec">Class template
-          <code>opaque_pointer_converter&lt;P&gt;</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#opaque_pointer_converter-spec-synopsis">Class template
-              <code>opaque_pointer_converter</code> synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#macros">Macros</a></dt>
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID-spec">Macro
-          <code>BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID</code></a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-
-      <dt><a href="#see-also">See Also</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="opaque_pointer_converter-spec"></a>Class template
-    <code>opaque_pointer_converter&lt;P&gt;</code></h3>
-
-    <p><code>opaque_pointer_converter&lt;&gt;</code> is derived from 
-          <a href="to_python_converter.html#to_python_converter-spec">
-            <code>to_python_converter</code></a>
-          and registers itself as an
-          <a href="lvalue_from_pytype.html#lvalue_from_pytype-spec">
-            <code>lvalue_from_pytype</code></a> converter from Python objects
-          into pointers to undefined types.
-            Thus it may be used as a converter from opaque pointers into
-          Python objects and vice versa.</p>
-
-    <h4><a name="opaque_pointer_converter-spec-synopsis"></a>Class template
-    <code>opaque_pointer_converter</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    template&lt;class Pointer&gt;
-    struct opaque_pointer_converter
-        : to_python_converter&lt;
-          Pointer, opaque_pointer_converter&lt;Pointer&gt; &gt;
-    {
-        explicit opaque_pointer_converter(char const* name);
-    };
-}}
-</pre>
-
-    <h4><a name="opaque_pointer_converter-spec-constructor"></a>Class template
-    <code>opaque_pointer_converter</code> constructor</h4>
-<pre>
-explicit opaque_pointer_converter(char const* name);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b>
-            <p>Registers the instance as a 
-            <a href="lvalue_from_pytype.html#lvalue_from_pytype-spec">
-              <code>lvalue_from_pytype</code></a> converter from Python objects
-            into opaque pointers.</p>
-            <p>The name is used for the type of the Python Objects created;
-              it should be printable but needn't be an 
-              <a href="definitions.html#ntbs">ntbs</a> because the object type is
-              not supposed to be user constructible within python scripts.</p>
-          </dt>
-    </dl>
-
-    <h2><a name="macros"></a>Macros</h2>
-
-    <h3><a name="BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID-spec"></a>
-      Macro BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(Pointee)</h3>
-    <p>This macro must be used to define specializations of the 
-      <a href="type_id.html#type_id-spec">type_id</a> function
-      which can't be instantiated for incomplete types.</p>
-    <h4>Note</h4>
-    <p>In order for this to work in a cross-module environment the macro must
-      be invoked in every translation unit which uses the
-      opaque_pointer_converter.</p>
-
-    <h2><a name="examples"></a>Example</h2>
-
-        please see example for <a href="return_opaque_pointer.html#example">
-          return_opaque_pointer</a>.
-
-    <h2><a name="see-also"></a>See Also</h2>
-        <p>
-          <a href="return_opaque_pointer.html">return_opaque_pointer</a>
-        </p>
-
-    <p>Revised 
-  10 March, 2003
-    </p>
-
-    <p><i>&copy; Copyright 2003 Haufe Mediengruppe. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/operators.html b/doc/v2/operators.html
deleted file mode 100755
index d7d1478a..00000000
--- a/doc/v2/operators.html
+++ /dev/null
@@ -1,898 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/operators.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/operators.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#self_t-spec">Class
-          <code>self_ns::self_t</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#self_t-spec-synopsis">Class <code>self_t</code>
-              synopsis</a></dt>
-
-              <dt><a href="#self_t-spec-inplace">Class <code>self_t</code>
-              inplace operators</a></dt>
-
-              <dt><a href="#self_t-spec-comparisons">Class
-              <code>self_t</code> comparison functions</a></dt>
-
-              <dt><a href="#self_t-spec-ops">Class <code>self_t</code>
-              non-member operations</a></dt>
-
-              <dt><a href="#self_t-spec-value-unary-ops">Class
-              <code>self_t</code> unary operations</a></dt>
-
-              <dt><a href="#self_t-spec-value-value-ops">Class
-              <code>self_t</code> value operations</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#other-spec">Class template
-          <code>other</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#other-spec-synopsis">Class <code>other</code>
-              synopsis</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#operator_-spec">Class template
-          <code>operator_</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#operator_-spec-synopsis">Class
-              <code>operator_</code> synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#objects">Objects</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#self-spec">self</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Examples</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/operators.hpp&gt;</code> provides types and
-    functions for automatically generating Python <a href=
-    "http://www.python.org/doc/ref/specialnames.html">special methods</a>
-    from the corresponding C++ constructs. Most of these constructs are
-    operator expressions, hence the name. To use the facility, substitute the
-    <code><a href="#self-spec">self</a></code> object for an object of the
-    class type being wrapped in the expression to be exposed, and pass the
-    result to <a href=
-    "class.html#class_-spec-modifiers">class_&lt;&gt;::def()</a>. Much of
-    what is exposed in this header should be considered part of the
-    implementation, so is not documented in detail here.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="self_t-spec"></a>Class <code>self_ns::self_t</code></h3>
-
-    <p><code>self_ns::self_t</code> is the actual type of the <a href=
-    "#self-spec"><code>self</code></a> object. The library isolates
-    <code>self_t</code> in its own namespace, <code>self_ns</code>, in order
-    to prevent the generalized operator templates which operate on it from
-    being found by argument-dependent lookup in other contexts. This should
-    be considered an implementation detail, since users should never have to
-    mention <code>self_t</code> directly.</p>
-
-    <h4><a name="self_t-spec-synopsis"></a>Class <code>self_ns::self_t</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace self_ns {
-{
-   <i>unspecified-type-declaration</i> self_t;
-
-   // inplace operators
-   template &lt;class T&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator+=(self_t, T);
-   template &lt;class T&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator-=(self_t, T);
-   template &lt;class T&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator*=(self_t, T);
-   template &lt;class T&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator/=(self_t, T);
-   template &lt;class T&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator%=(self_t, T);
-   template &lt;class T&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator&gt;&gt;=(self_t, T);
-   template &lt;class T&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator&lt;&lt;=(self_t, T);
-   template &lt;class T&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator&amp;=(self_t, T);
-   template &lt;class T&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator^=(self_t, T);
-   template &lt;class T&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator|=(self_t, T);
-
-   // comparisons
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator==(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator!=(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator&lt;(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator&gt;(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator&lt;=(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator&gt;=(L const&amp;, R const&amp;);
-
-   // non-member operations
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator+(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator-(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator*(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator/(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator%(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator&gt;&gt;(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator&lt;&lt;(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator&amp;(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator^(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator|(L const&amp;, R const&amp;);
-   template &lt;class L, class R&gt; <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; pow(L const&amp;, R const&amp;);
-
-   // unary operations
-   <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator-(self_t);
-   <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator+(self_t);
-   <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator~(self_t);
-   <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; operator!(self_t);
-
-   // value operations
-   <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; int_(self_t);
-   <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; long_(self_t);
-   <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; float_(self_t);
-   <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; complex_(self_t);
-   <a href=
-"#operator_-spec">operator_</a>&lt;<i>unspecified</i>&gt; str(self_t);
-
-}}};
-</pre>
-    The tables below describe the methods generated when the results of the
-    expressions described are passed as arguments to <a href=
-    "class.html#class_-spec-modifiers">class_&lt;&gt;::def()</a>.
-    <code><b>x</b></code> is an object of the class type being wrapped. 
-
-    <h4><a name="self_t-spec-inplace"></a>Class <code>self_t</code> inplace
-    operators</h4>
-    In the table below, If <code><b>r</b></code> is an object of type
-    <code><a href="#other-spec">other</a>&lt;T&gt;</code>,
-    <code><b>y</b></code> is an object of type <code>T</code>; otherwise,
-    <code><b>y</b></code> is an object of the same type as
-    <code><b>r</b></code>. 
-
-    <table border="1" summary="self_t inplace operators">
-      <tr>
-        <th>C++ Expression</th>
-
-        <th>Python Method Name</th>
-
-        <th>C++ Implementation</th>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;+=&nbsp;r</code></td>
-
-        <td><code>__iadd__</code></td>
-
-        <td><code>x&nbsp;+=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;-=&nbsp;r</code></td>
-
-        <td><code>__isub__</code></td>
-
-        <td><code>x&nbsp;-=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;*=&nbsp;r</code></td>
-
-        <td><code>__imul__</code></td>
-
-        <td><code>x&nbsp;*=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;/=&nbsp;r</code></td>
-
-        <td><code>__idiv__</code></td>
-
-        <td><code>x&nbsp;/=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;%=&nbsp;r</code></td>
-
-        <td><code>__imod__</code></td>
-
-        <td><code>x&nbsp;%=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;&gt;&gt;=&nbsp;r</code></td>
-
-        <td><code>__irshift__</code></td>
-
-        <td><code>x&nbsp;&gt;&gt;=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;&lt;&lt;=&nbsp;r</code></td>
-
-        <td><code>__ilshift__</code></td>
-
-        <td><code>x&nbsp;&lt;&lt;=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;&amp;=&nbsp;r</code></td>
-
-        <td><code>__iand__</code></td>
-
-        <td><code>x&nbsp;&amp;=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;^=&nbsp;r</code></td>
-
-        <td><code>__ixor__</code></td>
-
-        <td><code>x&nbsp;^=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;|=&nbsp;r</code></td>
-
-        <td><code>__ior__</code></td>
-
-        <td><code>x&nbsp;|=&nbsp;y</code></td>
-      </tr>
-    </table>
-
-    <h4><a name="self_t-spec-comparisons"></a>Class <code>self_t</code>
-    comparison functions</h4>
-    In the tables below, if <code><b>r</b></code> is of type <code><a href=
-    "#self_t-spec">self_t</a></code>, <code><b>y</b></code> is an object of
-    the same type as <code>x</code>; <br>
-     if <code><b>l</b></code> or <code><b>r</b></code> is an object of type
-    <code><a href="#other-spec">other</a>&lt;T&gt;</code>,
-    <code><b>y</b></code> is an object of type <code>T</code>; <br>
-     otherwise, <code><b>y</b></code> is an object of the same type as
-    <code><b>l</b></code> or <code><b>r</b></code>.<br>
-     <code><b>l</b></code> is never of type <code><a href=
-    "#self_t-spec">self_t</a></code>. 
-
-    <p>The column of <b>Python Expressions</b> illustrates the expressions
-    that will be supported in Python for objects convertible to the types of
-    <code>x</code> and <code>y</code>. The secondary operation arises due to
-    Python's <a href=
-    "http://www.python.org/doc/ref/customization.html#l2h-89">reflection
-    rules</a> for rich comparison operators, and are only used when the
-    corresponding operation is not defined as a method of the <code>y</code>
-    object.</p>
-
-    <table border="1" summary="self_t comparison functions">
-      <tr>
-        <th>C++ Expression</th>
-
-        <th>Python Method Name</th>
-
-        <th>C++ Implementation</th>
-
-        <th>Python Expressions<br>
-         (primary, secondary)</th>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;==&nbsp;r</code></td>
-
-        <td><code>__eq__</code></td>
-
-        <td><code>x&nbsp;==&nbsp;y</code></td>
-
-        <td><code>x&nbsp;==&nbsp;y, y&nbsp;==&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;==&nbsp;self</code></td>
-
-        <td><code>__eq__</code></td>
-
-        <td><code>y&nbsp;==&nbsp;x</code></td>
-
-        <td><code>y&nbsp;==&nbsp;x, x&nbsp;==&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;!=&nbsp;r</code></td>
-
-        <td><code>__ne__</code></td>
-
-        <td><code>x&nbsp;!=&nbsp;y</code></td>
-
-        <td><code>x&nbsp;!=&nbsp;y, y&nbsp;!=&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;!=&nbsp;self</code></td>
-
-        <td><code>__ne__</code></td>
-
-        <td><code>y&nbsp;!=&nbsp;x</code></td>
-
-        <td><code>y&nbsp;!=&nbsp;x, x&nbsp;!=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;&lt;&nbsp;r</code></td>
-
-        <td><code>__lt__</code></td>
-
-        <td><code>x&nbsp;&lt;&nbsp;y</code></td>
-
-        <td><code>x&nbsp;&lt;&nbsp;y, y&nbsp;&gt;&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;&lt;&nbsp;self</code></td>
-
-        <td><code>__gt__</code></td>
-
-        <td><code>y&nbsp;&lt;&nbsp;x</code></td>
-
-        <td><code>y&nbsp;&gt;&nbsp;x, x&nbsp;&lt;&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;&gt;&nbsp;r</code></td>
-
-        <td><code>__gt__</code></td>
-
-        <td><code>x&nbsp;&gt;&nbsp;y</code></td>
-
-        <td><code>x&nbsp;&gt;&nbsp;y, y&nbsp;&lt;&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;&gt;&nbsp;self</code></td>
-
-        <td><code>__lt__</code></td>
-
-        <td><code>y&nbsp;&gt;&nbsp;x</code></td>
-
-        <td><code>y&nbsp;&lt;&nbsp;x, x&nbsp;&gt;&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;&lt;=&nbsp;r</code></td>
-
-        <td><code>__le__</code></td>
-
-        <td><code>x&nbsp;&lt;=&nbsp;y</code></td>
-
-        <td><code>x&nbsp;&lt;=&nbsp;y, y&nbsp;&gt;=&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;&lt;=&nbsp;self</code></td>
-
-        <td><code>__ge__</code></td>
-
-        <td><code>y&nbsp;&lt;=&nbsp;x</code></td>
-
-        <td><code>y&nbsp;&gt;=&nbsp;x, x&nbsp;&lt;=&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;&gt;=&nbsp;r</code></td>
-
-        <td><code>__ge__</code></td>
-
-        <td><code>x&nbsp;&gt;=&nbsp;y</code></td>
-
-        <td><code>x&nbsp;&gt;=&nbsp;y, y&nbsp;&lt;=&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;&gt;=&nbsp;self</code></td>
-
-        <td><code>__le__</code></td>
-
-        <td><code>y&nbsp;&gt;=&nbsp;x</code></td>
-
-        <td><code>y&nbsp;&lt;=&nbsp;x, x&nbsp;&gt;=&nbsp;y</code></td>
-      </tr>
-    </table>
-
-    <h4><a name="self_t-spec-ops"></a>Class <code>self_t</code> non-member
-    operations</h4>
-    The operations whose names begin with "<code>__r</code>" below will only
-    be called if the left-hand operand does not already support the given
-    operation, as described <a href=
-    "http://www.python.org/doc/current/ref/numeric-types.html#l2h-152">here</a>.
-    
-
-    <table border="1" summary="self_t non-member operations">
-      <tr>
-        <th>C++ Expression</th>
-
-        <th>Python Method Name</th>
-
-        <th>C++ Implementation</th>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;+&nbsp;r</code></td>
-
-        <td><code>__add__</code></td>
-
-        <td><code>x&nbsp;+&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;+&nbsp;self</code></td>
-
-        <td><code>__radd__</code></td>
-
-        <td><code>y&nbsp;+&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;-&nbsp;r</code></td>
-
-        <td><code>__sub__</code></td>
-
-        <td><code>x&nbsp;-&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;-&nbsp;self</code></td>
-
-        <td><code>__rsub__</code></td>
-
-        <td><code>y&nbsp;-&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;*&nbsp;r</code></td>
-
-        <td><code>__mul__</code></td>
-
-        <td><code>x&nbsp;*&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;*&nbsp;self</code></td>
-
-        <td><code>__rmul__</code></td>
-
-        <td><code>y&nbsp;*&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;/&nbsp;r</code></td>
-
-        <td><code>__div__</code></td>
-
-        <td><code>x&nbsp;/&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;/&nbsp;self</code></td>
-
-        <td><code>__rdiv__</code></td>
-
-        <td><code>y&nbsp;/&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;%&nbsp;r</code></td>
-
-        <td><code>__mod__</code></td>
-
-        <td><code>x&nbsp;%&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;%&nbsp;self</code></td>
-
-        <td><code>__rmod__</code></td>
-
-        <td><code>y&nbsp;%&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;&gt;&gt;&nbsp;r</code></td>
-
-        <td><code>__rshift__</code></td>
-
-        <td><code>x&nbsp;&gt;&gt;&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;&gt;&gt;&nbsp;self</code></td>
-
-        <td><code>__rrshift__</code></td>
-
-        <td><code>y&nbsp;&gt;&gt;&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;&lt;&lt;&nbsp;r</code></td>
-
-        <td><code>__lshift__</code></td>
-
-        <td><code>x&nbsp;&lt;&lt;&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;&lt;&lt;&nbsp;self</code></td>
-
-        <td><code>__rlshift__</code></td>
-
-        <td><code>y&nbsp;&lt;&lt;&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;&amp;&nbsp;r</code></td>
-
-        <td><code>__and__</code></td>
-
-        <td><code>x&nbsp;&amp;&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;&amp;&nbsp;self</code></td>
-
-        <td><code>__rand__</code></td>
-
-        <td><code>y&nbsp;&amp;&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;^&nbsp;r</code></td>
-
-        <td><code>__xor__</code></td>
-
-        <td><code>x&nbsp;^&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;^&nbsp;self</code></td>
-
-        <td><code>__rxor__</code></td>
-
-        <td><code>y&nbsp;^&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>self&nbsp;|&nbsp;r</code></td>
-
-        <td><code>__or__</code></td>
-
-        <td><code>x&nbsp;|&nbsp;y</code></td>
-      </tr>
-
-      <tr>
-        <td><code>l&nbsp;|&nbsp;self</code></td>
-
-        <td><code>__ror__</code></td>
-
-        <td><code>y&nbsp;|&nbsp;x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>pow(self,&nbsp;r)</code></td>
-
-        <td><code>__pow__</code></td>
-
-        <td><code>pow(x,&nbsp;y)</code></td>
-      </tr>
-
-      <tr>
-        <td><code>pow(l,&nbsp;self)</code></td>
-
-        <td><code>__rpow__</code></td>
-
-        <td><code>pow(y,&nbsp;x)</code></td>
-      </tr>
-    </table>
-
-    <h4><a name="self_t-spec-value-unary-ops"></a>Class <code>self_t</code> unary
-    operations</h4>
-
-    <table border="1" summary="self_t unary operations">
-      <tr>
-        <th>C++ Expression</th>
-
-        <th>Python Method Name</th>
-
-        <th>C++ Implementation</th>
-      </tr>
-
-      <tr>
-        <td><code>-self</code></td>
-
-        <td><code>__neg__</code></td>
-
-        <td><code>-x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>+self</code></td>
-
-        <td><code>__pos__</code></td>
-
-        <td><code>+x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>~self</code></td>
-
-        <td><code>__invert__</code></td>
-
-        <td><code>~x</code></td>
-      </tr>
-
-      <tr>
-        <td><code>not self</code><br><i>or</i><br><code>!self</code></td>
-
-        <td><code>__nonzero__</code></td>
-
-        <td><code>!!x</code></td>
-      </tr>
-    </table>
-
-    <h4><a name="self_t-spec-value-ops"></a>Class <code>self_t</code> value
-    operations</h4>
-
-    <table border="1" summary="self_t value operations">
-      <tr>
-        <th>C++ Expression</th>
-
-        <th>Python Method Name</th>
-
-        <th>C++ Implementation</th>
-      </tr>
-
-      <tr>
-        <td><code>int_(self)</code></td>
-
-        <td><code>__int__</code></td>
-
-        <td><code>long(x)</code></td>
-      </tr>
-
-      <tr>
-        <td><code>long_</code></td>
-
-        <td><code>__long__</code></td>
-
-        <td><code>PyLong_FromLong(x)</code></td>
-      </tr>
-
-      <tr>
-        <td><code>float_</code></td>
-
-        <td><code>__float__</code></td>
-
-        <td><code>double(x)</code></td>
-      </tr>
-
-      <tr>
-        <td><code>complex_</code></td>
-
-        <td><code>__complex__</code></td>
-
-        <td><code>std::complex&lt;double&gt;(x)</code></td>
-      </tr>
-
-      <tr>
-        <td><code>str</code></td>
-
-        <td><code>__str__</code></td>
-
-        <td><code><a href=
-        "../../../conversion/lexical_cast.htm#lexical_cast">lexical_cast</a>&lt;std::string&gt;(x)</code></td>
-      </tr>
-    </table>
-
-    <h3><a name="other-spec"></a>Class Template <code>other</code></h3>
-
-    <p>Instances of <code>other&lt;T&gt;</code> can be used in operator
-    expressions with <a href="#self-spec">self</a>; the result is equivalent
-    to the same expression with a <code>T</code> object in place of
-    <code>other&lt;T&gt;</code>. Use <code>other&lt;T&gt;</code> to prevent
-    construction of a <code>T</code> object in case it is heavyweight, when
-    no constructor is available, or simply for clarity.</p>
-
-    <h4><a name="other-spec-synopsis"></a>Class Template other synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;class T&gt;
-  struct other
-  {
-  };
-}}
-</pre>
-    <!-- -->
-
-    <h3><a name="operator_-spec"></a>Class Template
-    <code>detail::operator_</code></h3>
-
-    <p>Instantiations of <code>detail::operator_&lt;&gt;</code> are used as
-    the return type of operator expressions involving <code><a href=
-    "#self-spec">self</a></code>. This should be considered an implementation
-    detail and is only documented here as a way of showing how the result of
-    <code>self</code>-expressions match calls to <a href=
-    "class.html#class_-spec-modifiers">class_&lt;&gt;::def()</a>.</p>
-
-    <h4><a name="operator_-spec-synopsis"></a>Class Template
-    <code>detail::operator_</code> synopsis</h4>
-<pre>
-namespace boost { namespace python { namespace detail
-{
-  template &lt;<i>unspecified</i>&gt;
-  struct operator_
-  {
-  };
-}}}
-</pre>
-
-    <h2><a name="objects"></a>Objects</h2>
-
-    <p><a name="self-spec"><code>self</code></a></p>
-<pre>
-namespace boost { namespace python
-{
-  using self_ns::self;
-}}
-</pre>
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/operators.hpp&gt;
-#include &lt;boost/operators.hpp&gt;
-
-struct number
-   : boost::<a href=
-"../../../utility/operators.htm#grpd_oprs">integer_arithmetic</a>&lt;number&gt;
-{
-   number(long x_) : x(x_) {}
-   operator long() const { return x; }
-
-   number&amp; operator+=(number const&amp; rhs)
-      { x += rhs }
-   number&amp; operator-=(number const&amp; rhs);
-      { x -= rhs }
-   number&amp; operator*=(number const&amp; rhs)
-      { x *= rhs }
-   number&amp; operator/=(number const&amp; rhs);
-      { x /= rhs }
-   number&amp; operator%=(number const&amp; rhs);
-      { x %= rhs }
-
-   long x;
-};
-
-using namespace boost::python;
-BOOST_PYTHON_MODULE(demo)
-{
-   class_&lt;number&gt;("number")
-      // interoperate with self
-      .def(self += self)
-      .def(self + self)
-      .def(self -= self)
-      .def(self - self)
-      .def(self *= self)
-      .def(self * self)
-      .def(self /= self)
-      .def(self / self)
-      .def(self %= self)
-      .def(self % self)
-
-      // Convert to Python int
-      .def(int_(self))
-
-      // interoperate with long
-      .def(self += long())
-      .def(self + long())
-      .def(long() + self)
-      .def(self -= long())
-      .def(self - long())
-      .def(long() - self)
-      .def(self *= long())
-      .def(self * long())
-      .def(long() * self)
-      .def(self /= long())
-      .def(self / long())
-      .def(long() / self)
-      .def(self %= long())
-      .def(self % long())
-      .def(long() % self)
-      ;
-}
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  3 October, 2003
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/overloads.html b/doc/v2/overloads.html
deleted file mode 100644
index edce8596..00000000
--- a/doc/v2/overloads.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/overloads.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/overloads.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href=
-      "#overload-dispatch-expression"><i>overload-dispatch-expressions</i></a></dt>
-
-      <dt><a href= "#OverloadDispatcher-concept">OverloadDispatcher</a> concept</dt>
-
-      <dt><a href="#macros">Macros</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href=
-          "#BOOST_PYTHON_FUNCTION_OVERLOADS-spec">BOOST_PYTHON_FUNCTION_OVERLOADS</a></dt>
-
-          <dt><a href=
-          "#BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS-spec">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Defines facilities for generating families of overloaded Python
-    functions and extension class methods from C++ functions and
-    member functions with default arguments, or from similar families
-    of C++ overloads</p>
-
-    <h2><a name=
-    "overload-dispatch-expression"></a><i>overload-dispatch-expressions</i></h2>
-
-    <p>
-    An <em>overload-dispatch-expression</em> is used to describe a
-    family of overloaded methods to be generated for an extension
-    class. It has the following properties:
-
-    <blockquote>
-      <dl class="properties">
-        <dt><b>docstring:</b> An <a href="definitions.html#ntbs">ntbs</a>
-        whose value will bound to the methods' <code>__doc__</code>
-        attribute</dt>
-
-        <dt><b>keywords:</b> A <a href=
-        "args.html#keyword-expression">keyword-expression</a> which
-        will be used to name (a trailing subsequence of) the arguments
-        to the generated methods.</dt>
-
-        <dt><b>call policies:</b> An instance of some type which models <a href=
-        "CallPolicies.html">CallPolicies</a>.</dt>
-
-        <dt><b>minimum <a href="definitions.html#arity">arity</a></b>
-        The minimum number of arguments to be accepted by a generated
-        method overload.</dt>
-
-        <dt><b>maximum <a href="definitions.html#arity">arity</a></b>
-        The maximum number of arguments to be accepted by a generated
-        method overload.</dt>
-      </dl>
-    </blockquote>
-
-    <h2><a name="OverloadDispatcher-concept"></a>OverloadDispatcher Concept</h2>
-
-    An OverloadDispatcher <code>X</code> is a class which has a
-    <em>minimum arity</em> and a <em>maximum arity</em>, and for which
-    the following following are valid <a
-    href="#overload-dispatch-expression"><em>overload-dispatch-expression</em></a>s,
-    with the same minimum and maximum arity as the OverloadDispatcher.
-
-<pre>
-X()
-X(docstring)
-X(docstring, keywords)
-X(keywords, docstring)
-X()[policies]
-X(docstring)[policies]
-X(docstring, keywords)[policies]
-X(keywords, docstring)[policies]
-</pre>
-
-<ul>
-<li>If <code>policies</code> are supplied, it must be an instance of a
-type which models <a
-href="CallPolicies.html#CallPolicies-concept">CallPolicies</a>, and
-will be used as the result's call policies. Otherwise the result's
-call policies will be an instance of <a
-href="default_call_policies.html#default_call_policies-spec">default_call_policies</a>.
-
-<li>If <code>docstring</code> is supplied it must be an <a
-href="definitions.html#ntbs">ntbs</a>, and will be used as the result's docstring. Otherwise the result has an empty docstring.
-
-<li>If <code>keywords</code> is supplied it must be the result of a <a
-        href= "args.html#keyword-expression">keyword-expression</a>
-        whose length is no greater than <code>X</code>'s maximum
-        arity, and will be used as the result's keywords. Otherwise
-        the result's keywords will be empty.
-</ul>
-
-
-
-
-    <h2><a name="macros"></a>Macros</h2>
-
-    <h3><a name=
-    "BOOST_PYTHON_FUNCTION_OVERLOADS-spec">BOOST_PYTHON_FUNCTION_OVERLOADS(name,&nbsp;func_id,&nbsp;min_args,&nbsp;max_args)</a></h3>
-    Expands to the definition of an OverloadDispatcher called
-    <code>name</code> in the current scope which can be used to
-    generate the following function invocation:
-<pre>
-func_id(a<small><i>1</i></small>, a<small><i>2</i></small>,...a<small><i>i</i></small>);
-</pre>
-
-   for all <code>min_args</code> &lt;= <i>i</i> &lt;= <code>max_args</code>.
-
-    <h3><a name=
-    "BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS-spec">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(name,&nbsp;member_name,&nbsp;min_args,&nbsp;max_args)</a></h3>
-
-    Expands to the definition of an OverloadDispatcher called
-    <code>name</code> in the current scope which can be used to
-    generate the following function invocation:
-<pre>
-x.member_name(a<small><i>1</i></small>, a<small><i>2</i></small>,...a<small><i>i</i></small>);
-</pre>
-
-   for all <code>min_args</code> &lt;= <i>i</i> &lt;=
-   <code>max_args</code>, where <code>x</code> is a reference to an
-   object of class type.
-
-    <h2><a name="examples"></a>Example(s)</h2>
-
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/def.hpp&gt;
-#include &lt;boost/python/args.hpp&gt;
-#include &lt;boost/python/tuple.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/overloads.hpp&gt;
-#include &lt;boost/python/return_internal_reference.hpp&gt;
-
-using namespace boost::python;
-
-tuple f(int x = 1, double y = 4.25, char const* z = &quot;wow&quot;)
-{
-    return make_tuple(x, y, z);
-}
-
-BOOST_PYTHON_FUNCTION_OVERLOADS(f_overloads, f, 0, 3)
-
-struct Y {};
-struct X
-{
-    Y&amp; f(int x, double y = 4.25, char const* z = &quot;wow&quot;)
-    {
-        return inner;
-    }
-    Y inner;
-};
-
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_f_overloads, X::f, 1, 3)
-
-BOOST_PYTHON_MODULE(args_ext)
-{
-    def(&quot;f&quot;, f, 
-        f_overloads(
-            args(&quot;x&quot;, &quot;y&quot;, &quot;z&quot;), &quot;This is f's docstring&quot;
-        ));
-
-    
-    class_&lt;Y&gt;(&quot;Y&quot;)
-        ;
-            
-    class_&lt;X&gt;(&quot;X&quot;, &quot;This is X's docstring&quot;)
-        .def(&quot;f1&quot;, &amp;X::f, 
-                X_f_overloads(
-                    args(&quot;x&quot;, &quot;y&quot;, &quot;z&quot;), &quot;f's docstring&quot;
-                )[return_internal_reference&lt;&gt;()]
-        )
-        ;
-}
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  15 April, 2003
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/overview.html b/doc/v2/overview.html
deleted file mode 100644
index 00a39773..00000000
--- a/doc/v2/overview.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../boost.css">
-<title>Boost.Python - Overview</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">Overview</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<dl class="index">
-  <dt><a href="#introduction">Introduction</a></dt>
-  <dt><a href="#topic1">First topic</a></dt>
-  <dt><a href="#topic2">Second topic</a></dt>
-  <dt><a href="#footnotes">Footnotes</a></dt>
-</dl>
-<h2><a name="introduction"></a>Introduction</h2>
-<p>{{text}}</p>
-<h2><a name="topic1"></a>First Topic</h2>
-<p>{{text}}</p>
-<h2><a name="topic2"></a>Second Topic</h2>
-<p>{{text}}</p>
-<h2><a name="footnotes"></a>Footnotes</h2>
-<dl>
-  <dt><a name="footnote1" class="footnote">(1)</a> {{text}}</dt>
-  <dt><a name="footnote2" class="footnote">(2)</a> {{text}}</dt>
-</dl>
-<hr>
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
-  2002. All Rights Reserved.</i></p>
-</body>
-</html>
diff --git a/doc/v2/pickle.html b/doc/v2/pickle.html
deleted file mode 100644
index 13c7b306..00000000
--- a/doc/v2/pickle.html
+++ /dev/null
@@ -1,293 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN"
-"http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<title>Boost.Python Pickle Support</title>
-
-<div>
-
-<img src="../../../../c++boost.gif"
-     alt="c++boost.gif (8819 bytes)"
-     align="center"
-     width="277" height="86">
-
-<hr>
-<h1>Boost.Python Pickle Support</h1>
-
-Pickle is a Python module for object serialization, also known
-as persistence, marshalling, or flattening.
-
-<p>
-It is often necessary to save and restore the contents of an object to
-a file. One approach to this problem is to write a pair of functions
-that read and write data from a file in a special format. A powerful
-alternative approach is to use Python's pickle module. Exploiting
-Python's ability for introspection, the pickle module recursively
-converts nearly arbitrary Python objects into a stream of bytes that
-can be written to a file.
-
-<p>
-The Boost Python Library supports the pickle module
-through the interface as described in detail in the
-<a href="http://www.python.org/doc/current/lib/module-pickle.html"
->Python Library Reference for pickle.</a> This interface
-involves the special methods <tt>__getinitargs__</tt>,
-<tt>__getstate__</tt> and <tt>__setstate__</tt> as described
-in the following. Note that Boost.Python is also fully compatible
-with Python's cPickle module.
-
-<hr>
-<h2>The Boost.Python Pickle Interface</h2>
-
-At the user level, the Boost.Python pickle interface involves three special
-methods:
-
-<dl>
-<dt>
-<strong><tt>__getinitargs__</tt></strong>
-<dd>
-  When an instance of a Boost.Python extension class is pickled, the
-  pickler tests if the instance has a <tt>__getinitargs__</tt> method.
-  This method must return a Python tuple (it is most convenient to use
-  a boost::python::tuple). When the instance is restored by the
-  unpickler, the contents of this tuple are used as the arguments for
-  the class constructor.
-
-  <p>
-  If <tt>__getinitargs__</tt> is not defined, <tt>pickle.load</tt>
-  will call the constructor (<tt>__init__</tt>) without arguments;
-  i.e., the object must be default-constructible.
-
-<p>
-<dt>
-<strong><tt>__getstate__</tt></strong>
-
-<dd>
-  When an instance of a Boost.Python extension class is pickled, the
-  pickler tests if the instance has a <tt>__getstate__</tt> method.
-  This method should return a Python object representing the state of
-  the instance.
-
-<p>
-<dt>
-<strong><tt>__setstate__</tt></strong>
-
-<dd>
-  When an instance of a Boost.Python extension class is restored by the
-  unpickler (<tt>pickle.load</tt>), it is first constructed using the
-  result of <tt>__getinitargs__</tt> as arguments (see above). Subsequently
-  the unpickler tests if the new instance has a <tt>__setstate__</tt>
-  method. If so, this method is called with the result of
-  <tt>__getstate__</tt> (a Python object) as the argument.
-
-</dl>
-
-The three special methods described above may be <tt>.def()</tt>'ed
-individually by the user. However, Boost.Python provides an easy to use
-high-level interface via the
-<strong><tt>boost::python::pickle_suite</tt></strong> class that also
-enforces consistency: <tt>__getstate__</tt> and <tt>__setstate__</tt>
-must be defined as pairs. Use of this interface is demonstrated by the
-following examples.
-
-<hr>
-<h2>Examples</h2>
-
-There are three files in <a href="../../test/"
-><tt>boost/libs/python/test</tt></a> that show how to
-provide pickle support.
-
-<hr>
-<h3><a href="../../test/pickle1.cpp"><tt>pickle1.cpp</tt></a></h3>
-
-    The C++ class in this example can be fully restored by passing the
-    appropriate argument to the constructor. Therefore it is sufficient
-    to define the pickle interface method <tt>__getinitargs__</tt>.
-    This is done in the following way:
-
-<ul>
-<li>1. Definition of the C++ pickle function:
-<pre>
-  struct world_pickle_suite : boost::python::pickle_suite
-  {
-    static
-    boost::python::tuple
-    getinitargs(world const&amp; w)
-    {
-        return boost::python::make_tuple(w.get_country());
-    }
-  };
-</pre>
-<li>2. Establishing the Python binding:
-<pre>
-  class_&lt;world&gt;("world", args&lt;const std::string&amp;&gt;())
-      // ...
-      .def_pickle(world_pickle_suite())
-      // ...
-</pre>
-</ul>
-
-<hr>
-<h3><a href="../../test/pickle2.cpp"><tt>pickle2.cpp</tt></a></h3>
-
-    The C++ class in this example contains member data that cannot be
-    restored by any of the constructors. Therefore it is necessary to
-    provide the <tt>__getstate__</tt>/<tt>__setstate__</tt> pair of
-    pickle interface methods:
-
-<ul>
-<li>1. Definition of the C++ pickle functions:
-<pre>
-  struct world_pickle_suite : boost::python::pickle_suite
-  {
-    static
-    boost::python::tuple
-    getinitargs(const world&amp; w)
-    {
-      // ...
-    }
-
-    static
-    boost::python::tuple
-    getstate(const world&amp; w)
-    {
-      // ...
-    }
-
-    static
-    void
-    setstate(world&amp; w, boost::python::tuple state)
-    {
-      // ...
-    }
-  };
-</pre>
-<li>2. Establishing the Python bindings for the entire suite:
-<pre>
-  class_&lt;world&gt;("world", args&lt;const std::string&amp;&gt;())
-      // ...
-      .def_pickle(world_pickle_suite())
-      // ...
-</pre>
-</ul>
-
-    <p>
-    For simplicity, the <tt>__dict__</tt> is not included in the result
-    of <tt>__getstate__</tt>. This is not generally recommended, but a
-    valid approach if it is anticipated that the object's
-    <tt>__dict__</tt> will always be empty. Note that the safety guard
-    described below will catch the cases where this assumption is violated.
-
-<hr>
-<h3><a href="../../test/pickle3.cpp"><tt>pickle3.cpp</tt></a></h3>
-
-    This example is similar to <a
-    href="../../test/pickle2.cpp"><tt>pickle2.cpp</tt></a>. However, the
-    object's <tt>__dict__</tt> is included in the result of
-    <tt>__getstate__</tt>.  This requires a little more code but is
-    unavoidable if the object's <tt>__dict__</tt> is not always empty.
-
-<hr>
-<h2>Pitfall and Safety Guard</h2>
-
-The pickle protocol described above has an important pitfall that the
-end user of a Boost.Python extension module might not be aware of:
-<p>
-<strong>
-<tt>__getstate__</tt> is defined and the instance's <tt>__dict__</tt>
-is not empty.
-</strong>
-<p>
-
-  The author of a Boost.Python extension class might provide a
-  <tt>__getstate__</tt> method without considering the possibilities
-  that:
-
-  <p>
-  <ul>
-  <li>
-    his class is used in Python as a base class. Most likely the
-    <tt>__dict__</tt> of instances of the derived class needs to be
-    pickled in order to restore the instances correctly.
-
-  <p>
-  <li>
-    the user adds items to the instance's <tt>__dict__</tt> directly.
-    Again, the <tt>__dict__</tt> of the instance then needs to be
-    pickled.
-
-  </ul>
-  <p>
-
-  To alert the user to this highly unobvious problem, a safety guard is
-  provided. If <tt>__getstate__</tt> is defined and the instance's
-  <tt>__dict__</tt> is not empty, Boost.Python tests if the class has
-  an attribute <tt>__getstate_manages_dict__</tt>. An exception is
-  raised if this attribute is not defined:
-
-<pre>
-    RuntimeError: Incomplete pickle support (__getstate_manages_dict__ not set)
-</pre>
-
-  To resolve this problem, it should first be established that the
-  <tt>__getstate__</tt> and <tt>__setstate__</tt> methods manage the
-  instances's <tt>__dict__</tt> correctly. Note that this can be done
-  either at the C++ or the Python level. Finally, the safety guard
-  should intentionally be overridden. E.g. in C++ (from
-  <a href="../../test/pickle3.cpp"><tt>pickle3.cpp</tt></a>):
-
-<pre>
-  struct world_pickle_suite : boost::python::pickle_suite
-  {
-    // ...
-
-    static bool getstate_manages_dict() { return true; }
-  };
-</pre>
-
-  Alternatively in Python:
-
-<pre>
-    import your_bpl_module
-    class your_class(your_bpl_module.your_class):
-      __getstate_manages_dict__ = 1
-      def __getstate__(self):
-        # your code here
-      def __setstate__(self, state):
-        # your code here
-</pre>
-
-<hr>
-<h2>Practical Advice</h2>
-
-<ul>
-<li>
-  In Boost.Python extension modules with many extension classes,
-  providing complete pickle support for all classes would be a
-  significant overhead. In general complete pickle support should
-  only be implemented for extension classes that will eventually
-  be pickled.
-
-<p>
-<li>
-  Avoid using <tt>__getstate__</tt> if the instance can also be
-  reconstructed by way of <tt>__getinitargs__</tt>. This automatically
-  avoids the pitfall described above.
-
-<p>
-<li>
-  If <tt>__getstate__</tt> is required, include the instance's
-  <tt>__dict__</tt> in the Python object that is returned.
-
-</ul>
-
-<hr>
-
-&copy; Copyright Ralf W. Grosse-Kunstleve 20012-2002. Permission to copy,
-use, modify, sell and distribute this document is granted provided this
-copyright notice appears in all copies. This document is provided "as
-is" without express or implied warranty, and with no claim as to its
-suitability for any purpose.
-
-<p>
-Updated: Aug 2002.
-</div>
diff --git a/doc/v2/platforms.html b/doc/v2/platforms.html
deleted file mode 100644
index 42429b2e..00000000
--- a/doc/v2/platforms.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - Known Working Platforms and Compilers</title>
-  </head>
-
-  <body link="#0000ff" vlink="#800080">
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Known Working Platforms and Compilers</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-    <b>Boost.Python</b> has been successfully tested on the following
-    platforms and compilers: 
-
-    <dl class="page-index">
-      <dt>Unix Platforms:</dt>
-
-      <dd>
-        <dl>
-          <dt>with Python <a href="http://www.python.org/2.2">2.2</a> and <a
-          href="http://www.python.org/2.2.2">2.2.2b1</a>:</dt>
-
-          <dd>
-            <dl>
-              <dt><a href="http://gcc.gnu.org">GCC</a> 2.95.3, 2.96, 3.0.4,
-              3.1, and 3.2 on <a href="http://www.redhat.com">RedHat Linux 7.3</a>
-              for Intel x86</dt>
-
-              <dt><a href=
-              "http://www.tru64unix.compaq.com/cplus/index.html">Tru64 CXX
-              6.5.1</a> on OSF v. 5.1 for Dec/Compaq Alpha</dt>
-
-              <dt><a href=
-              "http://www.sgi.com/developers/devtools/languages/mipspro.html">
-              MIPSPro 7.3.1.2m</a> on <a href=
-              "http://www.sgi.com/software/irix6.5/">IRIX 6.5</a> for SGI
-              mips</dt>
-
-              <dt><a href="http://gcc.gnu.org">GCC 3.1</a> on SunOS 5.8</dt>
-            </dl>
-          </dd>
-
-          <dt>with Python <a href=
-          "http://www.python.org/2.2.1">2.2.1</a></dt>
-
-          <dd>
-            <dl>
-              <dt><a href=
-              "http://developer.intel.com/software/products/kcc/">KCC
-              3.4d</a> on OSF v. 5.1 for Dec/Compaq Alpha</dt>
-
-              <dt><a href=
-              "http://developer.intel.com/software/products/kcc/">KCC
-              3.4d</a> on AIX</dt>
-            </dl>
-          </dd>
-        </dl>
-        <br>
-      </dd>
-
-      <dt><a href="http://www.microsoft.com/windowsxp/default.asp">Microsoft
-      Windows XP Professional</a> with Python <a href=
-      "http://www.python.org/2.2">2.2</a>, <a href=
-      "http://www.python.org/2.2.1">2.2.1</a>, and <a href=
-      "http://www.python.org/2.2.2">2.2.2b1</a>:</dt>
-
-      <dd>
-        <dl>
-          <dt><a href=
-          "http://msdn.microsoft.com/visualc/default.asp">Microsoft Visual
-          C++</a> 6, 7, and 7.1 beta</dt>
-
-          <dt><a href=
-          "http://msdn.microsoft.com/visualc/default.asp">Microsoft Visual
-          C++ 6</a> with <a href="http://www.stlport.org">STLPort
-          4.5.3</a></dt>
-
-          <dt><a href=
-          "http://www.metrowerks.com/MW/Develop/Desktop/Windows/Professional/Default.htm">
-          Metrowerks CodeWarrior</a> 7.2, 8.0, 8.2 and 8.3 beta</dt>
-
-          <dt><a href=
-          "http://www.intel.com/software/products/compilers/c60/">Intel
-          C++</a> 5.0, 6.0, and 7.0 beta</dt>
-
-          <dt><a href=
-          "http://www.intel.com/software/products/compilers/c60/">Intel C++
-          5.0</a> with <a href="http://www.stlport.org">STLPort
-          4.5.3</a></dt>
-
-          <dt><a href="http://www.cygwin.com">Cygwin</a> <a href=
-          "http://gcc.gnu.org">GCC</a> 3.0.4 and 3.2</dt>
-
-          <dt><a href="http://www.mingw.org">MinGW-1.1</a> (<a href=
-          "http://gcc.gnu.org">GCC 2.95.3-5</a>)</dt>
-
-          <dt><a href="http://www.mingw.org">MinGW-2.0</a> (<a href=
-          "http://gcc.gnu.org">GCC 3.2</a>)</dt>
-        </dl>
-      </dd>
-    </dl>
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/pointee.html b/doc/v2/pointee.html
deleted file mode 100644
index 47440700..00000000
--- a/doc/v2/pointee.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/pointee.hpp&gt;</title>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/pointee.hpp&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a>
-
-      <dt><a href="#classes">Classes</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#pointee-spec">Class Template<code>pointee</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#pointee-spec-synopsis">Class Template
-              <code>pointee</code> synopsis</a>
-            </dl>
-        </dl>
-
-      <dt><a href="#examples">Example</a>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/pointee.hpp&gt;</code> introduces a
-    traits <a
-    href="../../../mpl/doc/index.html#metafunctions">metafunction</a>
-    template <code>pointee&lt;T&gt;</code> which can be used to extract the &quot;pointed-to&quot; type from the type of a pointer or smart pointer.
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="pointee-spec"></a>Class Template <code>pointee&lt;class T&gt;</code></h3>
-
-    <p><code>pointee&lt;T&gt;</code> is used by the <code><a
-    href="class.html#class_-spec">class_</a>&lt;...&gt;</code>
-    template to deduce the type being held when a pointer or smart
-    pointer type is used as its <code>HeldType</code> argument.
-
-    <h4><a name="pointee-spec-synopsis"></a>Class Template
-    <code>pointee</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-   template &lt;class T&gt; struct pointee
-   {
-      typedef T::element_type type;
-   };
-
-   // specialization for pointers
-   template &lt;T&gt; struct pointee&lt;T*&gt;
-   {
-      typedef T type;
-   };
-}
-</pre>
-
-
-    <h2><a name="examples"></a>Example</h2>
-
-Given a 3rd-party smart pointer type
-<code>smart_pointer&lt;T&gt;</code>, one might partially specialize
-<code>pointee&lt;smart_pointer&ltT&gt; &gt;</code> so that it can be
-used as the <code>HeldType</code> for a class wrapper:
-
-<pre>
-#include &lt;boost/python/pointee.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;third_party_lib.hpp&gt;
-
-namespace boost { namespace python
-{
-  template &lt;class T&gt; struct pointee&ltsmart_pointer&lt;T&gt; &gt;
-  {
-     typedef T type;
-  };
-}}
-
-BOOST_PYTHON_MODULE(pointee_demo)
-{
-   class_&lt;third_party_class, smart_pointer&lt;third_party_class&gt; &gt;(&quot;third_party_class&quot;)
-      .def(...)
-      ...
-      ;
-}
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
diff --git a/doc/v2/progress_reports.html b/doc/v2/progress_reports.html
deleted file mode 100644
index f5441edd..00000000
--- a/doc/v2/progress_reports.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../boost.css">
-<title>Boost.Python - Progress Reports</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">Progress Reports</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-
-Monthly progress reports are required as part of Boost Consulting's
-contract with LLNL for Boost.Python development. These reports contain
-a useful record of the project history, including the rationale for
-design decisions and links to relevant discussions.
-
-<dl class="page-index">
-  <dt><a href="feb2002.html">February 2002</a></dt>
-  <dt><a href="Mar2002.html">March 2002</a></dt>
-  <dt><a href="Apr2002.html">April 2002</a></dt>
-  <dt><a href="May2002.html">May 2002</a></dt>
-  <dt><a href="Jun2002.html">June 2002</a></dt>
-</dl>
-<hr>
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
-  2002. All Rights Reserved.</i></p>
-</body>
-</html>
diff --git a/doc/v2/ptr.html b/doc/v2/ptr.html
deleted file mode 100644
index 0633be80..00000000
--- a/doc/v2/ptr.html
+++ /dev/null
@@ -1,263 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/ptr.hpp&gt;</title>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/ptr.hpp&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a>
-
-      <dt><a href="#functions">Functions</a>
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#ptr-spec">ptr</a>
-        </dl>
-
-      <dt><a href="#classes">Classes</a>
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#pointer_wrapper-spec">Class template <code>pointer_wrapper</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#pointer_wrapper-spec-synopsis">Class template <code>pointer_wrapper</code> synopsis</a>
-
-              <dt><a href="#pointer_wrapper-spec-types">Class
-              <code>pointer_wrapper</code> types</a>
-
-              <dt><a href="#pointer_wrapper-spec-ctors">Class
-              <code>pointer_wrapper</code> constructors and destructor</a>
-
-              <dt><a href="#pointer_wrapper-spec-observers">Class
-              <code>pointer_wrapper</code> observer functions</a>
-
-            </dl>
-         </dl>
-
-      <dt><a href="#metafunctions">Metafunctions</a>
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#is_pointer_wrapper-spec">Class template <code>is_pointer_wrapper</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#is_pointer_wrapper-spec-synopsis">Class template <code>is_pointer_wrapper</code> synopsis</a>
-            </dl>
-
-
-          <dt><a href="#unwrap_pointer-spec">Class template <code>unwrap_pointer</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#unwrap_pointer-spec-synopsis">Class template <code>unwrap_pointer</code> synopsis</a>
-            </dl>
-
-        </dl>
-
-
-      <dt><a href="#examples">Example(s)</a>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/ptr.hpp&gt;</code> defines the
-    <code>ptr()</code> function template, which allows users to
-    specify how to convert C++ pointer values to python in the context
-    of implementing overridable virtual functions, invoking Python
-    callable objects, or explicitly converting C++ objects to
-    Python. Normally, when passing pointers to Python callbacks, the
-    pointee is copied to ensure that the Python object
-    never holds a dangling reference. To specify that the new Python
-    object should merely contain a copy of a pointer <code>p</code>,
-    the user can pass <code><a href="#ptr-spec">ptr</a>(p)</code> instead of passing
-    <code>p</code> directly. This interface is meant to mirror the use
-    of <a href="../../../bind/ref.html"><code>boost::ref()</code></a>,
-    which can be similarly used to prevent copying of referents.
-
-    <p><code>ptr(p)</code> returns an instance of <code><a
-    href="#pointer_wrapper-spec">pointer_wrapper&lt;&gt;</a></code>, which
-    can be detected using the <code><a
-    href="#is_pointer_wrapper-spec">is_pointer_wrapper&lt;&gt;</a></code>
-    metafunction; <code><a
-    href="#unwrap_pointer-spec">unwrap_pointer&lt;&gt;</a></code> is a
-    metafunction which extracts the original pointer type from a
-    <code>pointer_wrapper&lt;&gt;</code>. These classes can be thought
-    of as implementation details.
-
-    <h2><a name="functions"></a>Functions</h2>
-<pre>
-
-<a name="ptr-spec">template &lt;class T&gt;</a>
-pointer_wrapper&lt;T&gt; ptr(T x);
-</pre>
-
-    <dl class="ptr-semantics">
-      <dt><b>Requires:</b> <code>T</code> is a pointer type.
-
-      <dt><b>Returns:</b> <code><a href="#pointer_wrapper-spec">pointer_wrapper</a>&lt;T&gt;(x)</code>
-
-      <dt><b>Throws:</b> nothing.
-    </dl>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="pointer_wrapper-spec"></a>Class template <code>pointer_wrapper</code></h3>
-
-    <p>A &quot;type envelope&quot; which is returned by <a
-    href="#ptr-spec">ptr()</a>, used to indicate reference semantics
-    for pointers passed to Python callbacks.
-
-    <h4><a name="pointer_wrapper-spec-synopsis"></a>Class
-    <code>pointer_wrapper</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    template&lt;class Ptr&gt; class pointer_wrapper
-    { 
-     public:
-        typedef Ptr type;
-
-        explicit pointer_wrapper(Ptr x);
-        operator Ptr() const;
-        Ptr get() const;
-    };
-}}
-</pre>
-
-    <h4><a name="pointer_wrapper-spec-types"></a>Class template <code>pointer_wrapper</code> types</h4>
-<pre>
-typedef Ptr type;
-</pre>
-The type of the pointer being wrapped.
-
-    <h4><a name="pointer_wrapper-spec-ctors"></a>Class template <code>pointer_wrapper</code> constructors and
-    destructor</h4>
-<pre>
-explicit pointer_wrapper(Ptr x);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>Ptr</code> is a pointer type.
-
-      <dt><b>Effects:</b> Stores <code>x</code> in a the <code>pointer_wrapper&lt;&gt;</code>.
-      <dt><b>Throws:</b> nothing.
-    </dl>
-
-    <h4><a name="pointer_wrapper-spec-observers"></a>Class template <code>pointer_wrapper</code> observer
-    functions</h4>
-<pre>
-operator Ptr() const;
-Ptr get() const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> a copy of the stored pointer.
-      <dt><b>Rationale:</b> <code>pointer_wrapper</code> is intended
-      to be a stand-in for the actual pointer type, but sometimes it's
-      better to have an explicit way to retrieve the pointer.
-    </dl>
-
-    <h2><a name="metafunctions"></a>Metafunctions</h2>
-
-    <h3><a name="is_pointer_wrapper-spec"></a>Class template <code>is_pointer_wrapper</code></h3>
-
-    <p>A unary metafunction whose <code>value</code> is true iff its
-    argument is a <code>pointer_wrapper&lt;&gt;</code>.
-
-    <h4><a name="is_pointer_wrapper-spec-synopsis"></a>Class template <code>is_pointer_wrapper</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    template&lt;class T&gt; class is_pointer_wrapper
-    { 
-        static <i>unspecified</i> value = ...;
-    };
-}}
-</pre>
-
-
-    <dl class="metafunction-semantics">
-      <dt><b>Returns:</b> <code>true</code> iff <code>T</code> is a
-      specialization of
-<code>pointer_wrapper&lt;&gt;</code>.
-<dt><code>value</code> is an integral constant convertible to bool of
-unspecified type
-
-    </dl>
-
-<h3><a name="unwrap_pointer-spec"></a>Class template <code>unwrap_pointer</code></h3>
-
-A unary metafunction which extracts the wrapped pointer type from a
-specialization of <code>pointer_wrapper&lt;&gt;</code>.
-
-    <h4><a name="unwrap_pointer-spec-synopsis"></a>Class template <code>unwrap_pointer</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    template&lt;class T&gt; class unwrap_pointer
-    { 
-        typedef <i>unspecified</i> type;
-    };
-}}
-</pre>
-
-    <dl class="metafunction-semantics">
-      <dt><b>Returns:</b> <code>T::type</code> if <code>T</code> is a
-      specialization of
-<code>pointer_wrapper&lt;&gt;</code>, <code>T</code> otherwise
-    </dl>
-
-
-    <h2><a name="examples"></a>Example(s)</h2>
-
-This example illustrates the use of <code>ptr()</code> to prevent an
-object from being copied:
-<pre>
-#include &lt;boost/python/call.hpp&gt;
-#include &lt;boost/python/ptr.hpp&gt;
-
-class expensive_to_copy
-{
-   ...
-};
-
-void pass_as_arg(expensive_to_copy* x, PyObject* f)
-{
-   // call the Python function f, passing a Python object built around
-   // which refers to *x by-pointer.
-   //
-   // *** Note: ensuring that *x outlives the argument to f() is    ***
-   // *** up to the user! Failure to do so could result in a crash! ***
-
-   boost::python::call&lt;void&gt;(f, ptr(x));
-}
-...
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
diff --git a/doc/v2/python.html b/doc/v2/python.html
deleted file mode 100644
index 64d0c135..00000000
--- a/doc/v2/python.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>This is a convenience header which #includes all of the public
-    interface headers that are part of the Boost.Python library</p>
-<pre>
-# include &lt;args.hpp&gt;
-# include &lt;args_fwd.hpp&gt;
-# include &lt;back_reference.hpp&gt;
-# include &lt;bases.hpp&gt;
-# include &lt;borrowed.hpp&gt;
-# include &lt;call.hpp&gt;
-# include &lt;call_method.hpp&gt;
-# include &lt;class.hpp&gt;
-# include &lt;copy_const_reference.hpp&gt;
-# include &lt;copy_non_const_reference.hpp&gt;
-# include &lt;data_members.hpp&gt;
-# include &lt;def.hpp&gt;
-# include &lt;default_call_policies.hpp&gt;
-# include &lt;dict.hpp&gt;
-# include &lt;enum.hpp&gt;
-# include &lt;errors.hpp&gt;
-# include &lt;exception_translator.hpp&gt;
-# include &lt;extract.hpp&gt;
-# include &lt;handle.hpp&gt;
-# include &lt;has_back_reference.hpp&gt;
-# include &lt;implicit.hpp&gt;
-# include &lt;init.hpp&gt;
-# include &lt;instance_holder.hpp&gt;
-# include &lt;iterator.hpp&gt;
-# include &lt;list.hpp&gt;
-# include &lt;long.hpp&gt;
-# include &lt;lvalue_from_pytype.hpp&gt;
-# include &lt;make_function.hpp&gt;
-# include &lt;manage_new_object.hpp&gt;
-# include &lt;module.hpp&gt;
-# include &lt;numeric.hpp&gt;
-# include &lt;object.hpp&gt;
-# include &lt;object_protocol.hpp&gt;
-# include &lt;object_protocol_core.hpp&gt;
-# include &lt;operators.hpp&gt;
-# include &lt;other.hpp&gt;
-# include &lt;overloads.hpp&gt;
-# include &lt;pointee.hpp&gt;
-# include &lt;ptr.hpp&gt;
-# include &lt;reference_existing_object.hpp&gt;
-# include &lt;return_internal_reference.hpp&gt;
-# include &lt;return_value_policy.hpp&gt;
-# include &lt;scope.hpp&gt;
-# include &lt;self.hpp&gt;
-# include &lt;slice_nil.hpp&gt;
-# include &lt;str.hpp&gt;
-# include &lt;to_python_converter.hpp&gt;
-# include &lt;to_python_indirect.hpp&gt;
-# include &lt;to_python_value.hpp&gt;
-# include &lt;tuple.hpp&gt;
-# include &lt;type_id.hpp&gt;
-# include &lt;with_custodian_and_ward.hpp&gt;
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/rationale.html b/doc/v2/rationale.html
deleted file mode 100644
index 8219adad..00000000
--- a/doc/v2/rationale.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../boost.css">
-<title>Boost.Python - Rationale</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">Rationale</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<dl class="index">
-  <dt><a href="#introduction">Introduction</a></dt>
-  <dt><a href="#topic1">First topic</a></dt>
-  <dt><a href="#topic2">Second topic</a></dt>
-  <dt><a href="#footnotes">Footnotes</a></dt>
-</dl>
-<h2><a name="introduction"></a>Introduction</h2>
-<p>{{text}}</p>
-<h2><a name="topic1"></a>First Topic</h2>
-<p>{{text}}</p>
-<h2><a name="topic2"></a>Second Topic</h2>
-<p>{{text}}</p>
-<h2><a name="footnotes"></a>Footnotes</h2>
-<dl>
-  <dt><a name="footnote1" class="footnote">(1)</a> {{text}}</dt>
-  <dt><a name="footnote2" class="footnote">(2)</a> {{text}}</dt>
-</dl>
-<hr>
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-<p><i>&copy; Copyright <a href="../../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
-  2002. All Rights Reserved.</i></p>
-</body>
-</html>
diff --git a/doc/v2/raw_function.html b/doc/v2/raw_function.html
deleted file mode 100755
index ae1ad6c0..00000000
--- a/doc/v2/raw_function.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/raw_function.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/raw_function.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#raw_function-spec">raw_function</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code><a href="#raw_function-spec">raw_function</a>(...)</code>
-    is used to convert a function taking a <a
-    href="tuple.html#tuple-spec">tuple</a> and a <a
-    href="dict.html#dict-spec">dict</a> into a Python callable object
-    which accepts a variable number of arguments and arbitrary keyword
-    arguments.
-
-    <h2><a name="functions"></a>Functions</h2>
-    <a name="raw_function-spec"></a>raw_function 
-<pre>
-template &lt;class F&gt;
-object raw_function(F f, std::size_t min_args = 0);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>f(tuple(), dict())</code> is
-      well-formed.</dt>
-
-       <dt><b>Returns:</b> a <a href=
-          "http://www.python.org/doc/current/lib/built-in-funcs.html#l2h-6">callable</a> object which requires at least <code>min_args</code> arguments.  When called, the actual non-keyword arguments will be passed in a <a
-    href="tuple.html#tuple-spec">tuple</a> as the first argument to <code>f</code>, and the keyword arguments will be passed in a  <a
-    href="dict.html#dict-spec">dict</a> as the second argument to <code>f</code>.
-
-      </dd>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-C++:
-<pre>
-#include &lt;boost/python/def.hpp&gt;
-#include &lt;boost/python/tuple.hpp&gt;
-#include &lt;boost/python/dict.hpp&gt;
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/raw_function.hpp&gt;
-
-using namespace boost::python;
-
-tuple raw(tuple args, dict kw)
-{
-    return make_tuple(args, kw);
-}
-
-BOOST_PYTHON_MODULE(raw_test)
-{
-    def("raw", raw_function(raw));
-}
-</pre>
-
-Python:
-<pre>
-&gt;&gt;&gt; from raw_test import *
-
-&gt;&gt;&gt; raw(3, 4, foo = 'bar', baz = 42)
-((3, 4), {'foo': 'bar', 'baz': 42})
-</pre>
-    <p>
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     7 March, 2003
-    <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/reference.html b/doc/v2/reference.html
deleted file mode 100644
index a49b5c06..00000000
--- a/doc/v2/reference.html
+++ /dev/null
@@ -1,986 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - Reference</title>
-
-    <style type="text/css">
- p.c3 {font-style: italic}
- h2.c2 {text-align: center}
- h1.c1 {text-align: center}
-                                        </style>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "reference">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="http://www.boost.org"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 class="c1"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 class="c2">Reference</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="Reference">
-      <dt><a href="#concepts">Concepts</a></dt>
-
-      <dt><a href="#high_level">High Level Components</a></dt>
-
-      <dt><a href="#object_wrappers">Object Wrappers</a></dt>
-
-      <dt><a href="#invocation">Function Invocation and Creation</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="#models_of_call_policies">Models of
-          CallPolicies</a></dt>
-
-          <dt><a href="#models_of_result_converter">Models of
-          ResultConverter</a></dt>
-
-          <dt><a href="#result_converter_generators">Models of
-          ResultConverterGenerator</a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#type_conversion">To/From Python Type Conversion</a></dt>
-
-      <dt><a href="#utility">Utility and Infrastructure</a></dt>
-
-      <dt><a href="#topics">Topics</a></dt>
-    </dl>
-    <hr>
-    <!-- xxxxx -->
-
-    <h2><a name="concepts">Concepts</a></h2>
-
-    <dl class="index">
-      <dt><a href=
-      "CallPolicies.html#CallPolicies-concept">CallPolicies</a></dt>
-
-      <dt><a href=
-      "Dereferenceable.html#Dereferenceable-concept">Dereferenceable</a></dt>
-
-      <dt><a href="Dereferenceable.html#Extractor-concept">Extractor</a></dt>
-
-      <dt><a href=
-      "HolderGenerator.html#HolderGenerator-concept">HolderGenerator</a></dt>
-
-      <dt><a href=
-      "ResultConverter.html#ResultConverter-concept">ResultConverter</a></dt>
-
-      <dt><a href=
-      "ResultConverter.html#ResultConverterGenerator-concept">ResultConverterGenerator</a></dt>
-
-      <dt><a href=
-      "ObjectWrapper.html#ObjectWrapper-concept">ObjectWrapper</a></dt>
-
-      <dt><a href=
-      "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a></dt>
-    </dl>
-
-    <h2><a name="high_level">High Level Components</a></h2>
-
-    
-<dl>
-  <dt><a href="class.html">class.hpp/class_fwd.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href="class.html#classes">Classes</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href="class.html#class_-spec">class_</a></dt>
-          <dt><a href="class.html#bases-spec">bases</a></dt>
-        </dl>
-      </dd>
-    </dl>
-  </dd>
-  <dt><a href="def.html">def.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href="def.html#functions">Functions</a></dt>
-      <dd> 
-        <dl class="page-index">
-          <dt><a href="def.html#def-spec">def</a></dt>
-        </dl>
-      </dd>
-    </dl>
-  </dd>
-  <dt><a href="def_visitor.html">def_visitor.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href="def_visitor.html#classes">Classes</a></dt>
-    </dl>
-  </dd>
-  <dt><a href="enum.html">enum.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href="enum.html#classes">Classes</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href="enum.html#enum_-spec">enum_</a></dt>
-        </dl>
-      </dd>
-    </dl>
-  </dd>
-  <dt><a href="errors.html">errors.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href="errors.html#classes">Classes</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href=
-              "errors.html#error_already_set-spec">error_already_set</a></dt>
-        </dl>
-      </dd>
-      <dt><a href="errors.html#functions">Functions</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href=
-              "errors.html#handle_exception-spec">handle_exception</a></dt>
-          <dt><a href=
-              "errors.html#expect_non_null-spec">expect_non_null</a></dt>
-          <dt><a href=
-              "errors.html#throw_error_already_set-spec">throw_error_already_set</a></dt>
-        </dl>
-      </dd>
-    </dl>
-  </dd>
-  <dt><a href=
-      "exception_translator.html">exception_translator.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href=
-          "exception_translator.html#functions">Functions</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href=
-              "exception_translator.html#register_exception_translator-spec">register_exception_translator</a></dt>
-        </dl>
-      </dd>
-    </dl>
-  </dd>
-  <dt><a href="init.html">init.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href="init.html#classes">Classes</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href="init.html#init-spec">init</a></dt>
-          <dt><a href="init.html#optional-spec">optional</a></dt>
-        </dl>
-      </dd>
-    </dl>
-  </dd>
-  <dt><a href="iterator.html">iterator.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href="iterator.html#classes">Classes</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href="iterator.html#iterator-spec">iterator</a></dt>
-          <dt><a href="iterator.html#iterators-spec">iterators</a></dt>
-        </dl>
-      </dd>
-      <dt><a href="iterator.html#functions">Functions</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href="iterator.html#range-spec">range</a></dt>
-        </dl>
-      </dd>
-    </dl>
-  </dd>
-  <dt><a href="module.html">module.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href="module.html#macros">Macros</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href=
-              "module.html#BOOST_PYTHON_MODULE-spec">BOOST_PYTHON_MODULE</a></dt>
-        </dl>
-      </dd>
-    </dl>
-  </dd>
-  <dt><a href="operators.html">operators.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href="operators.html#classes">Classes</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href="operators.html#self_t-spec">self_t</a></dt>
-          <dt><a href="operators.html#other-spec">other</a></dt>
-          <dt><a href="operators.html#operator_-spec">operator_</a></dt>
-        </dl>
-      </dd>
-      <dt><a href="operators.html#objects">Objects</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href="operators.html#self-spec">self</a></dt>
-        </dl>
-      </dd>
-    </dl>
-  </dd>
-  <dt><a href="scope.html">scope.hpp</a></dt>
-  <dd> 
-    <dl class="index">
-      <dt><a href="scope.html#classes">Classes</a></dt>
-      <dd> 
-        <dl class="index">
-          <dt><a href="scope.html#scope-spec">scope</a></dt>
-        </dl>
-      </dd>
-    </dl>
-  </dd>
-</dl>
-
-    <h2><a name="object_wrappers">Object Wrappers</a></h2>
-
-    <dl class="index">
-      <dt><a href="dict.html">dict.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="dict.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="dict.html#dict-spec">dict</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="list.html">list.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="list.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="list.html#list-spec">list</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="long.html">long.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="long.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="long.html#long_-spec">long_</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="numeric.html">numeric.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="numeric.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="numeric.html#array-spec">numeric::array</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="object.html">object.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="object.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="object.html#object-spec">object</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="str.html">str.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="str.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="str.html#str-spec">str</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="tuple.html">tuple.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="tuple.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="tuple.html#tuple-spec">tuple</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="tuple.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="tuple.html#make_tuple-spec">make_tuple</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-    </dl>
-
-    <h2><a name="invocation">Function Invocation and Creation</a></h2>
-
-    <dl class="index">
-      <dt><a href="args.html">args.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="args.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="args.html#args-spec">args</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="call.html">call.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="call.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="call.html#call-spec">call</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="call_method.html">call_method.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="call_method.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "call_method.html#call_method-spec">call_method</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="data_members.html">data_members.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="data_members.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "data_members.html#make_getter-spec">make_getter</a></dt>
-
-              <dt><a href=
-              "data_members.html#make_setter-spec">make_setter</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="make_function.html">make_function.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="make_function.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "make_function.html#make_function-spec">make_function</a></dt>
-
-              <dt><a href=
-              "make_function.html#make_constructor-spec">make_constructor</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="overloads.html">overloads.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="overloads.html#macros">macros</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "overloads.html#BOOST_PYTHON_FUNCTION_OVERLOADS-spec">BOOST_PYTHON_FUNCTION_OVERLOADS</a></dt>
-
-              <dt><a href=
-              "overloads.html#BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS-spec">BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="ptr.html">ptr.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="ptr.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="ptr.html#ptr-spec">ptr</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="ptr.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "ptr.html#pointer_wrapper-spec">pointer_wrapper</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="ptr.html#metafunctions">MetaFunctions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "ptr.html#is_pointer_wrapper-spec">is_pointer_wrapper</a></dt>
-
-              <dt><a href=
-              "ptr.html#unwrap_pointer-spec">unwrap_pointer</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="raw_function.html">raw_function.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="raw_function.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href=
-              "raw_function.html#raw_function-spec">raw_function</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dd>
-        <a name="models_of_call_policies"></a> 
-
-        <h3>Models of CallPolicies</h3>
-
-        <dl class="index">
-          <dt><a href=
-          "default_call_policies.html">default_call_policies.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "default_call_policies.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "default_call_policies.html#default_call_policies-spec">default_call_policies</a></dt>
-
-                  <dt><a href=
-                  "default_call_policies.html#default_result_converter-spec">default_result_converter</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-
-          <dt><a href="return_arg.html">return_arg.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="return_arg.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "return_arg.html#return_arg-spec">return_arg</a></dt>
-
-                  <dt><a href=
-                  "return_arg.html#return_self-spec">return_self</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-
-          <dt><a href=
-          "return_internal_reference.html">return_internal_reference.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "return_internal_reference.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "return_internal_reference.html#return_internal_reference-spec">
-                  return_internal_reference</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-
-          <dt><a href=
-          "return_value_policy.html">return_value_policy.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="return_value_policy.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "return_value_policy.html#return_value_policy-spec">return_value_policy</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-
-          <dt><a href=
-          "with_custodian_and_ward.html">with_custodian_and_ward.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "with_custodian_and_ward.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "with_custodian_and_ward.html#with_custodian_and_ward-spec">
-                  with_custodian_and_ward</a></dt>
-
-                  <dt><a href=
-                  "with_custodian_and_ward.html#with_custodian_and_ward_postcall-spec">
-                  with_custodian_and_ward_postcall</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-        </dl>
-        <a name="models_of_result_converter"></a> 
-
-        <h3>Models of ResultConverter</h3>
-
-        <dl class="index">
-          <dt><a href=
-          "to_python_indirect.html">to_python_indirect.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="to_python_indirect.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "to_python_indirect.html#to_python_indirect-spec">to_python_indirect</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-
-          <dt><a href="to_python_value.html">to_python_value.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="to_python_value.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "to_python_value.html#to_python_value-spec">to_python_value</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-        </dl>
-        <a name="result_converter_generators"></a> 
-
-        <h3>Models of ResultConverterGenerator</h3>
-
-        <dl class="index">
-          <dt><a href=
-          "copy_const_reference.html">copy_const_reference.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "copy_const_reference.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "copy_const_reference.html#copy_const_reference-spec">copy_const_reference</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-
-          <dt><a href=
-          "copy_non_const_reference.html">copy_non_const_reference.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "copy_non_const_reference.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "copy_non_const_reference.html#copy_non_const_reference-spec">
-                  copy_non_const_reference</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-
-          <dt><a href="manage_new_object.html">manage_new_object.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="manage_new_object.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "manage_new_object.html#manage_new_object-spec">manage_new_object</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-
-          <dt><a href=
-          "reference_existing_object.html">reference_existing_object.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "reference_existing_object.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "reference_existing_object.html#reference_existing_object-spec">
-                  reference_existing_object</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-
-          <dt><a href="return_by_value.html">return_by_value.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="return_by_value.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "return_by_value.html#return_by_value-spec">return_by_value</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-
-          <dt><a href=
-          "return_opaque_pointer.html">return_opaque_pointer.hpp</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "return_opaque_pointer.html#classes">Classes</a></dt>
-
-              <dd>
-                <dl class="index">
-                  <dt><a href=
-                  "return_opaque_pointer.html#return_opaque_pointer-spec">return_opaque_pointer</a></dt>
-                </dl>
-              </dd>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-    </dl>
-
-    <h2><a name="type_conversion">To/From Python Type Conversion</a></h2>
-
-    <dl class="index">
-      <dt><a href="extract.html">extract.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="extract.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="extract.html#extract-spec">extract</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="implicit.html">implicit.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="implicit.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "implicit.html#implicitly_convertible-spec">implicitly_convertible</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="lvalue_from_pytype.html">lvalue_from_pytype.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="lvalue_from_pytype.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "lvalue_from_pytype.html#lvalue_from_pytype-spec">lvalue_from_pytype</a></dt>
-
-              <dt><a href=
-              "lvalue_from_pytype.html#extract_identity-spec">extract_identity</a></dt>
-
-              <dt><a href=
-              "lvalue_from_pytype.html#extract_member-spec">extract_member</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href=
-      "opaque_pointer_converter.html">opaque_pointer_converter.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href=
-          "opaque_pointer_converter.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "opaque_pointer_converter.html#opaque_pointer_converter-spec">opaque_pointer_converter</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="opaque_pointer_converter.html#macros">Macros</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "opaque_pointer_converter.html#BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID-spec">
-              BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="to_python_converter.html">to_python_converter.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="to_python_converter.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "to_python_converter.html#to_python_converter-spec">to_python_converter</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href=
-      "register_ptr_to_python.html">register_ptr_to_python.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href=
-          "register_ptr_to_python.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "register_ptr_to_python.html#register_ptr_to_python-spec">register_ptr_to_python</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-    </dl>
-
-    <h2><a name="utility">Utility and Infrastructure</a></h2>
-
-    <dl>
-      <dt><a href="has_back_reference.html">has_back_reference.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="has_back_reference.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "has_back_reference.html#has_back_reference-spec">has_back_reference</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="instance_holder.html">instance_holder.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="instance_holder.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href=
-              "instance_holder.html#instance_holder-spec">instance_holder</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="pointee.html">pointee.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="pointee.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt>class template <a href=
-              "pointee.html#pointee">pointee</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="python.html">&lt;boost/python.hpp&gt;</a></dt>
-
-      <dt><a href="handle.html">handle.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="handle.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="handle.html#handle-spec">handle</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="handle.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="handle.html#borrowed-spec">borrowed</a></dt>
-
-              <dt><a href="handle.html#allow_null-spec">allow_null</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="type_id.html">type_id.hpp</a></dt>
-
-      <dd>
-        <dl class="index">
-          <dt><a href="type_id.html#functions">Functions</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="type_id.html#type_id-spec">type_id</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="type_id.html#classes">Classes</a></dt>
-
-          <dd>
-            <dl class="index">
-              <dt><a href="type_id.html#type_info-spec">type_info</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-    </dl>
-
-    <h2><a name="topics">Topics</a></h2>
-
-    
-<dl>
-  <dt><a href="callbacks.html">Calling Python Functions and Methods</a></dt>
-  <dt><a href="pickle.html">Pickle Support</a><br>
-    <a href="indexing.html">Indexing Support</a></dt>
-</dl>
-    <hr>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     19 July, 2003 <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p class="c3">&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</p>
-  </body>
-</html>
-
diff --git a/doc/v2/reference_existing_object.html b/doc/v2/reference_existing_object.html
deleted file mode 100644
index e066debf..00000000
--- a/doc/v2/reference_existing_object.html
+++ /dev/null
@@ -1,178 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python -
-    &lt;boost/python/reference_existing_object.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/reference_existing_object.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#reference_existing_object-spec">Class
-          <code>reference_existing_object</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#reference_existing_object-spec-synopsis">Class
-              <code>reference_existing_object</code> synopsis</a></dt>
-
-              <dt><a href=
-              "#reference_existing_object-spec-metafunctions">Class
-              <code>reference_existing_object</code> metafunctions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="reference_existing_object-spec"></a>Class
-    <code>reference_existing_object</code></h3>
-
-    <p><code>reference_existing_object</code> is a model of <a href=
-    "ResultConverter.html#ResultConverterGenerator-concept">ResultConverterGenerator</a>
-    which can be used to wrap C++ functions which return a reference or
-    pointer to a C++ object. When the wrapped function is called, the value
-    referenced by its return value is not copied. A new Python object is
-    created which contains a pointer to the referent, and no attempt is made
-    to ensure that the lifetime of the referent is at least as long as that
-    of the corresponding Python object. Thus, it can be <font color=
-    "#ff0000"><b>highly dangerous</b></font> to use
-    <code>reference_existing_object</code> without additional lifetime
-    management from such models of <a href=
-    "CallPolicies.html">CallPolicies</a> as <a href=
-    "with_custodian_and_ward.html#with_custodian_and_ward-spec">with_custodian_and_ward</a>.
-    This class is used in the implementation of <a href=
-    "return_internal_reference.html#return_internal_reference-spec">return_internal_reference</a>.</p>
-
-    <h4><a name="reference_existing_object-spec-synopsis"></a>Class
-    <code>reference_existing_object</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    struct reference_existing_object
-    {
-        template &lt;class T&gt; struct apply;
-    };
-}}
-</pre>
-
-    <h4><a name="reference_existing_object-spec-metafunctions"></a>Class
-    <code>reference_existing_object</code> metafunctions</h4>
-<pre>
-template &lt;class T&gt; struct apply
-</pre>
-
-    <dl class="metafunction-semantics">
-      <dt><b>Requires:</b> <code>T</code> is <code>U&amp;</code> or
-      <code>U*</code>for some <code>U</code>.</dt>
-
-      <dt><b>Returns:</b> <code>typedef <a href=
-      "to_python_indirect.html#to_python_indirect-spec">to_python_indirect</a>&lt;T,V&gt;
-      type</code>, where <code>V</code> is a <a href=
-      "to_python_indirect.html#HolderObjectGenerator">HolderObjectGenerator</a>
-      which constructs an instance holder containing an <i>unowned</i>
-      <code>U*</code> pointing to the referent of the wrapped function's
-      return value.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <p>In C++:</p>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/reference_existing_object.hpp&gt;
-#include &lt;boost/python/return_value_policy.hpp&gt;
-#include &lt;utility&gt;
-
-// classes to wrap
-struct Singleton
-{
-   Singleton() : x(0) {}
-
-   int exchange(int n)  // set x and return the old value
-   {
-        std::swap(n, x);
-        return n;
-   }
-
-   int x;
-};
-
-Singleton&amp; get_it()
-{
-   static Singleton just_one;
-   return just_one;
-}
-
-// Wrapper code
-using namespace boost::python;
-BOOST_PYTHON_MODULE(singleton)
-{
-    def("get_it", get_it,
-        return_value_policy&lt;reference_existing_object&gt;());
-
-    class_&lt;Singleton&gt;("Singleton")
-       .def("exchange", &amp;Singleton::exchange)
-       ;
-}
-</pre>
-    In Python: 
-<pre>
-&gt;&gt;&gt; import singleton
-&gt;&gt;&gt; s1 = singleton.get_it()  
-&gt;&gt;&gt; s2 = singleton.get_it()
-&gt;&gt;&gt; id(s1) == id(s2)  # s1 and s2 are not the same object
-0
-&gt;&gt;&gt; s1.exchange(42)   # but they reference the same C++ Singleton
-0
-&gt;&gt;&gt; s2.exchange(99)
-42
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/register_ptr_to_python.html b/doc/v2/register_ptr_to_python.html
deleted file mode 100644
index 68a0737e..00000000
--- a/doc/v2/register_ptr_to_python.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="../boost.css">
-<title>Boost.Python - &lt;register_ptr_to_python.hpp&gt;</title>
-</head>
-<body link="#0000ff" vlink="#800080">
-<table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-  <tr> 
-    <td valign="top" width="300"> 
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-    </td>
-    <td valign="top"> 
-      <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-      <h2 align="center">Header &lt;register_ptr_to_python.hpp&gt;</h2>
-    </td>
-  </tr>
-</table>
-<hr>
-<h2>Contents</h2>
-<dl class="page-index"> 
-  <dt><a href="#introduction">Introduction</a></dt>
-  <dt><a href="#functions">Functions</a></dt>
-  <dl class="page-index">
-  <dt><a href="#register_ptr_to_python-spec">register_ptr_to_python</a></dt>
-  </dl>
-
-  <dt><a href="#examples">Example(s)</a></dt>
-
-</dl>
-<hr>
-<h2><a name="introduction"></a>Introduction</h2>
-<p>
-  <code>&lt;boost/python/register_ptr_to_python.hpp&gt;</code>
-  supplies <code>register_ptr_to_python</code>, a function template
-  which registers a conversion for smart pointers to Python.  The
-  resulting Python object holds a copy of the converted smart pointer,
-  but behaves as though it were a wrapped copy of the pointee.  If
-  the pointee type has virtual functions and the class representing
-  its dynamic (most-derived) type has been wrapped, the Python object
-  will be an instance of the wrapper for the most-derived type. More than
-  one smart pointer type for a pointee's class can be registered.
-</p>
-<p>
-  Note that in order to convert a Python <code>X</code> object to a
-  <code>smart_ptr&lt;X&gt;&amp;</code> (non-const reference), the embedded C++
-  object must be held by <code>smart_ptr&lt;X&gt;</code>, and that when wrapped
-  objects are created by calling the constructor from Python, how they are held
-  is determined by the <code>HeldType</code> parameter to
-  <code>class_&lt;...&gt;</code> instances.  
-</p>
-  
-<h2><a name="functions"></a>Functions</h2>
-<pre>
-<a name="register_ptr_to_python-spec">template &lt;class P&gt;
-void register_ptr_to_python() 
-</pre>
-<dl class="function-semantics"> 
-  <dt><b>Requires:</b> <code>P</code> is the type of the smart pointer,
-  for example <code>smart_ptr&lt;X&gt;</code>.
-  </dt>
-  <dt><b>Effects:</b> Allows conversions to-python of <code>smart_ptr&lt;X&gt;</code>
-  instances.
-  </dt>
-</dl>
-
-<h2><a name="examples"></a>Example(s)</h2>
-
-<h3>C++ Wrapper Code</h3>
-
-Here is an example of a module that contains a class <code>A</code> with
-virtual functions and some functions that work with
-<code>boost::shared_ptr&lt;A&gt;</code>.
-
-<pre>
-struct A
-{
-    virtual int f() { return 0; }
-};
-
-shared_ptr&lt;A&gt; New() { return shared_ptr&lt;A&gt;( new A() ); }
-
-int Ok( const shared_ptr&lt;A&gt;&amp; a ) { return a-&gt;f(); }
-
-int Fail( shared_ptr&lt;A&gt;&amp; a ) { return a-&gt;f(); }
-
-struct A_Wrapper: A
-{
-    A_Wrapper(PyObject* self_): self(self_) {}
-    int f() { return call_method&lt;int&gt;(self, "f"); }    
-    int default_f() { return A::f(); }    
-    PyObject* self;
-};
-
-BOOST_PYTHON_MODULE(register_ptr)
-{
-    class_&lt;A, A_Wrapper&gt;("A")
-        .def("f", &amp;A::f, &amp;A_Wrapper::default_f)
-    ;
-    
-    def("New", &amp;New);
-    def("Ok", &amp;Call);
-    def("Fail", &amp;Fail);
-    
-    register_ptr_to_python&lt; shared_ptr&lt;A&gt; &gt;();
-} 
-</pre>
-
-<h3>Python Code</h3>
-
-<pre>
-&gt;&gt;&gt; from register_ptr import *
-&gt;&gt;&gt; a = A()
-&gt;&gt;&gt; Ok(a)     # ok, passed as shared_ptr&lt;A&gt;
-0
-&gt;&gt;&gt; Fail(a)   # passed as shared_ptr&lt;A&gt;&amp;, and was created in Python!
-Traceback (most recent call last):
-  File "&lt;stdin&gt;", line 1, in ?
-TypeError: bad argument type for built-in operation
-&gt;&gt;&gt;
-&gt;&gt;&gt; na = New()   # now "na" is actually a shared_ptr&lt;A&gt; 
-&gt;&gt;&gt; Ok(a)
-0
-&gt;&gt;&gt; Fail(a)
-0
-&gt;&gt;&gt;
-</pre>    
-
-If <code>shared_ptr&lt;A&gt;</code> is registered as follows:
-
-<pre>
-    class_&lt;A, A_Wrapper, shared_ptr&lt;A&gt; &gt;("A")
-        .def("f", &amp;A::f, &amp;A_Wrapper::default_f)
-    ;            
-</pre>    
-
-There will be an error when trying to convert <code>shared_ptr&lt;A&gt;</code> to
-<code>shared_ptr&lt;A_Wrapper&gt;</code>:
-
-<pre>
-&gt;&gt;&gt; a = New()
-Traceback (most recent call last):
-File "&lt;stdin&gt;", line 1, in ?
-TypeError: No to_python (by-value) converter found for C++ type: class boost::shared_ptr&lt;struct A&gt;
-&gt;&gt;&gt;    
-</pre>
-
-<p>Revised 
-  <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  24 Jun, 2003
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-</p>
-<p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave Abrahams</a> 
-  2002. All Rights Reserved.</i></p>
-</body>
-</html>  
-
-
diff --git a/doc/v2/return_arg.html b/doc/v2/return_arg.html
deleted file mode 100755
index 06c383bc..00000000
--- a/doc/v2/return_arg.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st April 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/return_arg.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/return_arg.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#return_arg-spec">Class Template
-          <code>return_arg</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#return_arg-spec-synopsis">Class Template
-              <code>return_arg</code> synopsis</a></dt>
-
-              <dt><a href="#return_arg-spec-statics">Class
-              <code>return_arg</code> static functions</a></dt>
-            </dl>
-          </dd>
-
-          <dt><a href="#return_self-spec">Class Template
-          <code>return_self</code></a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-    <code>return_arg</code> and <code>return_self</code> instantiations are
-    models of <a href="CallPolicies.html">CallPolicies</a> which return the
-    specified argument parameter (usually <code>*this</code>) of a wrapped
-    (member) function. 
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="return_arg-spec"></a>Class template
-    <code>return_arg</code></h3>
-
-    <table border="1" summary="return_arg template parameters">
-      <caption>
-        <b><code>return_arg</code> template parameters</b>
-      </caption>
-
-      <tr>
-        <th>Parameter</th>
-
-        <th>Requirements</th>
-
-        <th>Description</th>
-
-        <th>Default</th>
-      </tr>
-
-      <tr>
-        <td><code>arg_pos</code></td>
-
-        <td>A positive compile-time constant of type
-        <code>std::size_t</code>.</td>
-
-        <td>the position of the argument to be returned.</td>
-
-        <td>1</td>
-      </tr>
-
-      <tr>
-        <td><code>Base</code></td>
-
-        <td>A model of <a href="CallPolicies.html">CallPolicies</a></td>
-
-        <td>Used for policy composition. Any <code>result_converter</code> it
-        supplies will be overridden by <code>return_arg</code>, but its
-        <code>precall</code> and <code>postcall</code> policies are composed
-        as described here <a href=
-        "CallPolicies.html#composition">CallPolicies</a>.</td>
-
-        <td><code><a href=
-        "default_call_policies.html#default_call_policies-spec">default_call_policies</a></code></td>
-      </tr>
-    </table>
-
-    <h4><a name="return_arg-spec-synopsis"></a>Class template
-    <code>return_arg</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-   template &lt;size_t arg_pos=1, class Base = default_call_policies&gt;
-   struct return_arg : Base
-   {
-      static PyObject* postcall(PyObject*, PyObject* result);
-      struct result_converter{ template &lt;class T&gt; struct apply; };
-   };
-}}
-</pre>
-
-    <h4><a name="return_arg-spec-statics"></a>Class <code>return_arg</code>
-    static functions</h4>
-<pre>
-PyObject* postcall(PyObject* args, PyObject* result);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code><a href=
-      "http://www.python.org/doc/2.2/api/tupleObjects.html#l2h-476">PyTuple_Check</a>(args)
-      != 0</code> and <code>PyTuple_Size(args) != 0</code></dt>
-
-      <dt><b>Returns:</b> <code>PyTuple_GetItem(args,arg_pos-1)</code></dt>
-    </dl>
-
-    <h3><a name="return_self-spec"></a>Class template
-    <code>return_self</code></h3>
-
-    <h4>Class template <code>return_self</code> synopsis:</h4>
-<pre>
-namespace boost { namespace python
-{
-   template &lt;class Base = default_call_policies&gt;
-   struct return_self 
-     : return_arg&lt;1,Base&gt;
-   {};
-}}
-</pre>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <h3>C++ module definition</h3>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/return_arg.hpp&gt;
-
-struct Widget
-{
-   Widget() :sensitive_(true){}
-   bool get_sensitive() const { return sensitive_; }
-   void set_sensitive(bool s) { this-&gt;sensitive_ = s; }
- private:
-   bool sensitive_;
-};
-
-struct Label : Widget
-{
-   Label() {}
-
-   std::string  get_label() const { return label_; }
-   void set_label(const std::string &amp;l){ label_ = l; }
-
- private:
-   std::string label_;
-};
-
-using namespace boost::python;
-BOOST_PYTHON_MODULE(return_self_ext)
-{
-   class_&lt;widget&gt;("Widget")
-      .def("sensitive", &amp;Widget::get_sensitive)
-      .def("sensitive", &amp;Widget::set_sensitive, return_self&lt;&gt;())
-      ;
-
-   class_&lt;Label, bases&lt;Widget&gt; &gt;("Label")
-      .def("label", &amp;Label::get_label)
-      .def("label", &amp;Label::set_label, return_self&lt;&gt;())
-      ;
-}
-
-
-</pre>
-
-    <h3>Python code</h3>
-<pre>
-&gt;&gt;&gt; from return_self_ext import *
-&gt;&gt;&gt; l1 = Label().label("foo").sensitive(false)
-&gt;&gt;&gt; l2 = Label().sensitive(false).label("foo") 
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-     19 July, 2003 <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> and Nikolay
-    Mladenov 2003. All Rights Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/return_by_value.html b/doc/v2/return_by_value.html
deleted file mode 100644
index 80c26d75..00000000
--- a/doc/v2/return_by_value.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/return_by_value.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/return_by_value.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#return_by_value-spec">Class
-          <code>return_by_value</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#return_by_value-spec-synopsis">Class
-              <code>return_by_value</code> synopsis</a></dt>
-
-              <dt><a href="#return_by_value-spec-metafunctions">Class
-              <code>return_by_value</code> metafunctions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="return_by_value-spec"></a>Class
-    <code>return_by_value</code></h3>
-
-    <p><code>return_by_value</code> is a model of <a href=
-    "ResultConverter.html#ResultConverterGenerator-concept">ResultConverterGenerator</a>
-    which can be used to wrap C++ functions returning any reference or value
-    type such that the return value is copied into a new Python object.</p>
-
-    <h4><a name="return_by_value-spec-synopsis"></a>Class
-    <code>return_by_value</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    struct return_by_value
-    {
-        template &lt;class T&gt; struct apply;
-    };
-}}
-</pre>
-
-    <h4><a name="return_by_value-spec-metafunctions"></a>Class
-    <code>return_by_value</code> metafunctions</h4>
-<pre>
-template &lt;class T&gt; struct apply
-</pre>
-
-    <dl class="metafunction-semantics">
-      <dt><b>Returns:</b> <code>typedef <a href=
-      "to_python_value.html#to_python_value-spec">to_python_value</a>&lt;T&gt;
-      type;</code></dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <h3>C++ Module Definition</h3>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/return_by_value.hpp&gt;
-#include &lt;boost/python/return_value_policy.hpp&gt;
-
-// classes to wrap
-struct Bar { };
-
-Bar global_bar;
-
-// functions to wrap:
-Bar b1();
-Bar&amp; b2();
-Bar const&amp; b3();
-
-// Wrapper code
-using namespace boost::python;
-template &lt;class R&gt;
-void def_void_function(char const* name, R (*f)())
-{
-   def(name, f, return_value_policy&lt;return_by_value&gt;());
-}
-
-BOOST_PYTHON_MODULE(my_module)
-{
-    class_&lt;Bar&gt;("Bar");
-    def_void_function("b1", b1);
-    def_void_function("b2", b2);
-    def_void_function("b3", b3);
-}
-</pre>
-
-    <h3>Python Code</h3>
-<pre>
-&gt;&gt;&gt; from my_module import *
-&gt;&gt;&gt; b = b1() # each of these calls
-&gt;&gt;&gt; b = b2() # creates a brand
-&gt;&gt;&gt; b = b3() # new Bar object
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/return_internal_reference.html b/doc/v2/return_internal_reference.html
deleted file mode 100644
index bd9946da..00000000
--- a/doc/v2/return_internal_reference.html
+++ /dev/null
@@ -1,227 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python -
-    &lt;boost/python/return_internal_reference.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/return_internal_reference.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#return_internal_reference-spec">Class Template
-          <code>return_internal_reference</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#return_internal_reference-spec-synopsis">Class
-              Template <code>return_internal_reference</code>
-              synopsis</a></dt>
-
-              <dt><a href="#return_internal_reference-spec-statics">Class
-              <code>return_internal_reference</code> static
-              functions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-    <code>return_internal_reference</code> instantiations are models of <a
-    href="CallPolicies.html">CallPolicies</a> which allow pointers and
-    references to objects held internally by a free or member function
-    argument or from the target of a member function to be returned safely
-    without making a copy of the referent. The default for its first template
-    argument handles the common case where the containing object is the
-    target (<code>*this</code>) of a wrapped member function. 
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="return_internal_reference-spec"></a>Class template
-    <code>return_internal_reference</code></h3>
-
-    <table border="1" summary=
-    "return_internal_reference template parameters">
-      <caption>
-        <b><code>return_internal_reference</code> template parameters</b>
-      </caption>
-
-      <tr>
-        <th>Parameter</th>
-
-        <th>Requirements</th>
-
-        <th>Description</th>
-
-        <th>Default</th>
-      </tr>
-
-      <tr>
-        <td><code>owner_arg</code></td>
-
-        <td>A positive compile-time constant of type
-        <code>std::size_t</code>.</td>
-
-        <td>The index of the parameter which contains the object to which the
-        reference or pointer is being returned. If used to wrap a member
-        function, parameter 1 is the target object (<code>*this</code>). Note
-        that if the target Python object type doesn't support weak
-        references, a Python <code>TypeError</code> exception will be raised
-        when the function being wrapped is called.</td>
-
-        <td>1</td>
-      </tr>
-
-      <tr>
-        <td><code>Base</code></td>
-
-        <td>A model of <a href="CallPolicies.html">CallPolicies</a></td>
-
-        <td>Used for policy composition. Any <code>result_converter</code> it
-        supplies will be overridden by
-        <code>return_internal_reference</code>, but its <code>precall</code>
-        and <code>postcall</code> policies are composed as described here <a
-        href="CallPolicies.html#composition">CallPolicies</a>.</td>
-
-        <td><code><a href=
-        "default_call_policies.html#default_call_policies-spec">default_call_policies</a></code></td>
-      </tr>
-    </table>
-
-    <h4><a name="return_internal_reference-spec-synopsis"></a>Class template
-    <code>return_internal_reference</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-   template &lt;std::size_t owner_arg = 1, class Base = default_call_policies&gt;
-   struct return_internal_reference : Base
-   {
-      static PyObject* postcall(PyObject*, PyObject* result);
-      typedef <a href=
-"reference_existing_object.html#reference_existing_object-spec">reference_existing_object</a> result_converter;
-   };
-}}
-</pre>
-
-    <h4><a name="default_call_policies-spec-statics"></a>Class
-    <code>default_call_policies</code> static functions</h4>
-<pre>
-PyObject* postcall(PyObject* args, PyObject* result);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code><a href=
-      "http://www.python.org/doc/2.2/api/tupleObjects.html#l2h-476">PyTuple_Check</a>(args)
-      != 0</code></dt>
-
-      <dt><b>Returns:</b> <code><a href=
-      "with_custodian_and_ward.html#with_custodian_and_ward_postcall-spec-statics">
-      with_custodian_and_ward_postcall::postcall(args,
-      result)</a></code></dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <h3>C++ module definition</h3>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/return_internal_reference.hpp&gt;
-
-class Bar
-{
-   Bar(int x) : x(x) {}
-   int get_x() const { return x; }
-   void set_x(int x) { this-&gt;x = x; }
- private:
-   int x;
-}
-
-class Foo
-{
- public:
-   Foo(int x) : b(x) {}
-
-   // Returns an internal reference
-   Bar const&amp; get_bar() const { return b; }
-
- private:
-   Bar b;
-};
-
-using namespace boost::python;
-BOOST_PYTHON_MODULE(internal_refs)
-{
-   class_&lt;Bar&gt;("Bar")
-      .def("get_x", &amp;Bar::get_x)
-      .def("set_x", &amp;Bar::set_x)
-      ;
-
-   class_&lt;Foo&gt;("Foo", init&lt;int&gt;())
-      .def("get_bar", &amp;Foo::get_bar
-          , return_internal_reference&lt;&gt;())
-      ;
-}
-</pre>
-
-    <h3>Python code</h3>
-<pre>
-&gt;&gt;&gt; from internal_refs import *
-&gt;&gt;&gt; f = Foo(3)
-&gt;&gt;&gt; b1 = f.get_bar()
-&gt;&gt;&gt; b2 = f.get_bar()
-&gt;&gt;&gt; b1.get_x()
-3
-&gt;&gt;&gt; b2.get_x()
-3
-&gt;&gt;&gt; b1.set_x(42)
-&gt;&gt;&gt; b2.get_x()
-42
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/return_opaque_pointer.html b/doc/v2/return_opaque_pointer.html
deleted file mode 100644
index f50b864f..00000000
--- a/doc/v2/return_opaque_pointer.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/return_opaque_pointer.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/return_opaque_pointer.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#return_opaque_pointer-spec">Class
-          <code>return_opaque_pointer</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#return_opaque_pointer-spec-synopsis">Class
-              <code>return_opaque_pointer</code> synopsis</a></dt>
-
-              <dt><a href="#return_opaque_pointer-spec-metafunctions">Class
-              <code>return_opaque_pointer</code> metafunctions</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-
-      <dt><a href="#see-also">See Also</a></dt>
-    </dl>
-    <hr>
-
-        <h2><a name="classes"></a>Classes</h2>
-
-        <h3><a name="return_opaque_pointer-spec"></a>Class
-          <code>return_opaque_pointer</code></h3>
-
-        <p><code>return_opaque_pointer</code> is a model of
-          <a href="ResultConverter.html#ResultConverterGenerator-concept">
-            ResultConverterGenerator</a>
-          which can be used to wrap C++ functions returning pointers to
-          undefined types such that the return value is copied into a
-          new Python object.</p>
-        <p>In addition to specifying the <code>return_opaque_pointer</code>
-          policy the <a href="opaque_pointer_converter.html#BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID-spec">
-          <code>BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID</code></a> macro must be
-          used to define specializations for the 
-          <a href="type_id.html#type_id-spec">type_id</a> function
-          on the type pointed to by returned pointer.</p>
-
-    <h4><a name="return_opaque_pointer-spec-synopsis"></a>Class
-    <code>return_opaque_pointer</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-    struct return_opaque_pointer
-    {
-        template &lt;class R&gt; struct apply;
-    };
-}}
-</pre>
-
-    <h4><a name="return_opaque_pointer-spec-metafunctions"></a>Class
-    <code>return_opaque_pointer</code> metafunctions</h4>
-<pre>
-template &lt;class R&gt; struct apply
-</pre>
-
-    <dl class="metafunction-semantics">
-      <dt><b>Returns:</b> <code>typedef
-                detail::opaque_conversion_holder&lt;R&gt;
-      type;</code></dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <h3>C++ Module Definition</h3>
-<pre>
-# include &lt;boost/python/return_opaque_pointer.hpp&gt;
-# include &lt;boost/python/def.hpp&gt;
-# include &lt;boost/python/module.hpp&gt;
-# include &lt;boost/python/return_value_policy.hpp&gt;
-
-typedef struct opaque_ *opaque;
-
-opaque the_op   = ((opaque) 0x47110815);
-
-opaque get () { return the_op; }
-void use (opaque op) {
-    if (op != the_op)
-	throw std::runtime_error (std::string ("failed"));
-}
-
-void failuse (opaque op) {
-    if (op == the_op)
-	throw std::runtime_error (std::string ("success"));
-}
-
-BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(opaque_)
-
-namespace bpl = boost::python;
-
-BOOST_PYTHON_MODULE(opaque_ext)
-{
-    bpl::def (
-        "get", &::get, bpl::return_value_policy&lt;bpl::return_opaque_pointer&gt;());
-    bpl::def ("use", &::use);
-    bpl::def ("failuse", &::failuse);
-}
-</pre>
-
-    <h3>Python Code</h3>
-<pre>
-"""
->>> from opaque_ext import *
->>> #
->>> # Check for correct conversion
->>> use(get())
->>> failuse(get())
-Traceback (most recent call last):
-        ...
-RuntimeError: success
->>> #
->>> # Check that there is no conversion from integers ...
->>> use(0)
-Traceback (most recent call last):
-        ...
-TypeError: bad argument type for built-in operation
->>> #
->>> # ... and from strings to opaque objects
->>> use("")
-Traceback (most recent call last):
-        ...
-TypeError: bad argument type for built-in operation
-"""
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    sys.exit(run()[0])
-</pre>
-
-    <h2><a name="see-also"></a>See Also</h2>
-        <p>
-          <a href="opaque_pointer_converter.html">
-            opaque_pointer_converter</a>
-        </p>
-
-    <p>Revised 
-  28 January, 2003
-    </p>
-
-    <p><i>&copy; Copyright 2003 Haufe Mediengruppe. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/return_value_policy.html b/doc/v2/return_value_policy.html
deleted file mode 100644
index 601c49d5..00000000
--- a/doc/v2/return_value_policy.html
+++ /dev/null
@@ -1,165 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python -
-    &lt;boost/python/return_value_policy.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/return_value_policy.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#return_value_policy-spec">Class Template
-          <code>return_value_policy</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#return_value_policy-spec-synopsis">Class Template
-              <code>return_value_policy</code> synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-    <code>return_value_policy</code> instantiations are simply models of <a
-    href="CallPolicies.html">CallPolicies</a> which are composed of a <a
-    href=
-    "ResultConverter.html#ResultConverterGenerator-concept">ResultConverterGenerator</a>
-    and optional <code>Base</code> <a href=
-    "CallPolicies.html">CallPolicies</a>. 
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="return_value_policy-spec"></a>Class template
-    <code>return_value_policy</code></h3>
-
-    <table border="1" summary="return_value_policy template parameters">
-      <caption>
-        <b><code>return_value_policy</code> template parameters</b>
-      </caption>
-
-      <tr>
-        <th>Parameter</th>
-
-        <th>Requirements</th>
-
-        <th>Default</th>
-      </tr>
-
-      <tr>
-        <td><a href=
-        "ResultConverter.html#ResultConverterGenerator-concept">ResultConverterGenerator</a></td>
-
-        <td>A model of <a href=
-        "ResultConverterGenerator.html">ResultConverterGenerator</a>.</td>
-      </tr>
-
-      <tr>
-        <td><code>Base</code></td>
-
-        <td>A model of <a href="CallPolicies.html">CallPolicies</a></td>
-
-        <td><code><a href=
-        "default_call_policies.html#default_call_policies-spec">default_call_policies</a></code></td>
-      </tr>
-    </table>
-
-    <h4><a name="return_value_policy-spec-synopsis"></a>Class template
-    <code>return_value_policy</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;class ResultConverterGenerator, class Base = default_call_policies&gt;
-  struct return_value_policy : Base
-  {
-      typedef ResultConverterGenerator result_converter;
-  };
-}}
-</pre>
-
-    <h2><a name="examples"></a>Example</h2>
-
-    <h3>C++ Module Definition</h3>
-<pre>
-#include &lt;boost/python/module.hpp&gt;
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/copy_const_reference.hpp&gt;
-#include &lt;boost/python/return_value_policy.hpp&gt;
-
-// classes to wrap
-struct Bar { int x; }
-
-struct Foo {
-   Foo(int x) : { b.x = x; }
-   Bar const&amp; get_bar() const { return b; }
- private:
-   Bar b;
-};
-
-// Wrapper code
-using namespace boost::python;
-BOOST_PYTHON_MODULE(my_module)
-{
-   class_&lt;Bar&gt;("Bar");
-
-   class_&lt;Foo&gt;("Foo", init&lt;int&gt;())
-      .def("get_bar", &amp;Foo::get_bar
-          , return_value_policy&lt;copy_const_reference&gt;())
-      ;
-}
-</pre>
-
-    <h3>Python Code</h3>
-<pre>
-&gt;&gt;&gt; from my_module import *
-&gt;&gt;&gt; f = Foo(3)         # create a Foo object
-&gt;&gt;&gt; b = f.get_bar()    # make a copy of the internal Bar object
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/scope.html b/doc/v2/scope.html
deleted file mode 100644
index 1d578d36..00000000
--- a/doc/v2/scope.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/scope.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/scope.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#scope-spec">Class <code>scope</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#scope-spec-synopsis">Class <code>scope</code>
-              synopsis</a></dt>
-
-              <dt><a href="#scope-spec-ctors">Class <code>scope</code>
-              constructors and destructor</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Defines facilities for querying and controlling the Python scope
-    (namespace) which will contain new wrapped classes and functions.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="scope-spec"></a>Class <code>scope</code></h3>
-
-    <p>The <code>scope</code> class has an associated global Python
-    object which controls the Python namespace in which new extension
-    classes and wrapped functions will be defined as
-    attributes. Default-constructing a new <code>scope</code> object
-    binds it to the associated global Python object. Constructing a
-    <code>scope</code> object with an argument changes the associated
-    global Python object to the one held by the argument, until the
-    lifetime of the <code>scope</code> object ends, at which time the
-    associated global Python object reverts to what it was before the
-    <code>scope</code> object was constructed.</p>
-
-    <h4><a name="scope-spec-synopsis"></a>Class <code>scope</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  class scope : public <a href=
-"object.html#object-spec">object</a>
-  {
-   public:
-      scope(scope const&amp;);
-      scope(object const&amp;);
-      scope();
-      ~scope()
-   private:
-      void operator=(scope const&amp;);
-  };
-}}
-</pre>
-
-    <h4><a name="scope-spec-ctors"></a>Class <code>scope</code> constructors
-    and destructor</h4>
-<pre>
-explicit scope(scope const&amp; x);
-explicit scope(object const&amp; x);
-</pre>
-    Stores a reference to the current associated scope object, and sets the
-    associated scope object to the one referred to by <code>x.ptr()</code>.
-    The <code>object</code> base class is initialized with <code>x</code>. 
-<pre>
-scope();
-</pre>
-    Stores a reference to the current associated scope object. The
-    <code>object</code> base class is initialized with the current associated
-    scope object. Outside any module initialization function, the current
-    associated Python object is <code>None</code>. 
-<pre>
-~scope()
-</pre>
-    Sets the current associated Python object to the stored object. 
-
-    <h2><a name="examples"></a>Example</h2>
-    The following example shows how scope setting can be used to define
-    nested classes. 
-
-    <p>C++ Module definition:</p>
-<pre>
-#include &lt;boost/python/class.hpp&gt;
-#include &lt;boost/python/scope.hpp&gt;
-using namespace boost::python;
-
-struct X
-{
-  void f();
-
-  struct Y { int g() { return 42; } };
-};
-
-BOOST_PYTHON_MODULE(nested)
-{
-   // add some constants to the current (module) scope
-   scope().attr("yes") = 1;
-   scope().attr("no") = 0;
-
-   // Change the current scope 
-   scope outer
-       = class_&lt;X&gt;("X")
-            .def("f", &amp;X::f)
-            ;
-
-   // Define a class Y in the current scope, X
-   class_&lt;Y&gt;("Y")
-      .def("g", &amp;Y::g)
-      ;
-}
-</pre>
-    Interactive Python: 
-<pre>
-&gt;&gt;&gt; import nested
-&gt;&gt;&gt; nested.yes
-1
-&gt;&gt;&gt; y = nested.X.Y()
-&gt;&gt;&gt; y.g()
-42
-</pre>
-
-    <p>Revised 09 October, 2002</p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/str.html b/doc/v2/str.html
deleted file mode 100644
index dc624cee..00000000
--- a/doc/v2/str.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/str.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/str.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#str-spec">Class <code>str</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#str-spec-synopsis">Class <code>str</code>
-              synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example(s)</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Exposes a <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> for the Python
-    <a href=
-    "http://www.python.org/dev/doc/devel/lib/string-methods.html">str</a>
-    type.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="str-spec"></a>Class <code>str</code></h3>
-
-    <p>Exposes the <a href=
-    "http://www.python.org/dev/doc/devel/lib/string-methods.html">string
-    methods</a> of Python's built-in <code>str</code> type. The
-    semantics of the constructors and member functions defined below,
-    except for the two-argument constructors which construct str
-    objects from a range of characters, can be fully understood by
-    reading the <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> concept
-    definition. Since <code>str</code> is publicly derived from
-    <code><a href="object.html#object-spec">object</a></code>, the
-    public object interface applies to <code>str</code> instances as
-    well.</p>
-
-    <h4><a name="str-spec-synopsis"></a>Class <code>str</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  class str : public object
-  {
-   public:
-      str(); // new str
-
-      str(char const* s); // new str
-
-      str(char const* start, char const* finish); // new str
-      str(char const* start, std::size_t length); // new str
-
-      template &lt;class T&gt;
-      explicit str(T const&amp; other);
-
-      str capitalize() const;
-
-      template &lt;class T&gt;
-      str center(T const&amp; width) const;
-
-      template&lt;class T&gt;
-      long count(T const&amp; sub) const;
-      template&lt;class T1, class T2&gt;
-      long count(T1 const&amp; sub,T2 const&amp; start) const;
-      template&lt;class T1, class T2, class T3&gt;
-      long count(T1 const&amp; sub,T2 const&amp; start, T3 const&amp; end) const;
-
-      object decode() const;
-      template&lt;class T&gt;
-      object decode(T const&amp; encoding) const;
-      template&lt;class T1, class T2&gt;
-      object decode(T1 const&amp; encoding, T2 const&amp; errors) const;
-
-      object encode() const;
-      template &lt;class T&gt;
-      object encode(T const&amp; encoding) const;
-      template &lt;class T1, class T2&gt;
-      object encode(T1 const&amp; encoding, T2 const&amp; errors) const;
-
-      template &lt;class T&gt;
-      bool endswith(T const&amp; suffix) const;
-      template &lt;class T1, class T2&gt;
-      bool endswith(T1 const&amp; suffix, T2 const&amp; start) const;
-      template &lt;class T1, class T2, class T3&gt;
-      bool endswith(T1 const&amp; suffix, T2 const&amp; start, T3 const&amp; end) const;
-
-      str expandtabs() const;
-      template &lt;class T&gt;
-      str expandtabs(T const&amp; tabsize) const;
-
-      template &lt;class T&gt;
-      long find(T const&amp; sub) const;
-      template &lt;class T1, class T2&gt;
-      long find(T1 const&amp; sub, T2 const&amp; start) const;
-      template &lt;class T1, class T2, class T3&gt;
-      long find(T1 const&amp; sub, T2 const&amp; start, T3 const&amp; end) const;
-
-      template &lt;class T&gt;
-      long index(T const&amp; sub) const;
-      template &lt;class T1, class T2&gt;
-      long index(T1 const&amp; sub, T2 const&amp; start) const;
-      template &lt;class T1, class T2, class T3&gt;
-      long index(T1 const&amp; sub, T2 const&amp; start, T3 const&amp; end) const;
-
-      bool isalnum() const;
-      bool isalpha() const;
-      bool isdigit() const;
-      bool islower() const;
-      bool isspace() const;
-      bool istitle() const;
-      bool isupper() const;
-
-      template &lt;class T&gt;
-      str join(T const&amp; sequence) const;
-
-      template &lt;class T&gt;
-      str ljust(T const&amp; width) const;
-
-      str lower() const;
-      str lstrip() const;
-
-      template &lt;class T1, class T2&gt;
-      str replace(T1 const&amp; old, T2 const&amp; new_) const;
-      template &lt;class T1, class T2, class T3&gt;
-      str replace(T1 const&amp; old, T2 const&amp; new_, T3 const&amp; maxsplit) const;
-
-      template &lt;class T&gt;
-      long rfind(T const&amp; sub) const;
-      template &lt;class T1, class T2&gt;
-      long rfind(T1 const&amp; sub, T2 const&amp; start) const;
-      template &lt;class T1, class T2, class T3&gt;
-      long rfind(T1 const&amp; sub, T2 const&amp; start, T3 const&amp; end) const;
-
-      template &lt;class T&gt;
-      long rindex(T const&amp; sub) const;
-      template &lt;class T1, class T2&gt;
-      long rindex(T1 const&amp; sub, T2 const&amp; start) const;
-      template &lt;class T1, class T2, class T3&gt;
-      long rindex(T1 const&amp; sub, T2 const&amp; start, T3 const&amp; end) const;
-
-      template &lt;class T&gt;
-      str rjust(T const&amp; width) const;
-
-      str rstrip() const;
-
-      list split() const; 
-      template &lt;class T&gt;
-      list split(T const&amp; sep) const;
-      template &lt;class T1, class T2&gt;
-      list split(T1 const&amp; sep, T2 const&amp; maxsplit) const;
-
-      list splitlines() const;
-      template &lt;class T&gt;
-      list splitlines(T const&amp; keepends) const;
-
-      template &lt;class T&gt;
-      bool startswith(T const&amp; prefix) const;
-      template &lt;class T1, class T2&gt;
-      bool startswidth(T1 const&amp; prefix, T2 const&amp; start) const;
-      template &lt;class T1, class T2, class T3&gt;
-      bool startswidth(T1 const&amp; prefix, T2 const&amp; start, T3 const&amp; end) const;
-
-      str strip() const;
-      str swapcase() const;
-      str title() const;
-
-      template &lt;class T&gt;
-      str translate(T const&amp; table) const;
-      template &lt;class T1, class T2&gt;
-      str translate(T1 const&amp; table, T2 const&amp; deletechars) const;
-
-      str upper() const;
-  };
-}}
-</pre>
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-using namespace boost::python;
-str remove_angle_brackets(str x)
-{
-  return x.strip('&lt;').strip('&gt;');
-}
-</pre>
-
-    <p>Revised 3 October, 2002</p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/to_python_converter.html b/doc/v2/to_python_converter.html
deleted file mode 100644
index 33e3b684..00000000
--- a/doc/v2/to_python_converter.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python -
-    &lt;boost/python/to_python_converter.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/to_python_converter.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#to_python_converter-spec">Class Template
-          <code>to_python_converter</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#to_python_converter-spec-synopsis">Class Template
-              <code>to_python_converter</code> synopsis</a></dt>
-
-              <dt><a href="#to_python_converter-spec-ctors">Class Template
-              <code>to_python_converter</code> constructor</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-    <code>to_python_converter</code> registers a conversion from objects of a
-    given C++ type into a Python object. 
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="to_python_converter-spec"></a>Class template
-    <code>to_python_converter</code></h3>
-    <code>to_python_converter</code> adds a wrapper around a static member
-    function of its second template parameter, handling low-level details
-    such as insertion into the converter registry. 
-
-    <table border="1" summary="to_python_converter template parameters">
-      <caption>
-        <b><code>to_python_converter</code> template parameters</b><br>
-        In the table below, <b><code>x</code></b> denotes an object of type
-        <code>T</code>
-      </caption>
-
-      <tr>
-        <th>Parameter</th>
-
-        <th>Requirements</th>
-
-        <th>Description</th>
-      </tr>
-
-      <tr>
-        <td><code>T</code></td>
-
-        <td>
-        </td>
-
-        <td>The C++ type of the source object in the conversion</td>
-      </tr>
-
-      <tr>
-        <td><code>Conversion</code></td>
-
-        <td>
-        <code>PyObject*&nbsp;p&nbsp;=&nbsp;Conversion::convert(x)</code>,<br>
-         if <code>p&nbsp;==&nbsp;0</code>, <code><a href=
-        "http://www.python.org/doc/2.2/api/exceptionHandling.html#l2h-71">PyErr_Occurred</a>()&nbsp;!=&nbsp;0</code>.</td>
-
-        <td>A class type whose static member function <code>convert</code>
-        does the real work of the conversion.</td>
-      </tr>
-    </table>
-
-    <h4><a name="to_python_converter-spec-synopsis"></a>Class template
-    <code>to_python_converter</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;class T, class Conversion&gt;
-  struct to_python_converter
-  {
-      to_python_converter();
-  };
-}}
-</pre>
-
-    <h4><a name="to_python_converter-spec-ctors"></a>Class template
-    <code>to_python_converter</code> constructor</h4>
-<pre>
-to_python_converter();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> Registers a to_python converter which uses
-      <code>Conversion::convert()</code> to do its work.</dt>
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-    This example presumes that someone has implemented the standard <a href=
-    "http://www.python.org/doc/2.2/ext/dnt-basics.html">noddy example
-    module</a> from the Python documentation, and placed the corresponding
-    declarations in <code>"noddy.h"</code>. Because
-    <code>noddy_NoddyObject</code> is the ultimate trivial extension type,
-    the example is a bit contrived: it wraps a function for which all
-    information is contained in the <i>type</i> of its return value. 
-
-    <h3>C++ module definition</h3>
-<pre>
-#include &lt;boost/python/reference.hpp&gt;
-#include &lt;boost/python/module.hpp&gt;
-#include "noddy.h"
-
-struct tag {};
-tag make_tag() { return tag(); }
-
-using namespace boost::python;
-
-struct tag_to_noddy
-{
-    static PyObject* convert(tag const&amp; x)
-    {
-        return PyObject_New(noddy_NoddyObject, &amp;noddy_NoddyType);
-    }
-};
-
-BOOST_PYTHON_MODULE(to_python_converter)
-{
-    def("make_tag", make_tag);
-    to_python_converter&lt;tag, tag_to_noddy&gt;();
-}
-</pre>
-
-    <h3>Python code</h3>
-<pre>
-&gt;&gt;&gt; import to_python_converter
-&gt;&gt;&gt; def always_none():
-...     return None
-...
-&gt;&gt;&gt; def choose_function(x):
-...     if (x % 2 != 0):
-...         return to_python_converter.make_tag
-...     else:
-...         return always_none
-...
-&gt;&gt;&gt; a = [ choose_function(x) for x in range(5) ]
-&gt;&gt;&gt; b = [ f() for f in a ]
-&gt;&gt;&gt; type(b[0])
-&lt;type 'NoneType'&gt;
-&gt;&gt;&gt; type(b[1])
-&lt;type 'Noddy'&gt;
-&gt;&gt;&gt; type(b[2])
-&lt;type 'NoneType'&gt;
-&gt;&gt;&gt; type(b[3])
-&lt;type 'Noddy'&gt;
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-    </p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/to_python_indirect.html b/doc/v2/to_python_indirect.html
deleted file mode 100644
index 7871c548..00000000
--- a/doc/v2/to_python_indirect.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/to_python_indirect.hpp&gt;</title>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/to_python_indirect.hpp&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a>
-
-
-      <dt><a href="#classes">Classes</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#to_python_indirect-spec">Class Template <code>to_python_indirect</code></a>
-
-          <dd>
-            <dl class="page-index">
-
-              <dt><a href="#to_python_indirect-spec-synopsis">Class Template
-              <code>to_python_indirect</code> synopsis</a>
-
-              <dt><a href="#to_python_indirect-spec-observers">Class Template
-              <code>to_python_indirect</code> observer functions</a>
-
-              <dt><a href="#to_python_indirect-spec-statics">Class Template
-              <code>to_python_indirect</code> static functions</a>
-            </dl>
-        </dl>
-
-      <dt><a href="#examples">Example</a>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <code>&lt;boost/python/to_python_indirect.hpp&gt;</code> supplies
-    a way to construct new Python objects that hold wrapped C++ class
-    instances via a pointer or smart pointer.
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="to_python_indirect-spec"></a>Class template <code>to_python_indirect</code></h3>
-    <p>Class template <code>to_python_indirect</code> converts objects
-of its first argument type to python as extension class instances, using the ownership policy provided by its 2nd argument.
-
-    <p>
-
-
-    <table border="1" summary="to_python_indirect template parameters">
-      <caption>
-        <b><code>to_python_indirect</code> Requirements</b><br>
-
-        In the table below, <b><code>x</code></b> denotes an object of
-        type <code>T</code>, <b><code>h</code></b> denotes an
-        object of type
-        <code>boost::python::objects::instance_holder*</code>, and
-        <b><code>p</code></b> denotes an object of type
-        <code>U*</code>.
-
-      </caption>
-      <tr>
-        <th>Parameter
-        
-        <th>Requirements
-
-        <th>Description
-
-      <tr>
-        <td><code>T</code> 
-
-        <td>Either <code>U</code>&nbsp;<i>cv</i><code>&amp;</code>
-        (where <i>cv</i> is any optional cv-qualification) or a <a
-        href="Dereferenceable.html">Dereferenceable</a> type such that
-        <code>*x</code> is convertible to <code>U const&amp;</code>, where
-        <code>U</code> is a class type.
-
-        <td>A type deferencing a C++ class exposed to Python using
-        class template <code><a
-        href="class.html#class_-spec">class_</a></code>.
-
-      <tr>
-        <td><code>MakeHolder</code> 
-
-        <td>h = MakeHolder::execute(p);
-
-        <td>A class whose static <code>execute()</code> creates an
-        <code>instance_holder</code>.
-
-    </table>
-
-    Instantiations of <code>to_python_indirect</code> are models of <a
-    href="ResultConverter.html#ResultConverter-concept">ResultConverter</a>.
-
-
-    <h4><a name="to_python_indirect-spec-synopsis"></a>Class template <code>to_python_indirect</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  template &lt;class T, class MakeHolder&gt;
-  struct to_python_indirect
-  {
-     static bool convertible();
-     PyObject* operator()(T ptr_or_reference) const;
-   private:
-     static PyTypeObject* type();
-  };
-}}
-</pre>
-
-    <h4><a name="to_python_indirect-spec-observers"></a>Class template <code>to_python_indirect</code> observers</h4>
-<pre>
-PyObject* operator()(T x) const;
-</pre>
-
-    <dl class="function-semantics">
-
-      <dt><b>Requires:</b> <code>x</code> refers to an object (if it
-      is a pointer type, it is non-null). <code>convertible() ==
-      true</code>.
-
-      <dt><b>Effects:</b> Creates an appropriately-typed Boost.Python
-      extension class instance, uses <code>MakeHolder</code> to create
-      an <code>instance_holder</code> from <code>x</code>, installs
-      the <code>instance_holder</code> in the new extension class
-      instance, and returns a pointer to it.
-
-    </dl>
-
-
-    <h4><a name="to_python_indirect-spec-statics"></a>Class template <code>to_python_indirect</code> statics</h4>
-<pre>
-bool convertible();
-</pre>
-
-      <dt><b>Effects:</b> Returns <code>true</code> iff any module has
-      registered a Python type corresponding to <code>U</code>.
-
-    <h2><a name="examples"></a>Example</h2>
-
-This example replicates the functionality of <a
-href="reference_existing_object.html#reference_existing_object-spec">reference_existing_object</a>,
-but without some of the compile-time error checking.
-
-
-<pre>
-
-struct make_reference_holder
-{
-   typedef boost::python::objects::instance_holder* result_type;
-   template &lt;class T&gt;
-   static result_type execute(T* p)
-   {
-      return new boost::python::objects::pointer_holder&lt;T*, T&gt;(p);
-   }
-};
-
-struct reference_existing_object
-{
-   // metafunction returning the <a href="ResultConverter.html#ResultConverter-concept">ResultConverter</a>
-   template &lt;class T&gt;
-   struct apply
-   {
-      typedef boost::python::to_python_indirect&lt;T,make_reference_holder&gt; type;
-   };
-};
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
diff --git a/doc/v2/to_python_value.html b/doc/v2/to_python_value.html
deleted file mode 100644
index 76446024..00000000
--- a/doc/v2/to_python_value.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/to_python_value.hpp&gt;</title>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277" alt=
-          "C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header
-          &lt;boost/python/to_python_value.hpp&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#classes">Classes</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#to_python_value-spec">Class
-          <code>to_python_value</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#to_python_value-spec-synopsis">Class template
-              <code>to_python_value</code> synopsis</a>
-
-              <dt><a href="#to_python_value-spec-observers">Class template
-              <code>to_python_value</code> observer functions</a>
-            </dl>
-        </dl>
-
-    </dl>
-    <hr>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="to_python_value-spec"></a>Class template
-    <code>to_python_value</code></h3>
-
-    <p><code>to_python_value</code> is a model of <a href=
-    "ResultConverter.html#ResultConverter-concept">ResultConverter</a>
-    which copies its argument into a new Python object.
-
-    <h4><a name="to_python_value-spec-synopsis"></a>Class
-    <code>to_python_value</code> synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-   template &lt;class T&gt;
-   struct to_python_value
-   {
-      typedef typename <a href="../../../type_traits/index.htm#transformations">add_reference</a>&lt;
-         typename <a href="../../../type_traits/index.htm#transformations">add_const</a>&lt;T&gt;::type
-      &gt;::type argument_type;
-
-      static bool convertible();
-      PyObject* operator()(argument_type) const;
-   };
-}}
-</pre>
-
-    <h4><a name="to_python_value-spec-observers"></a>Class
-    <code>to_python_value</code> observers</h4>
-<pre>
-static bool convertible();
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>true</code> iff a converter has been registered which can convert <code>T</code> to python by-value.
-    </dl>
-
-<pre>
-PyObject* operator()(argument_type x) const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Requires:</b> <code>convertible()&nbsp;==&nbsp;true</code>
-      <dt><b>Effects:</b> converts <code>x</code> to python 
-      <dt><b>Returns:</b> the resulting Python object iff a converter for <code>T</code> has been registered, <code>0</code> otherwise.
-    </dl>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p><i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-    Abrahams</a> 2002. All Rights Reserved.</i>
-
diff --git a/doc/v2/tuple.html b/doc/v2/tuple.html
deleted file mode 100644
index 3108cc5f..00000000
--- a/doc/v2/tuple.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Windows (vers 1st August 2002), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/tuple.hpp&gt;</title>
-  </head>
-
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%" summary=
-    "header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width="277"
-          alt="C++ Boost" src="../../../../c++boost.gif" border="0"></a></h3>
-        </td>
-
-        <td valign="top">
-          <h1 align="center"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 align="center">Header &lt;boost/python/tuple.hpp&gt;</h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a></dt>
-
-      <dt><a href="#classes">Classes</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#tuple-spec">Class <code>tuple</code></a></dt>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#tuple-spec-synopsis">Class <code>tuple</code>
-              synopsis</a></dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-
-      <dt><a href="#functions">Functions</a></dt>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#make_tuple-spec"><code>make_tuple</code></a></dt>
-        </dl>
-      </dd>
-
-      <dt><a href="#examples">Example</a></dt>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p>Exposes a <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> for the Python
-    <a href=
-    "http://www.python.org/doc/current/tut/node7.html#SECTION007300000000000000000">
-    tuple</a> type.</p>
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="tuple-spec"></a>Class <code>tuple</code></h3>
-
-    <p>Exposes the interface of Python's built-in <code>tuple</code> type.
-    The semantics of the constructors and member functions defined below can
-    be fully understood by reading the <a href=
-    "ObjectWrapper.html#TypeWrapper-concept">TypeWrapper</a> concept
-    definition. Since <code>tuple</code> is publicly derived from <code><a
-    href="object.html#object-spec">object</a></code>, the public object
-    interface applies to <code>tuple</code> instances as well.</p>
-
-    <h4><a name="tuple-spec-synopsis"></a>Class <code>tuple</code>
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-   class tuple : public object
-   {
-      // tuple() -&gt; an empty tuple
-      tuple();
-
-      // tuple(sequence) -&gt; tuple initialized from sequence's items
-      template &lt;class T&gt;
-      explicit tuple(T const&amp; sequence)
-  };
-}}
-</pre>
-
-    <h2><a name="functions"></a>Functions</h2>
-
-    <h3><a name="make_tuple-spec"></a><code>make_tuple</code></h3>
-<pre>
-namespace boost { namespace python
-{
-  tuple make_tuple();
-
-  template &lt;class A0&gt;
-  tuple make_tuple(A0 const&amp; a0);
-
-  template &lt;class A0, class A1&gt;
-  tuple make_tuple(A0 const&amp; a0, A1 const&amp; a1);
-  ...
-  template &lt;class A0, class A1,...class A<i>n</i>&gt; 
-  tuple make_tuple(A0 const&amp; a0, A1 const&amp; a1,...A<i>n</i> const&amp; a<i>n</i>);
-}}
-</pre>
-    Constructs a new tuple object composed of <code>object(a0),
-    object(a0),...object(a<i>n</i>)</code>. 
-
-    <h2><a name="examples"></a>Example</h2>
-<pre>
-using namespace boost::python;
-tuple head_and_tail(object sequence)
-{
-    return make_tuple(sequence[0],sequence[-1]);
-}
-</pre>
-
-    <p>Revised 03 October, 2002</p>
-
-    <p><i>&copy; Copyright <a href=
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All Rights
-    Reserved.</i></p>
-  </body>
-</html>
-
diff --git a/doc/v2/type_id.html b/doc/v2/type_id.html
deleted file mode 100755
index 62300206..00000000
--- a/doc/v2/type_id.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-    <meta http-equiv="Content-Type" content=
-    "text/html; charset=iso-8859-1">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-
-    <title>Boost.Python - &lt;boost/python/type_id.hpp&gt;</title>
-<style type="text/css">
- p.c4 {font-style: italic}
- span.c3 {color: #ff0000}
- h2.c2 {text-align: center}
- h1.c1 {text-align: center}
-</style>
-
-    <table border="0" cellpadding="7" cellspacing="0" width="100%"
-    summary="header">
-      <tr>
-        <td valign="top" width="300">
-          <h3><a href="../../../../index.htm"><img height="86" width= 
-          "277" alt="C++ Boost" src="../../../../c++boost.gif" border=
-          "0"></a></h3>
-
-        <td valign="top">
-          <h1 class="c1"><a href="../index.html">Boost.Python</a></h1>
-
-          <h2 class="c2">Header &lt;boost/python/type_id.hpp&gt;</h2>
-    </table>
-    <hr>
-
-    <h2>Contents</h2>
-
-    <dl class="page-index">
-      <dt><a href="#introduction">Introduction</a>
-
-      <dt><a href="#classes">Classes</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#type_info-spec">Class
-          <code>type_info</code></a>
-
-          <dd>
-            <dl class="page-index">
-              <dt><a href="#type_info-spec-synopsis">Class
-              <code>type_info</code> synopsis</a>
-
-              <dt><a href="#type_infospec-ctors">Class
-              <code>type_info</code> constructor</a>
-
-              <dt><a href="#type_infospec-comparisons">Class
-              <code>type_info</code> comparison functions</a>
-
-              <dt><a href="#type_infospec-observers">Class
-              <code>type_info</code> observer functions</a>
-            </dl>
-        </dl>
-
-      <dt><a href="#functions">Functions</a>
-
-      <dd>
-        <dl class="page-index">
-          <dt><a href="#type_id-spec">type_id</a>
-        </dl>
-
-      <dt><a href="#examples">Example</a>
-    </dl>
-    <hr>
-
-    <h2><a name="introduction"></a>Introduction</h2>
-
-    <p><code>&lt;boost/python/type_id.hpp&gt;</code> provides types and
-    functions for runtime type identification like those of of
-    <code>&lt;typeinfo&gt;</code>. It exists mostly to work around
-    certain compiler bugs and platform-dependent interactions with
-    shared libraries.
-
-    <h2><a name="classes"></a>Classes</h2>
-
-    <h3><a name="type_info-spec"></a>Class <code>type_info</code></h3>
-
-    <p><code>type_info</code> instances identify a type. As
-    <code>std::type_info</code> is specified to (but unlike its
-    implementation in some compilers),
-    <code>boost::python::type_info</code> never represents top-level
-    references or cv-qualification (see section 5.2.8 in the C++
-    standard). Unlike <code>std::type_info</code>,
-    <code>boost::python::type_info</code> instances are copyable, and
-    comparisons always work reliably across shared library boundaries.
-
-    <h4><a name="type_info-spec-synopsis"></a>Class type_info
-    synopsis</h4>
-<pre>
-namespace boost { namespace python
-{
-  class type_info : <a href= 
-"../../../utility/operators.htm#totally_ordered1">totally_ordered</a>&lt;type_info&gt;
-  {
-   public:
-      // constructor
-      type_info(std::type_info const&amp; = typeid(void));
-
-      // comparisons
-      bool operator&lt;(type_info const&amp; rhs) const;
-      bool operator==(type_info const&amp; rhs) const;
-
-      // observers
-      char const* name() const;
-  };
-}}
-</pre>
-
-    <h4><a name="type_infospec-ctors">Class <code>type_info</code>
-    constructor</a></h4>
-<pre>
-type_info(std::type_info const&amp; = typeid(void));
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> constructs a <code>type_info</code> object
-      which identifies the same type as its argument.
-
-      <dt><b>Rationale:</b> Since it is occasionally neccessary to make
-      an array of <code>type_info</code> objects a benign default
-      argument is supplied. <span class="c3"><b>Note:</b></span> this
-      constructor does <i>not</i> correct for non-conformance of
-      compiler <code>typeid()</code> implementations. See <code><a
-      href="#type_id-spec">type_id</a></code>, below.
-    </dl>
-
-    <h4><a name="type_infospec-comparisons">Class
-    <code>type_info</code> comparisons</a></h4>
-<pre>
-bool operator&lt;(type_info const&amp; rhs) const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> yields a total order over
-      <code>type_info</code> objects.
-    </dl>
-<pre>
-bool operator==(type_info const&amp; rhs) const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>true</code> iff the two values describe
-      the same type.
-    </dl>
-
-    <dl class="function-semantics">
-      <dt><b>Note:</b> The use of <code><a href= 
-      "../../../utility/operators.htm#totally_ordered1">totally_ordered</a>&lt;type_info&gt;</code>
-      as a private base class supplies operators <code>&lt;=</code>,
-      <code>&gt;=</code>, <code>&gt;</code>, and <code>!=</code>
-    </dl>
-
-    <h4><a name="type_infospec-observers">Class <code>type_info</code>
-    observers</a></h4>
-<pre>
-char const* name() const;
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> The result of calling <code>name()</code> on
-      the argument used to construct the object.
-    </dl>
-
-    <h2><a name="functions"></a>Functions</h2>
-<pre>
-std::ostream&amp; operator&lt;&lt;(std::ostream&amp;s, type_info const&amp;x);
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Effects:</b> Writes a description of the type described by
-      to <code>x</code> into <code>s</code>.
-
-      <dt><b>Rationale:</b> Not every C++ implementation provides a
-      truly human-readable <code>type_info::name()</code> string, but
-      for some we may be able to decode the string and produce a
-      reasonable representation.
-    </dl>
-<pre>
-<a name="type_id-spec">template &lt;class T&gt; type_info type_id</a>()
-</pre>
-
-    <dl class="function-semantics">
-      <dt><b>Returns:</b> <code>type_info(typeid(T))</code>
-
-      <dt><b>Note:</b> On some non-conforming C++ implementations, the
-      code is not actually as simple as described above; the semantics
-      are adjusted to work <i>as-if</i> the C++ implementation were
-      conforming.
-    </dl>
-
-    <h2><a name="examples"></a>Example</h2>
-    The following example, though silly, illustrates how the
-    <code>type_id</code> facility might be used 
-<pre>
-#include &lt;boost/python/type_id.hpp&gt;
-
-// Returns true iff the user passes an int argument
-template &lt;class T&gt;
-bool is_int(T x)
-{
-   using boost::python::type_id;
-   return type_id&lt;T&gt;() == type_id&lt;int&gt;();
-}
-</pre>
-
-    <p>Revised 
-    <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-  13 November, 2002
-  <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-
-
-    <p class="c4">&copy; Copyright <a href= 
-    "../../../../people/dave_abrahams.htm">Dave Abrahams</a> 2002. All
-    Rights Reserved.
-
diff --git a/doc/v2/with_custodian_and_ward.html b/doc/v2/with_custodian_and_ward.html
deleted file mode 100644
index e6fc15df..00000000
--- a/doc/v2/with_custodian_and_ward.html
+++ /dev/null
@@ -1,367 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <meta name="generator" content=
-    "HTML Tidy for Cygwin (vers 1st February 2003), see www.w3.org">
-    <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-    <link rel="stylesheet" type="text/css" href="../boost.css">
-    <title>
-      Boost.Python - &lt;boost/python/with_custodian_and_ward.hpp&gt;
-    </title>
-  </head>
-  <body>
-    <table border="0" cellpadding="7" cellspacing="0" width="100%"
-           summary="header">
-      <tr>
-        <td valign="top" width="300">
-          <h3>
-            <a href="../../../../index.htm"><img height="86" width="277"
-                 alt="C++ Boost" src="../../../../c++boost.gif" border="0">
-                 </a>
-          </h3>
-        </td>
-        <td valign="top">
-          <h1 align="center">
-            <a href="../index.html">Boost.Python</a>
-          </h1>
-          <h2 align="center">
-            Header &lt;boost/python/with_custodian_and_ward.hpp&gt;
-          </h2>
-        </td>
-      </tr>
-    </table>
-    <hr>
-    <h2>
-      Contents
-    </h2>
-    <dl class="page-index">
-      <dt>
-        <a href="#introduction">Introduction</a>
-      </dt>
-      <dt>
-        <a href="#classes">Classes</a>
-      </dt>
-      <dd>
-        <dl class="page-index">
-          <dt>
-            <a href="#with_custodian_and_ward-spec">Class Template
-            <code>with_custodian_and_ward</code></a>
-          </dt>
-          <dd>
-            <dl class="page-index">
-              <dt>
-                <a href="#with_custodian_and_ward-spec-synopsis">Class
-                Template <code>with_custodian_and_ward</code> synopsis</a>
-              </dt>
-              <dt>
-                <a href="#with_custodian_and_ward-spec-statics">Class
-                <code>with_custodian_and_ward</code> static functions</a>
-              </dt>
-            </dl>
-          </dd>
-          <dt>
-            <a href="#with_custodian_and_ward_postcall-spec">Class Template
-            <code>with_custodian_and_ward_postcall</code></a>
-          </dt>
-          <dd>
-            <dl class="page-index">
-              <dt>
-                <a href=
-                "#with_custodian_and_ward_postcall-spec-synopsis">Class
-                Template <code>with_custodian_and_ward_postcall</code>
-                synopsis</a>
-              </dt>
-              <dt>
-                <a href=
-                "#with_custodian_and_ward_postcall-spec-statics">Class
-                <code>with_custodian_and_ward_postcall</code> static
-                functions</a>
-              </dt>
-            </dl>
-          </dd>
-        </dl>
-      </dd>
-      <dt>
-        <a href="#examples">Example</a>
-      </dt>
-    </dl>
-    <hr>
-    <h2>
-      <a name="introduction">Introduction</a>
-    </h2>This header provides faciliites for establishing a lifetime
-    dependency between two of a function's Python argument or result objects.
-    The <i>ward</i> object will not be destroyed until after the custodian as
-    long as the <i>custodian</i> object supports <a href=
-    "http://www.python.org/doc/current/lib/module-weakref.html">weak
-    references</a> (Boost.Python extension classes all support weak
-    references). If the <i>custodian</i> object does not support weak
-    references and is not <code>None</code>, an appropriate exception will be
-    thrown. The two class templates <code>with_custodian_and_ward</code> and
-    <code>with_custodian_and_ward_postcall</code> differ in the point at
-    which they take effect. 
-    <p>
-      In order to reduce the chance of inadvertently creating dangling
-      pointers, the default is to do lifetime binding <i>before</i> the
-      underlying C++ object is invoked. However, before invocation the result
-      object is not available, so
-      <code>with_custodian_and_ward_postcall</code> is provided to bind
-      lifetimes after invocation. Also, if a C++ exception is thrown after
-      <code>with_custodian_and_ward&lt;&gt;::precall</code> but before the
-      underlying C++ object actually stores a pointer, the lifetime of the
-      custodian and ward objects will be artificially bound together, so one
-      might choose <code>with_custodian_and_ward_postcall</code> instead,
-      depending on the semantics of the function being wrapped.
-    </p>
-    <p>
-      Please note that this is <i>not</i> the appropriate tool to use when
-      wrapping functions which <b>transfer ownership</b> of a raw pointer
-      across the function-call boundary. Please see the <a href=
-      "faq.html#ownership">FAQ</a> if you want to do that.
-    </p>
-    <h2>
-      <a name="classes"></a>Classes
-    </h2>
-    <h3>
-      <a name="with_custodian_and_ward-spec"></a>Class template
-      <code>with_custodian_and_ward</code>
-    </h3>
-    <table border="1" summary="with_custodian_and_ward template parameters">
-      <caption>
-        <b><code>with_custodian_and_ward</code> template parameters</b>
-      </caption>
-      <tr>
-        <th>
-          Parameter
-        </th>
-        <th>
-          Requirements
-        </th>
-        <th>
-          Description
-        </th>
-        <th>
-          Default
-        </th>
-      </tr>
-      <tr>
-        <td>
-          <code>custodian</code>
-        </td>
-        <td>
-          A positive compile-time constant of type <code>std::size_t</code>.
-        </td>
-        <td>
-          The 1-based index of the parameter which is the dependency in the
-          lifetime relationship to be established. If used to wrap a member
-          function, parameter 1 is the target object (<code>*this</code>).
-          Note that if the target Python object type doesn't support weak
-          references, a Python <code>TypeError</code> exception will be
-          raised when the C++ object being wrapped is called.
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <code>ward</code>
-        </td>
-        <td>
-          A positive compile-time constant of type <code>std::size_t</code>.
-        </td>
-        <td>
-          The 1-based index of the parameter which is the dependent in the
-          lifetime relationship to be established. If used to wrap a member
-          function, parameter 1 is the target object (<code>*this</code>).
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <code>Base</code>
-        </td>
-        <td>
-          A model of <a href="CallPolicies.html">CallPolicies</a>
-        </td>
-        <td>
-          Used for <a href="CallPolicies.html#composition">policy
-          composition</a>.
-        </td>
-        <td>
-          <code><a href=
-          "default_call_policies.html#default_call_policies-spec">default_call_policies</a></code>
-        </td>
-      </tr>
-    </table>
-    <h4>
-      <a name="with_custodian_and_ward-spec-synopsis"></a>Class template
-      <code>with_custodian_and_ward</code> synopsis
-    </h4>
-    <pre>
-namespace boost { namespace python
-{
-   template &lt;std::size_t custodian, std::size_t ward, class Base = default_call_policies&gt;
-   struct with_custodian_and_ward : Base
-   {
-      static bool precall(PyObject* args);
-   };
-}}
-</pre>
-    <h4>
-      <a name="with_custodian_and_ward-spec-statics"></a>Class
-      <code>with_custodian_and_ward</code> static functions
-    </h4>
-    <pre>
-bool precall(PyObject* args);
-</pre>
-    <dl class="function-semantics">
-      <dt>
-        <b>Requires:</b> <code><a href=
-        "http://www.python.org/doc/2.2/api/tupleObjects.html#l2h-476">PyTuple_Check</a>(args)
-        != 0</code>
-      </dt>
-      <dt>
-        <b>Effects:</b> Makes the lifetime of the argument indicated by
-        <code>ward</code> dependent on the lifetime of the argument indicated
-        by <code>custodian</code>.
-      </dt>
-      <dt>
-        <b>Returns:</b> <code>false</code> and <code><a href=
-        "http://www.python.org/doc/2.2/api/exceptionHandling.html#l2h-71">PyErr_Occurred</a>()&nbsp;!=&nbsp;0</code>
-        upon failure, <code>true</code> otherwise.
-      </dt>
-    </dl><!-- xxxxxx -->
-    <h3>
-      <a name="with_custodian_and_ward_postcall-spec"></a>Class template
-      <code>with_custodian_and_ward_postcall</code>
-    </h3>
-    <table border="1" summary=
-    "with_custodian_and_ward_postcall template parameters">
-      <caption>
-        <b><code>with_custodian_and_ward_postcall</code> template
-        parameters</b>
-      </caption>
-      <tr>
-        <th>
-          Parameter
-        </th>
-        <th>
-          Requirements
-        </th>
-        <th>
-          Description
-        </th>
-        <th>
-          Default
-        </th>
-      </tr>
-      <tr>
-        <td>
-          <code>custodian</code>
-        </td>
-        <td>
-          A compile-time constant of type <code>std::size_t</code>.
-        </td>
-        <td>
-          The index of the parameter which is the dependency in the lifetime
-          relationship to be established. Zero indicates the result object; 1
-          indicates the first argument. If used to wrap a member function,
-          parameter 1 is the target object (<code>*this</code>). Note that if
-          the target Python object type doesn't support weak references, a
-          Python <code>TypeError</code> exception will be raised when the C++
-          object being wrapped is called.
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <code>ward</code>
-        </td>
-        <td>
-          A compile-time constant of type <code>std::size_t</code>.
-        </td>
-        <td>
-          The index of the parameter which is the dependent in the lifetime
-          relationship to be established. Zero indicates the result object; 1
-          indicates the first argument. If used to wrap a member function,
-          parameter 1 is the target object (<code>*this</code>).
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <code>Base</code>
-        </td>
-        <td>
-          A model of <a href="CallPolicies.html">CallPolicies</a>
-        </td>
-        <td>
-          Used for <a href="CallPolicies.html#composition">policy
-          composition</a>.
-        </td>
-        <td>
-          <code><a href=
-          "default_call_policies.html#default_call_policies-spec">default_call_policies</a></code>
-        </td>
-      </tr>
-    </table>
-    <h4>
-      <a name="with_custodian_and_ward_postcall-spec-synopsis"></a>Class
-      template <code>with_custodian_and_ward_postcall</code> synopsis
-    </h4>
-    <pre>
-namespace boost { namespace python
-{
-   template &lt;std::size_t custodian, std::size_t ward, class Base = default_call_policies&gt;
-   struct with_custodian_and_ward_postcall : Base
-   {
-      static PyObject* postcall(PyObject* args, PyObject* result);
-   };
-}}
-</pre>
-    <h4>
-      <a name="with_custodian_and_ward_postcall-spec-statics"></a>Class
-      <code>with_custodian_and_ward_postcall</code> static functions
-    </h4>
-    <pre>
-PyObject* postcall(PyObject* args, PyObject* result);
-</pre>
-    <dl class="function-semantics">
-      <dt>
-        <b>Requires:</b> <code><a href=
-        "http://www.python.org/doc/2.2/api/tupleObjects.html#l2h-476">PyTuple_Check</a>(args)
-        != 0</code>, <code>result&nbsp;!=&nbsp;0</code>.
-      </dt>
-      <dt>
-        <b>Effects:</b> Makes the lifetime of the object indicated by
-        <code>ward</code> dependent on the lifetime of the object indicated
-        by <code>custodian</code>.
-      </dt>
-      <dt>
-        <b>Returns:</b> <code>0</code> and <code><a href=
-        "http://www.python.org/doc/2.2/api/exceptionHandling.html#l2h-71">PyErr_Occurred</a>()&nbsp;!=&nbsp;0</code>
-        upon failure, <code>true</code> otherwise.
-      </dt>
-    </dl>
-    <h2>
-      <a name="examples"></a>Example
-    </h2>The following example shows how
-    <code>with_custodian_and_ward_postcall</code> is used by the library to
-    implement <code><a href=
-    "return_internal_reference.html#return_internal_reference-spec">return_internal_reference</a></code>
-    
-    <pre>
-template &lt;std::size_t owner_arg = 1, class Base = default_call_policies&gt;
-struct return_internal_reference
-    : with_custodian_and_ward_postcall&lt;0, owner_arg, Base&gt;
-{
-   typedef <a href=
-"reference_existing_object.html#reference_existing_object-spec">reference_existing_object</a> result_converter;
-};
-</pre>
-    <p>
-      Revised 
-      <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->
-       13 November, 2002 
-      <!--webbot bot="Timestamp" endspan i-checksum="39359" -->
-      </p>
-    <p>
-      <i>&copy; Copyright <a href="../../../../people/dave_abrahams.htm">Dave
-      Abrahams</a> 2002. All Rights Reserved.</i>
-    </p>
-  </body>
-</html>
diff --git a/example/Attic/project.zip b/example/Attic/project.zip
deleted file mode 100644
index d863defd..00000000
Binary files a/example/Attic/project.zip and /dev/null differ
diff --git a/example/Jamfile b/example/Jamfile
deleted file mode 100644
index 2f607f0d..00000000
--- a/example/Jamfile
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright David Abrahams 2003. See accompanying LICENSE for terms
-# and conditions of use.
-
-# This is the top of our own project tree
-project-root ;
-
-# Declares the following targets:
-#    
-#  1. an extension module called "getting_started1", which is
-#     built from "getting_started1.cpp". Built by default
-#
-#  2. A test target called my-test.test which runs
-#     test_getting_started1.py with the extension module above. Built
-#     when out-of date, but only if invoked by name or if the global
-#     "test" target is invoked.
-#
-#  3. A test target called my-test.run wihch runs the above test
-#     unconditionally. Built only when invoked by name.
-#
-# To see verbose test output, add "-sPYTHON_TEST_ARGS=-v" to the bjam
-# command-line before the first target.
-#
-
-# Include definitions needed for Python modules
-import python ;
-
-# ----- getting_started1 -------
-
-# Declare a Python extension called getting_started1
-extension getting_started1
-: # sources
-  getting_started1.cpp
-  
-  # requirements and dependencies for Boost.Python extensions
-  <template>@boost/libs/python/build/extension
-  ;
-
-# Declare a test for the extension module
-boost-python-runtest test1
-    :  # Python test driver
-    test_getting_started1.py
-    # extension modules to use
-    <pyd>getting_started1 ;
-    
-
-    
-# ----- getting_started2 -------
-    
-# Declare a Python extension called getting_started2
-extension getting_started2
-:  # sources
-   getting_started2.cpp
-  
-  # requirements and dependencies for Boost.Python extensions
-  <template>@boost/libs/python/build/extension
-  ;
-
-# Declare a test for the extension module
-boost-python-runtest test2
-    :  # Python test driver
-    test_getting_started2.py
-    # extension modules to use
-    <pyd>getting_started2 ;    
\ No newline at end of file
diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
deleted file mode 100644
index fcd6618b..00000000
--- a/example/Jamfile.v2
+++ /dev/null
@@ -1,10 +0,0 @@
-
-use-project /boost/python : ../build ;
-
-project
-    : requirements <library>/boost/python//boost_python
-    ;
-
-python-extension getting_started1 : getting_started1.cpp : <link>shared ;
-python-extension getting_started2 : getting_started2.cpp : <link>shared ;
-
diff --git a/example/Jamrules b/example/Jamrules
deleted file mode 100755
index 9819a6e3..00000000
--- a/example/Jamrules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright David Abrahams 2003. See accompanying LICENSE for terms
-# and conditions of use.
-
-# Edit this path to point at the root directory of your Boost
-# installation.  Absolute paths work, too.
-path-global BOOST_ROOT : ../../.. ;
-project boost : $(BOOST_ROOT) ;
diff --git a/example/README b/example/README
deleted file mode 100644
index ab22de54..00000000
--- a/example/README
+++ /dev/null
@@ -1,6 +0,0 @@
-To get started with the Boost Python Library, use the examples
-getting_started1.cpp and getting_started2.cpp.
-
-    bjam -sTOOLS=your-toolset test
-
-in this directory will build and run the examples.
diff --git a/example/boost-build.jam b/example/boost-build.jam
deleted file mode 100755
index 132f6cc9..00000000
--- a/example/boost-build.jam
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright David Abrahams 2003. See accompanying LICENSE for terms
-# and conditions of use.
-
-# Edit this path to point at the tools/build subdirectory of your
-# Boost installation.  Absolute paths work, too.
-boost-build ../../../tools/build ;
diff --git a/example/getting_started1.cpp b/example/getting_started1.cpp
deleted file mode 100644
index bdb79edc..00000000
--- a/example/getting_started1.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Example by Ralf W. Grosse-Kunstleve
-
-#include <string>
-
-namespace { // Avoid cluttering the global namespace.
-
-  // A couple of simple C++ functions that we want to expose to Python.
-  std::string greet() { return "hello, world"; }
-  int square(int number) { return number * number; }
-}
-
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-namespace python = boost::python;
-
-// Python requires an exported function called init<module-name> in every
-// extension module. This is where we build the module contents.
-BOOST_PYTHON_MODULE(getting_started1)
-{
-    // Add regular functions to the module.
-    python::def("greet", greet);
-    python::def("square", square);
-}
diff --git a/example/getting_started2.cpp b/example/getting_started2.cpp
deleted file mode 100644
index bec7447e..00000000
--- a/example/getting_started2.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Example by Ralf W. Grosse-Kunstleve
-
-#include <iostream>
-#include <string>
-
-namespace { // Avoid cluttering the global namespace.
-
-  // A friendly class.
-  class hello
-  {
-    public:
-      hello(const std::string& country) { this->country = country; }
-      std::string greet() const { return "Hello from " + country; }
-    private:
-      std::string country;
-  };
-
-  // A function taking a hello object as an argument.
-  std::string invite(const hello& w) {
-    return w.greet() + "! Please come soon!";
-  }
-}
-
-#include <boost/python/class.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-
-BOOST_PYTHON_MODULE(getting_started2)
-{
-    using namespace boost::python;
-    class_<hello>("hello", init<std::string>())
-        // Add a regular member function.
-        .def("greet", &hello::greet)
-        // Add invite() as a member of hello!
-        .def("invite", invite)
-        ;
-    
-    // Also add invite() as a regular function to the module.
-    def("invite", invite);
-}
diff --git a/example/project.zip b/example/project.zip
deleted file mode 100644
index d863defd..00000000
Binary files a/example/project.zip and /dev/null differ
diff --git a/example/test_getting_started1.py b/example/test_getting_started1.py
deleted file mode 100644
index cd8fb59e..00000000
--- a/example/test_getting_started1.py
+++ /dev/null
@@ -1,18 +0,0 @@
-r'''>>> import getting_started1
-    >>> print getting_started1.greet()
-    hello, world
-    >>> number = 11
-    >>> print number, '*', number, '=', getting_started1.square(number)
-    11 * 11 = 121
-'''
-
-def run(args = None):
-    if args is not None:
-        import sys
-        sys.argv = args
-    import doctest, test_getting_started1
-    return doctest.testmod(test_getting_started1)
-
-if __name__ == '__main__':
-    import sys
-    sys.exit(run()[0])
diff --git a/example/test_getting_started2.py b/example/test_getting_started2.py
deleted file mode 100644
index ccfaa4f1..00000000
--- a/example/test_getting_started2.py
+++ /dev/null
@@ -1,31 +0,0 @@
-r'''>>> from getting_started2 import *
-    >>> hi = hello('California')
-    >>> hi.greet()
-    'Hello from California'
-    >>> invite(hi)
-    'Hello from California! Please come soon!'
-    >>> hi.invite()
-    'Hello from California! Please come soon!'
-
-    >>> class wordy(hello):
-    ...     def greet(self):
-    ...         return hello.greet(self) + ', where the weather is fine'
-    ...
-    >>> hi2 = wordy('Florida')
-    >>> hi2.greet()
-    'Hello from Florida, where the weather is fine'
-    >>> invite(hi2)
-    'Hello from Florida! Please come soon!'
-'''
-
-def run(args = None):
-    if args is not None:
-        import sys
-        sys.argv = args
-    import doctest, test_getting_started2
-    return doctest.testmod(test_getting_started2)
-
-if __name__ == '__main__':
-    import sys
-    sys.exit(run()[0])
-
diff --git a/example/tutorial/Jamfile b/example/tutorial/Jamfile
deleted file mode 100644
index ff1f8668..00000000
--- a/example/tutorial/Jamfile
+++ /dev/null
@@ -1,14 +0,0 @@
-#   Hello World Example from the tutorial
-#   [Joel de Guzman 10/9/2002]
-
-#   Specify our location in the boost project hierarchy
-subproject libs/python/example/tutorial ;
-
-#   Include definitions needed for Python modules
-import python ;
-
-extension hello                     # Declare a Python extension called hello
-:   hello.cpp                       # source
-    <dll>../../build/boost_python   # dependencies
-    ;
-
diff --git a/example/tutorial/hello.cpp b/example/tutorial/hello.cpp
deleted file mode 100644
index 01ed60c3..00000000
--- a/example/tutorial/hello.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-//  Hello World Example from the tutorial
-//  [Joel de Guzman 10/9/2002]
-
-char const* greet()
-{
-   return "hello, world";
-}
-
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-using namespace boost::python;
-
-BOOST_PYTHON_MODULE(hello)
-{
-    def("greet", greet);
-}
-
diff --git a/include/boost/python.hpp b/include/boost/python.hpp
deleted file mode 100644
index dba4c831..00000000
--- a/include/boost/python.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-//  See http://www.boost.org/libs/python for documentation.
-
-#ifndef PYTHON_DWA2002810_HPP
-# define PYTHON_DWA2002810_HPP
-
-# include <boost/python/args.hpp>
-# include <boost/python/args_fwd.hpp>
-# include <boost/python/back_reference.hpp>
-# include <boost/python/bases.hpp>
-# include <boost/python/borrowed.hpp>
-# include <boost/python/call.hpp>
-# include <boost/python/call_method.hpp>
-# include <boost/python/class.hpp>
-# include <boost/python/copy_const_reference.hpp>
-# include <boost/python/copy_non_const_reference.hpp>
-# include <boost/python/data_members.hpp>
-# include <boost/python/def.hpp>
-# include <boost/python/default_call_policies.hpp>
-# include <boost/python/dict.hpp>
-# include <boost/python/enum.hpp>
-# include <boost/python/errors.hpp>
-# include <boost/python/exception_translator.hpp>
-# include <boost/python/extract.hpp>
-# include <boost/python/handle.hpp>
-# include <boost/python/has_back_reference.hpp>
-# include <boost/python/implicit.hpp>
-# include <boost/python/init.hpp>
-# include <boost/python/instance_holder.hpp>
-# include <boost/python/iterator.hpp>
-# include <boost/python/list.hpp>
-# include <boost/python/long.hpp>
-# include <boost/python/lvalue_from_pytype.hpp>
-# include <boost/python/make_function.hpp>
-# include <boost/python/manage_new_object.hpp>
-# include <boost/python/module.hpp>
-# include <boost/python/numeric.hpp>
-# include <boost/python/object.hpp>
-# include <boost/python/object_protocol.hpp>
-# include <boost/python/object_protocol_core.hpp>
-# include <boost/python/opaque_pointer_converter.hpp>
-# include <boost/python/operators.hpp>
-# include <boost/python/other.hpp>
-# include <boost/python/overloads.hpp>
-# include <boost/python/pointee.hpp>
-# include <boost/python/pure_virtual.hpp>
-# include <boost/python/ptr.hpp>
-# include <boost/python/reference_existing_object.hpp>
-# include <boost/python/register_ptr_to_python.hpp>
-# include <boost/python/return_arg.hpp>
-# include <boost/python/return_internal_reference.hpp>
-# include <boost/python/return_opaque_pointer.hpp>
-# include <boost/python/return_value_policy.hpp>
-# include <boost/python/scope.hpp>
-# include <boost/python/self.hpp>
-# include <boost/python/slice_nil.hpp>
-# include <boost/python/str.hpp>
-# include <boost/python/to_python_converter.hpp>
-# include <boost/python/to_python_indirect.hpp>
-# include <boost/python/to_python_value.hpp>
-# include <boost/python/tuple.hpp>
-# include <boost/python/type_id.hpp>
-# include <boost/python/with_custodian_and_ward.hpp>
-
-#endif // PYTHON_DWA2002810_HPP
diff --git a/include/boost/python/arg_from_python.hpp b/include/boost/python/arg_from_python.hpp
deleted file mode 100755
index b2b40af3..00000000
--- a/include/boost/python/arg_from_python.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ARG_FROM_PYTHON_DWA2002128_HPP
-# define ARG_FROM_PYTHON_DWA2002128_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/converter/arg_from_python.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-
-namespace boost { namespace python { 
-
-template <class T>
-struct arg_from_python
-    : converter::select_arg_from_python<T>::type
-{
-    typedef typename converter::select_arg_from_python<T>::type base;
-    arg_from_python(PyObject*);
-};
-
-// specialization for PyObject*
-template <>
-struct arg_from_python<PyObject*>
-{
-    typedef PyObject* result_type;
-    
-    arg_from_python(PyObject* p) : m_source(p) {}
-    bool convertible() const { return true; }
-    PyObject* operator()() const { return m_source; }
- private:
-    PyObject* m_source;
-};
-
-template <>
-struct arg_from_python<PyObject* const&>
-{
-    typedef PyObject* const& result_type;
-    
-    arg_from_python(PyObject* p) : m_source(p) {}
-    bool convertible() const { return true; }
-    PyObject*const& operator()() const { return m_source; }
- private:
-    PyObject* m_source;
-};
-
-//
-// implementations
-//
-template <class T>
-inline arg_from_python<T>::arg_from_python(PyObject* source)
-    : base(source)
-{
-}
-
-}} // namespace boost::python
-
-#endif // ARG_FROM_PYTHON_DWA2002128_HPP
diff --git a/include/boost/python/args.hpp b/include/boost/python/args.hpp
deleted file mode 100644
index aed14276..00000000
--- a/include/boost/python/args.hpp
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef KEYWORDS_DWA2002323_HPP
-# define KEYWORDS_DWA2002323_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/args_fwd.hpp>
-# include <boost/config.hpp>
-# include <boost/python/detail/preprocessor.hpp>
-# include <boost/python/detail/type_list.hpp>
-
-# include <boost/type_traits/is_reference.hpp>
-# include <boost/type_traits/remove_reference.hpp>
-# include <boost/type_traits/remove_cv.hpp>
-
-# include <boost/preprocessor/enum_params.hpp>
-# include <boost/preprocessor/repeat.hpp>
-# include <boost/preprocessor/facilities/intercept.hpp>
-# include <boost/preprocessor/iteration/local.hpp>
-
-# include <boost/python/detail/mpl_lambda.hpp>
-# include <boost/python/object_core.hpp>
-
-# include <boost/mpl/bool.hpp>
-
-# include <cstddef>
-# include <algorithm>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  template <std::size_t nkeywords>
-  struct keywords
-  {
-      BOOST_STATIC_CONSTANT(std::size_t, size = nkeywords);
-      
-      keyword_range range() const
-      {
-          return keyword_range(elements, elements + nkeywords);
-      }
-
-      keywords<nkeywords+1> operator,(const keywords<1> &k) const
-      {
-          python::detail::keywords<size+1> res;
-          std::copy(elements, elements+size, res.elements);
-          res.elements[size] = k.elements[0];
-          return res;
-      }
-      
-      keywords<nkeywords+1> operator,(const char *name) const;
-      
-      keyword elements[nkeywords];
-  };
-
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-  template<typename T>
-  struct is_keywords
-  {
-      BOOST_STATIC_CONSTANT(bool, value = false); 
-  };
-
-  template<std::size_t nkeywords>
-  struct is_keywords<keywords<nkeywords> >
-  {
-      BOOST_STATIC_CONSTANT(bool, value = true);
-  };
-  template <class T>
-  struct is_reference_to_keywords
-  {
-      BOOST_STATIC_CONSTANT(bool, is_ref = is_reference<T>::value);
-      typedef typename remove_reference<T>::type deref;
-      typedef typename remove_cv<deref>::type key_t;
-      BOOST_STATIC_CONSTANT(bool, is_key = is_keywords<key_t>::value);
-      BOOST_STATIC_CONSTANT(bool, value = (is_ref & is_key));
-      
-      typedef mpl::bool_<value> type;
-      BOOST_PYTHON_MPL_LAMBDA_SUPPORT(1,is_reference_to_keywords,(T))
-  };
-# else 
-  typedef char (&yes_keywords_t)[1];
-  typedef char (&no_keywords_t)[2];
-      
-  no_keywords_t is_keywords_test(...);
-
-  template<std::size_t nkeywords>
-  yes_keywords_t is_keywords_test(void (*)(keywords<nkeywords>&));
-
-  template<std::size_t nkeywords>
-  yes_keywords_t is_keywords_test(void (*)(keywords<nkeywords> const&));
-
-  template<typename T>
-  class is_reference_to_keywords
-  {
-   public:
-      BOOST_STATIC_CONSTANT(
-          bool, value = (
-              sizeof(detail::is_keywords_test( (void (*)(T))0 ))
-              == sizeof(detail::yes_keywords_t)));
-
-      typedef mpl::bool_<value> type;
-      BOOST_PYTHON_MPL_LAMBDA_SUPPORT(1,is_reference_to_keywords,(T))
-  };
-# endif 
-}
-
-#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730
-class old_edg_workaround_for_arg { friend class arg; };
-#endif
-
-struct arg : detail::keywords<1>
-{
-    explicit arg(char const *name)
-    {
-        elements[0].name = name;
-    }
-    
-    template <class T>
-    arg& operator=(T const& value)
-    {
-        object z(value);
-        elements[0].default_value = handle<>(python::borrowed(object(value).ptr()));
-        return *this;
-    }
-    
-    operator detail::keyword const&() const
-    {
-        return elements[0];
-    }
-};
-
-namespace detail
-{
-  template <std::size_t nkeywords>
-  inline keywords<nkeywords + 1>
-  keywords<nkeywords>::operator,(const char *name) const
-  {
-      return this->operator,(arg(name));
-  }
-}
-
-#  define BOOST_PYTHON_ASSIGN_NAME(z, n, _) result.elements[n].name = name##n;
-#  define BOOST_PP_LOCAL_MACRO(n)                                               \
-inline detail::keywords<n> args(BOOST_PP_ENUM_PARAMS_Z(1, n, char const* name)) \
-{                                                                               \
-    detail::keywords<n> result;                                                 \
-    BOOST_PP_REPEAT_1(n, BOOST_PYTHON_ASSIGN_NAME, _)                           \
-    return result;                                                              \
-}
-#  define BOOST_PP_LOCAL_LIMITS (1, BOOST_PYTHON_MAX_ARITY)
-#  include BOOST_PP_LOCAL_ITERATE()
-
-}} // namespace boost::python
-
-
-# endif // KEYWORDS_DWA2002323_HPP
diff --git a/include/boost/python/args_fwd.hpp b/include/boost/python/args_fwd.hpp
deleted file mode 100644
index f45592ad..00000000
--- a/include/boost/python/args_fwd.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ARGS_FWD_DWA2002927_HPP
-# define ARGS_FWD_DWA2002927_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/handle.hpp>
-# include <boost/config.hpp>
-# include <cstddef>
-# include <utility>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  struct keyword
-  {
-      keyword(char const* name_=0)
-       : name(name_)
-      {}
-      
-      char const* name;
-      handle<> default_value;
-  };
-  
-  template <std::size_t nkeywords = 0> struct keywords;
-  
-  typedef std::pair<keyword const*, keyword const*> keyword_range;
-  
-  template <>
-  struct keywords<0>
-  {
-      BOOST_STATIC_CONSTANT(std::size_t, size = 0);
-      static keyword_range range() { return keyword_range(); }
-  };
-
-  namespace error
-  {
-    template <int keywords, int function_args>
-    struct more_keywords_than_function_arguments
-    {
-        typedef char too_many_keywords[keywords > function_args ? -1 : 1];
-    };
-  }
-}
-
-}} // namespace boost::python
-
-#endif // ARGS_FWD_DWA2002927_HPP
diff --git a/include/boost/python/back_reference.hpp b/include/boost/python/back_reference.hpp
deleted file mode 100644
index 65ea67d5..00000000
--- a/include/boost/python/back_reference.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef BACK_REFERENCE_DWA2002510_HPP
-# define BACK_REFERENCE_DWA2002510_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/object_fwd.hpp>
-# include <boost/python/detail/dependent.hpp>
-# include <boost/python/detail/raw_pyobject.hpp>
-
-namespace boost { namespace python { 
-
-template <class T>
-struct back_reference
-{
- private: // types
-    typedef typename detail::dependent<object,T>::type source_t;
- public:
-    typedef T type;
-    
-    back_reference(PyObject*, T);
-    source_t const& source() const;
-    T get() const;
- private:
-    source_t m_source;
-    T m_value;
-};
-
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-template<typename T>
-class is_back_reference
-{
- public:
-    BOOST_STATIC_CONSTANT(bool, value = false); 
-};
-
-template<typename T>
-class is_back_reference<back_reference<T> >
-{
- public:
-    BOOST_STATIC_CONSTANT(bool, value = true);
-};
-
-# else // no partial specialization
-
-}} // namespace boost::python
-
-#include <boost/type.hpp>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  typedef char (&yes_back_reference_t)[1];
-  typedef char (&no_back_reference_t)[2];
-      
-  no_back_reference_t is_back_reference_test(...);
-
-  template<typename T>
-  yes_back_reference_t is_back_reference_test(boost::type< back_reference<T> >);
-}
-
-template<typename T>
-class is_back_reference
-{
- public:
-    BOOST_STATIC_CONSTANT(
-        bool, value = (
-            sizeof(detail::is_back_reference_test(boost::type<T>()))
-            == sizeof(detail::yes_back_reference_t)));
-};
-
-# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-
-//
-// implementations
-//
-template <class T>
-back_reference<T>::back_reference(PyObject* p, T x)
-    : m_source(detail::borrowed_reference(p))
-      , m_value(x)
-{
-}
-
-template <class T>
-typename back_reference<T>::source_t const& back_reference<T>::source() const
-{
-    return m_source;
-}
-
-template <class T>
-T back_reference<T>::get() const
-{
-    return m_value;
-}
-
-}} // namespace boost::python
-
-#endif // BACK_REFERENCE_DWA2002510_HPP
diff --git a/include/boost/python/base_type_traits.hpp b/include/boost/python/base_type_traits.hpp
deleted file mode 100755
index d66f413d..00000000
--- a/include/boost/python/base_type_traits.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef BASE_TYPE_TRAITS_DWA2002614_HPP
-# define BASE_TYPE_TRAITS_DWA2002614_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  struct unspecialized {};
-}
-
-// Derive from unspecialized so we can detect whether traits are
-// specialized
-template <class T> struct base_type_traits
-  : detail::unspecialized
-{};
-
-template <>
-struct base_type_traits<PyObject>
-{
-    typedef PyObject type;
-};
-
-template <>
-struct base_type_traits<PyTypeObject>
-{
-    typedef PyObject type;
-};
-
-}} // namespace boost::python
-
-#endif // BASE_TYPE_TRAITS_DWA2002614_HPP
diff --git a/include/boost/python/bases.hpp b/include/boost/python/bases.hpp
deleted file mode 100644
index 76fa9cea..00000000
--- a/include/boost/python/bases.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef BASES_DWA2002321_HPP
-# define BASES_DWA2002321_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/type_traits/object_traits.hpp>
-# include <boost/python/detail/type_list.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/mpl/bool.hpp>
-# include <boost/preprocessor/enum_params_with_a_default.hpp>
-# include <boost/preprocessor/enum_params.hpp>
-
-namespace boost { namespace python { 
-
-# define BOOST_PYTHON_BASE_PARAMS BOOST_PP_ENUM_PARAMS_Z(1, BOOST_PYTHON_MAX_BASES, Base)
-
-  // A type list for specifying bases
-  template < BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(BOOST_PYTHON_MAX_BASES, typename Base, mpl::void_) >
-  struct bases : detail::type_list< BOOST_PYTHON_BASE_PARAMS >::type
-  {};
-
-  namespace detail
-  {
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-    template <class T> struct specifies_bases
-        : mpl::false_
-    {
-    };
-    
-    template < BOOST_PP_ENUM_PARAMS_Z(1, BOOST_PYTHON_MAX_BASES, class Base) >
-    struct specifies_bases< bases< BOOST_PYTHON_BASE_PARAMS > >
-        : mpl::true_
-    {
-    };
-# else
-    template < BOOST_PP_ENUM_PARAMS(BOOST_PYTHON_MAX_BASES, class Base) >
-    static char is_bases_helper(bases< BOOST_PYTHON_BASE_PARAMS > const&);
-    
-    static char (& is_bases_helper(...) )[256];
-
-    template <class T>
-    struct specifies_bases
-    {
-     private:
-        static typename add_reference<T>::type make();
-        BOOST_STATIC_CONSTANT(bool, non_ref = !is_reference<T>::value);
-     public:
-        BOOST_STATIC_CONSTANT(bool, value = non_ref & (sizeof(is_bases_helper(make())) == 1));
-        typedef mpl::bool_<value> type;
-    };
-# endif
-    template <class T, class Prev = bases<> >
-    struct select_bases
-        : mpl::if_<
-                specifies_bases<T>
-                , T
-                , Prev
-          >
-    {
-    };
-  }
-# undef BOOST_PYTHON_BASE_PARAMS
-}} // namespace boost::python
-
-#endif // BASES_DWA2002321_HPP
diff --git a/include/boost/python/borrowed.hpp b/include/boost/python/borrowed.hpp
deleted file mode 100755
index 8b15a3f7..00000000
--- a/include/boost/python/borrowed.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef BORROWED_DWA2002614_HPP
-# define BORROWED_DWA2002614_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/detail/borrowed_ptr.hpp>
-
-namespace boost { namespace python { 
-
-template <class T>
-inline python::detail::borrowed<T>* borrowed(T* p)
-{
-    return (detail::borrowed<T>*)p;
-}
-    
-}} // namespace boost::python
-
-#endif // BORROWED_DWA2002614_HPP
diff --git a/include/boost/python/call.hpp b/include/boost/python/call.hpp
deleted file mode 100644
index 234a25d0..00000000
--- a/include/boost/python/call.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#if !defined(BOOST_PP_IS_ITERATING)
-
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# ifndef CALL_DWA2002411_HPP
-#  define CALL_DWA2002411_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-#  include <boost/type.hpp>
-
-#  include <boost/python/converter/arg_to_python.hpp>
-#  include <boost/python/converter/return_from_python.hpp>
-#  include <boost/python/detail/preprocessor.hpp>
-#  include <boost/python/detail/void_return.hpp>
-
-#  include <boost/preprocessor/comma_if.hpp>
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/repeat.hpp>
-#  include <boost/preprocessor/debug/line.hpp>
-#  include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#  include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-namespace boost { namespace python {
-
-# define BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET(z, n, _) \
-    , converter::arg_to_python<A##n>(a##n).get()
-
-#  define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/call.hpp>))
-#  include BOOST_PP_ITERATE()
-
-#  undef BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET
-
-}} // namespace boost::python
-
-# endif // CALL_DWA2002411_HPP
-
-#elif BOOST_PP_ITERATION_DEPTH() == 1
-# line BOOST_PP_LINE(__LINE__, call.hpp)
-
-# define N BOOST_PP_ITERATION()
-
-template <
-    class R
-    BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class A)
-    >
-typename detail::returnable<R>::type
-call(PyObject* callable
-    BOOST_PP_COMMA_IF(N) BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, A, const& a)
-    , boost::type<R>* = 0
-    )
-{
-    PyObject* const result = 
-        PyEval_CallFunction(
-            callable
-            , const_cast<char*>("(" BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FIXED, "O") ")")
-            BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET, nil)
-            );
-    
-    // This conversion *must not* be done in the same expression as
-    // the call, because, in the special case where the result is a
-    // reference a Python object which was created by converting a C++
-    // argument for passing to PyEval_CallFunction, its reference
-    // count will be 2 until the end of the full expression containing
-    // the conversion, and that interferes with dangling
-    // pointer/reference detection.
-    converter::return_from_python<R> converter;
-    return converter(result);
-}
-
-# undef N
-
-#endif
diff --git a/include/boost/python/call_method.hpp b/include/boost/python/call_method.hpp
deleted file mode 100644
index 474552e3..00000000
--- a/include/boost/python/call_method.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#if !defined(BOOST_PP_IS_ITERATING)
-
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-# ifndef CALL_METHOD_DWA2002411_HPP
-#  define CALL_METHOD_DWA2002411_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-#  include <boost/type.hpp>
-
-#  include <boost/python/converter/arg_to_python.hpp>
-#  include <boost/python/converter/return_from_python.hpp>
-#  include <boost/python/detail/preprocessor.hpp>
-#  include <boost/python/detail/void_return.hpp>
-
-#  include <boost/preprocessor/comma_if.hpp>
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/repeat.hpp>
-#  include <boost/preprocessor/debug/line.hpp>
-#  include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#  include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-namespace boost { namespace python {
-
-# define BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET(z, n, _) \
-    , converter::arg_to_python<A##n>(a##n).get()
-
-# define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/call_method.hpp>))
-# include BOOST_PP_ITERATE()
-
-# undef BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET
-
-}} // namespace boost::python
-
-# endif // CALL_METHOD_DWA2002411_HPP
-
-#elif BOOST_PP_ITERATION_DEPTH() == 1
-# line BOOST_PP_LINE(__LINE__, call_method.hpp)
-
-# define N BOOST_PP_ITERATION()
-
-template <
-    class R
-    BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class A)
-    >
-typename detail::returnable<R>::type
-call_method(PyObject* self, char const* name
-    BOOST_PP_COMMA_IF(N) BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, A, const& a)
-    , boost::type<R>* = 0
-    )
-{
-    PyObject* const result = 
-        PyEval_CallMethod(
-            self
-            , const_cast<char*>(name)
-            , const_cast<char*>("(" BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FIXED, "O") ")")
-            BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_FAST_ARG_TO_PYTHON_GET, nil)
-            );
-    
-    // This conversion *must not* be done in the same expression as
-    // the call, because, in the special case where the result is a
-    // reference a Python object which was created by converting a C++
-    // argument for passing to PyEval_CallFunction, its reference
-    // count will be 2 until the end of the full expression containing
-    // the conversion, and that interferes with dangling
-    // pointer/reference detection.
-    converter::return_from_python<R> converter;
-    return converter(result);
-}
-
-# undef N
-
-#endif // BOOST_PP_IS_ITERATING
diff --git a/include/boost/python/cast.hpp b/include/boost/python/cast.hpp
deleted file mode 100755
index c54141f0..00000000
--- a/include/boost/python/cast.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CAST_DWA200269_HPP
-# define CAST_DWA200269_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/type_traits/same_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
-# include <boost/type.hpp>
-# include <boost/python/base_type_traits.hpp>
-# include <boost/python/detail/convertible.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  template <class Source, class Target> inline Target* upcast_impl(Source*, Target*);
-  
-  template <class Source, class Target>
-  inline Target* upcast(Source* p, yes_convertible, no_convertible, Target*)
-  {
-      return p;
-  }
-
-  template <class Source, class Target>
-  inline Target* upcast(Source* p, no_convertible, no_convertible, Target*)
-  {
-      typedef typename base_type_traits<Source>::type base;
-      
-      return detail::upcast_impl((base*)p, (Target*)0);
-  }
-
-  template <bool is_same = true>
-  struct upcaster
-  {
-      template <class T>
-      static inline T* execute(T* x, T*) { return x; }
-  };
-  
-  template <>
-  struct upcaster<false>
-  {
-      template <class Source, class Target>
-      static inline Target* execute(Source* x, Target*)
-      {
-          return detail::upcast(
-              x, detail::convertible<Target*>::check(x)
-              , detail::convertible<Source*>::check((Target*)0)
-              , (Target*)0);
-      }
-  };
-
-
-  template <class Target, class Source>
-  inline Target* downcast(Source* p, yes_convertible)
-  {
-      return static_cast<Target*>(p);
-  }
-
-  template <class Target, class Source>
-  inline Target* downcast(Source* p, no_convertible, boost::type<Target>* = 0)
-  {
-      typedef typename base_type_traits<Source>::type base;
-      return (Target*)detail::downcast<base>(p, convertible<Source*>::check((base*)0));
-  }
-
-  template <class T>
-  inline void assert_castable(boost::type<T>* = 0)
-  {
-      typedef char must_be_a_complete_type[sizeof(T)];
-  }
-
-  template <class Source, class Target>
-  inline Target* upcast_impl(Source* x, Target*)
-  {
-      typedef typename add_cv<Source>::type src_t;
-      typedef typename add_cv<Target>::type target_t;
-      bool const same = is_same<src_t,target_t>::value;
-      
-      return detail::upcaster<same>::execute(x, (Target*)0);
-  }
-}
-
-template <class Target, class Source>
-inline Target* upcast(Source* x, Target* = 0)
-{
-    detail::assert_castable<Source>();
-    detail::assert_castable<Target>();
-    return detail::upcast_impl(x, (Target*)0);
-    
-}
-
-template <class Target, class Source>
-inline Target* downcast(Source* x, Target* = 0)
-{
-    detail::assert_castable<Source>();
-    detail::assert_castable<Target>();
-    return detail::downcast<Target>(x, detail::convertible<Source*>::check((Target*)0));
-}
-
-}} // namespace boost::python
-
-#endif // CAST_DWA200269_HPP
diff --git a/include/boost/python/class.hpp b/include/boost/python/class.hpp
deleted file mode 100644
index a1fcf4fd..00000000
--- a/include/boost/python/class.hpp
+++ /dev/null
@@ -1,670 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CLASS_DWA200216_HPP
-# define CLASS_DWA200216_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/class_fwd.hpp>
-# include <boost/python/object/class.hpp>
-
-# include <boost/python/bases.hpp>
-# include <boost/python/object.hpp>
-# include <boost/python/type_id.hpp>
-# include <boost/python/data_members.hpp>
-# include <boost/python/make_function.hpp>
-# include <boost/python/signature.hpp>
-# include <boost/python/init.hpp>
-# include <boost/python/args_fwd.hpp>
-
-# include <boost/python/object/select_holder.hpp>
-# include <boost/python/object/class_wrapper.hpp>
-# include <boost/python/object/make_instance.hpp>
-# include <boost/python/object/pickle_support.hpp>
-# include <boost/python/object/add_to_namespace.hpp>
-# include <boost/python/object/class_converters.hpp>
-
-# include <boost/python/detail/overloads_fwd.hpp>
-# include <boost/python/detail/operator_id.hpp>
-# include <boost/python/detail/def_helper.hpp>
-# include <boost/python/detail/force_instantiate.hpp>
-
-# include <boost/type_traits/is_same.hpp>
-# include <boost/type_traits/is_convertible.hpp>
-# include <boost/type_traits/is_member_function_pointer.hpp>
-# include <boost/type_traits/is_polymorphic.hpp>
-
-# include <boost/mpl/size.hpp>
-# include <boost/mpl/for_each.hpp>
-# include <boost/mpl/bool.hpp>
-# include <boost/mpl/not.hpp>
-# include <boost/mpl/or.hpp>
-# include <boost/mpl/vector/vector10.hpp>
-
-# include <boost/utility.hpp>
-# include <boost/detail/workaround.hpp>
-
-# if BOOST_WORKAROUND(__MWERKS__, <= 0x3004) || BOOST_WORKAROUND(__GNUC__, < 3)
-#  define BOOST_PYTHON_NO_MEMBER_POINTER_ORDERING 1
-# endif
-
-# ifdef BOOST_PYTHON_NO_MEMBER_POINTER_ORDERING
-#  include <boost/mpl/and.hpp>
-#  include <boost/type_traits/is_member_pointer.hpp>
-# endif
-
-namespace boost { namespace python {
-
-template <class DerivedVisitor> class def_visitor;
-
-enum no_init_t { no_init };
-
-namespace detail
-{
-  // This function object is used with mpl::for_each to write the id
-  // of the type a pointer to which is passed as its 2nd compile-time
-  // argument. into the iterator pointed to by its runtime argument
-  struct write_type_id
-  {
-      write_type_id(type_info**p) : p(p) {}
-
-      // Here's the runtime behavior
-      template <class T>
-      void operator()(T*) const
-      {
-          *(*p)++ = type_id<T>();
-      }
-
-      type_info** p;
-  };
-
-  template <class T, class Prev = detail::not_specified>
-  struct select_held_type;
-
-  template <class T1, class T2, class T3>
-  struct has_noncopyable;
-
-  // Register to_python converters for a class T.  The first argument
-  // will be mpl::true_ unless noncopyable was specified as a
-  // class_<...> template parameter. The 2nd argument is a pointer to
-  // the type of holder that must be created. The 3rd argument is a
-  // reference to the Python type object to be created.
-  template <class T, class SelectHolder>
-  inline void register_class_to_python(mpl::true_, SelectHolder, T* = 0)
-  {
-      typedef typename SelectHolder::type holder;
-      force_instantiate(objects::class_cref_wrapper<T, objects::make_instance<T,holder> >());
-      SelectHolder::register_();
-  }
-
-  template <class T, class SelectHolder>
-  inline void register_class_to_python(mpl::false_, SelectHolder, T* = 0)
-  {
-      SelectHolder::register_();
-  }
-
-  //
-  // register_wrapper_class -- register the relationship between a
-  // virtual function callback wrapper class and the class being
-  // wrapped.
-  //
-  template <class T>
-  inline void register_wrapper_class_impl(T*, T*, int) {}
-  
-  template <class Wrapper, class T>
-  inline void register_wrapper_class_impl(Wrapper*, T*, ...)
-  {
-      objects::register_class_from_python<Wrapper, mpl::vector1<T> >();
-      objects::copy_class_object(type_id<T>(), type_id<Wrapper>());
-  }
-  
-  template <class Held, class T>
-  inline void register_wrapper_class(Held* = 0, T* = 0)
-  {
-      register_wrapper_class_impl((Held*)0, (T*)0,  0);
-  }
-  
-# ifdef BOOST_PYTHON_NO_MEMBER_POINTER_ORDERING
-  template <class T>
-  struct is_data_member_pointer
-      : mpl::and_<
-            is_member_pointer<T>
-          , mpl::not_<is_member_function_pointer<T> >
-        >
-  {};
-#  define BOOST_PYTHON_DATA_MEMBER_HELPER , detail::is_data_member_pointer<D>()
-#  define BOOST_PYTHON_YES_DATA_MEMBER , mpl::true_
-#  define BOOST_PYTHON_NO_DATA_MEMBER , mpl::false_
-# elif defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-#  define BOOST_PYTHON_DATA_MEMBER_HELPER , 0
-#  define BOOST_PYTHON_YES_DATA_MEMBER , int
-#  define BOOST_PYTHON_NO_DATA_MEMBER , ...
-# else 
-#  define BOOST_PYTHON_DATA_MEMBER_HELPER
-#  define BOOST_PYTHON_YES_DATA_MEMBER
-#  define BOOST_PYTHON_NO_DATA_MEMBER
-# endif
-  
-  namespace error
-  {
-    //
-    // A meta-assertion mechanism which prints nice error messages and
-    // backtraces on lots of compilers. Usage:
-    //
-    //      assertion<C>::failed
-    //
-    // where C is an MPL metafunction class
-    //
-    
-    template <class C> struct assertion_failed { };
-    template <class C> struct assertion_ok { typedef C failed; };
-
-    template <class C>
-    struct assertion
-        : mpl::if_<C, assertion_ok<C>, assertion_failed<C> >::type
-    {};
-
-    //
-    // Checks for validity of arguments used to define virtual
-    // functions with default implementations.
-    //
-    
-    template <class Default>
-    void not_a_derived_class_member(Default) {}
-    
-    template <class T, class Fn>
-    struct virtual_function_default
-    {
-        template <class Default>
-        static void
-        must_be_derived_class_member(Default const&)
-        {
-            typedef typename assertion<mpl::not_<is_same<Default,Fn> > >::failed test0;
-# if !BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
-            typedef typename assertion<is_polymorphic<T> >::failed test1;
-# endif 
-            typedef typename assertion<is_member_function_pointer<Fn> >::failed test2;
-            not_a_derived_class_member<Default>(Fn());
-        }
-    };
-  }
-}
-
-// This is the primary mechanism through which users will expose
-// C++ classes to Python.
-template <
-    class T // class being wrapped
-    , class X1 // = detail::not_specified
-    , class X2 // = detail::not_specified
-    , class X3 // = detail::not_specified
-    >
-class class_ : public objects::class_base
-{
- public: // types
-    typedef objects::class_base base;
-    typedef T wrapped_type;
-    
-    typedef class_<T,X1,X2,X3> self;
-    BOOST_STATIC_CONSTANT(bool, is_copyable = (!detail::has_noncopyable<X1,X2,X3>::value));
-
-    // held_type - either T, a class derived from T or a smart pointer
-    // to a (class derived from) T.    
-    typedef typename detail::select_held_type<
-        X1, typename detail::select_held_type<
-        X2, typename detail::select_held_type<
-        X3
-    >::type>::type>::type held_type;
-
-    typedef objects::select_holder<T,held_type> select_holder;
-    
- private: // types
-
-    typedef typename detail::select_bases<X1
-            , typename detail::select_bases<X2
-              , typename boost::python::detail::select_bases<X3>::type
-              >::type
-            >::type bases;
-
-
-    // A helper class which will contain an array of id objects to be
-    // passed to the base class constructor
-    struct id_vector
-    {
-        id_vector()
-        {
-            // Stick the derived class id into the first element of the array
-            ids[0] = type_id<T>();
-
-            // Write the rest of the elements into succeeding positions.
-            type_info* p = ids + 1;
-            mpl::for_each(detail::write_type_id(&p), (bases*)0, (add_pointer<mpl::_>*)0);
-        }
-
-        BOOST_STATIC_CONSTANT(
-            std::size_t, size = mpl::size<bases>::value + 1);
-        type_info ids[size];
-    };
-    friend struct id_vector;
-
- public: // constructors
-    
-    // Construct with the class name, with or without docstring, and default __init__() function
-    class_(char const* name, char const* doc = 0);
-
-    // Construct with class name, no docstring, and an uncallable __init__ function
-    class_(char const* name, no_init_t);
-
-    // Construct with class name, docstring, and an uncallable __init__ function
-    class_(char const* name, char const* doc, no_init_t);
-
-    // Construct with class name and init<> function
-    template <class DerivedT>
-    inline class_(char const* name, init_base<DerivedT> const& i)
-        : base(name, id_vector::size, id_vector().ids)
-    {
-        this->register_holder();
-        this->def(i);
-    }
-
-    // Construct with class name, docstring and init<> function
-    template <class DerivedT>
-    inline class_(char const* name, char const* doc, init_base<DerivedT> const& i)
-        : base(name, id_vector::size, id_vector().ids, doc)
-    {
-        this->register_holder();
-        this->def(i);
-    }
-
- public: // member functions
-    
-    // Generic visitation
-    template <class Derived>
-    self& def(def_visitor<Derived> const& visitor)
-    {
-        visitor.visit(*this);
-        return *this;
-    }
-
-    // Wrap a member function or a non-member function which can take
-    // a T, T cv&, or T cv* as its first parameter, a callable
-    // python object, or a generic visitor.
-    template <class F>
-    self& def(char const* name, F f)
-    {
-        this->def_impl(name, f, detail::def_helper<char const*>(0), &f);
-        return *this;
-    }
-
-    template <class A1, class A2>
-    self& def(char const* name, A1 a1, A2 const& a2)
-    {
-        this->def_maybe_overloads(name, a1, a2, &a2);
-        return *this;
-    }
-
-    template <class Fn, class A1, class A2>
-    self& def(char const* name, Fn fn, A1 const& a1, A2 const& a2)
-    {
-        //  The arguments are definitely:
-        //      def(name, function, policy, doc_string)
-        //      def(name, function, doc_string, policy)
-
-        this->def_impl(
-            name, fn
-            , detail::def_helper<A1,A2>(a1,a2)
-            , &fn);
-
-        return *this;
-    }
-
-    template <class Fn, class A1, class A2, class A3>
-    self& def(char const* name, Fn fn, A1 const& a1, A2 const& a2, A3 const& a3)
-    {
-        this->def_impl(
-            name, fn
-            , detail::def_helper<A1,A2,A3>(a1,a2,a3)
-            , &fn);
-
-        return *this;
-    }
-
-    //
-    // Data member access
-    //
-    template <class D>
-    self& def_readonly(char const* name, D const& d)
-    {
-        return this->def_readonly_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER);
-    }
-
-    template <class D>
-    self& def_readwrite(char const* name, D const& d)
-    {
-        return this->def_readwrite_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER);
-    }
-    
-    template <class D>
-    self& def_readonly(char const* name, D& d)
-    {
-        return this->def_readonly_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER);
-    }
-
-    template <class D>
-    self& def_readwrite(char const* name, D& d)
-    {
-        return this->def_readwrite_impl(name, d BOOST_PYTHON_DATA_MEMBER_HELPER);
-    }
-
-    // Property creation
-    template <class Get>
-    self& add_property(char const* name, Get fget)
-    {
-        base::add_property(name, make_fn(fget));
-        return *this;
-    }
-
-    template <class Get, class Set>
-    self& add_property(char const* name, Get fget, Set fset)
-    {
-        base::add_property(name, make_fn(fget), make_fn(fset));
-        return *this;
-    }
-        
-    template <class Get>
-    self& add_static_property(char const* name, Get fget)
-    {
-        base::add_static_property(name, object(fget));
-        return *this;
-    }
-
-    template <class Get, class Set>
-    self& add_static_property(char const* name, Get fget, Set fset)
-    {
-        base::add_static_property(name, object(fget), object(fset));
-        return *this;
-    }
-        
-    template <class U>
-    self& setattr(char const* name, U const& x)
-    {
-        this->base::setattr(name, object(x));
-        return *this;
-    }
-
-    // Pickle support
-    template <typename PickleSuiteType>
-    self& def_pickle(PickleSuiteType const& x)
-    {
-      error_messages::must_be_derived_from_pickle_suite(x);
-      detail::pickle_suite_finalize<PickleSuiteType>::register_(
-        *this,
-        &PickleSuiteType::getinitargs,
-        &PickleSuiteType::getstate,
-        &PickleSuiteType::setstate,
-        PickleSuiteType::getstate_manages_dict());
-      return *this;
-    }
-
-    self& staticmethod(char const* name)
-    {
-        this->make_method_static(name);
-        return *this;
-    }
- private: // helper functions
-
-
-    // Builds a method for this class around the given [member]
-    // function pointer or object, appropriately adjusting the type of
-    // the first signature argument so that if f is a member of a
-    // (possibly not wrapped) base class of T, an lvalue argument of
-    // type T will be required.
-    //
-    // @group make_fn {
-    template <class F>
-    object make_fn(F const& f)
-    {
-        return make_function(f, default_call_policies(), detail::get_signature(f, (T*)0));
-    }
-
-    object
-# if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-    const&
-# endif 
-    make_fn(object const& x)
-    {
-        return x;
-    }
-    // }
-    
-    template <class D, class B>
-    self& def_readonly_impl(
-        char const* name, D B::*pm_ BOOST_PYTHON_YES_DATA_MEMBER)
-    {
-        D T::*pm = pm_;
-        return this->add_property(name, make_getter(pm));
-    }
-
-    template <class D, class B>
-    self& def_readwrite_impl(
-        char const* name, D B::*pm_ BOOST_PYTHON_YES_DATA_MEMBER)
-    {
-        D T::*pm = pm_;
-        return this->add_property(name, make_getter(pm), make_setter(pm));
-    }
-
-    template <class D>
-    self& def_readonly_impl(
-        char const* name, D& d BOOST_PYTHON_NO_DATA_MEMBER)
-    {
-        return this->add_static_property(name, make_getter(d));
-    }
-
-    template <class D>
-    self& def_readwrite_impl(
-        char const* name, D& d  BOOST_PYTHON_NO_DATA_MEMBER)
-    {
-        return this->add_static_property(name, make_getter(d), make_setter(d));
-    }
-
-    inline void register_() const;
-    inline void register_holder();
-    
-    //
-    // These two overloads discriminate between def() as applied to a
-    // generic visitor and everything else.
-    //
-    // @group def_impl {
-    template <class Helper, class LeafVisitor, class Visitor>
-    inline void def_impl(
-        char const* name
-      , LeafVisitor
-      , Helper const& helper
-      , def_visitor<Visitor> const* v
-    )
-    {
-        v->visit(*this, name,  helper);
-    }
-
-    template <class Fn, class Helper>
-    inline void def_impl(
-        char const* name
-      , Fn fn
-      , Helper const& helper
-      , ...
-    )
-    {
-        objects::add_to_namespace(
-            *this
-          , name
-          , make_function(
-                fn
-              , helper.policies()
-              , helper.keywords()
-              , detail::get_signature(fn, (T*)0)
-            )
-          , helper.doc()
-        );
-
-        this->def_default(name, fn, helper, mpl::bool_<Helper::has_default_implementation>());
-    }
-    // }
-
-    //
-    // These two overloads handle the definition of default
-    // implementation overloads for virtual functions. The second one
-    // handles the case where no default implementation was specified.
-    //
-    // @group def_default {
-    template <class Fn, class Helper>
-    inline void def_default(
-        char const* name
-        , Fn fn
-        , Helper const& helper
-        , mpl::bool_<true>)
-    {
-        detail::error::virtual_function_default<T,Fn>::must_be_derived_class_member(
-            helper.default_implementation());
-            
-        objects::add_to_namespace(
-            *this, name,
-            make_function(
-                helper.default_implementation(), helper.policies(), helper.keywords())
-            );
-    }
-    
-    template <class Fn, class Helper>
-    inline void def_default(char const*, Fn, Helper const&, mpl::bool_<false>)
-    { }
-    // }
-    
-    //
-    // These two overloads discriminate between def() as applied to
-    // regular functions and def() as applied to the result of
-    // BOOST_PYTHON_FUNCTION_OVERLOADS(). The final argument is used to
-    // discriminate.
-    //
-    // @group def_maybe_overloads {
-    template <class OverloadsT, class SigT>
-    void def_maybe_overloads(
-        char const* name
-        , SigT sig
-        , OverloadsT const& overloads
-        , detail::overloads_base const*)
-
-    {
-        //  convert sig to a type_list (see detail::get_signature in signature.hpp)
-        //  before calling detail::define_with_defaults.
-        detail::define_with_defaults(
-            name, overloads, *this, detail::get_signature(sig));
-    }
-
-    template <class Fn, class A1>
-    void def_maybe_overloads(
-        char const* name
-        , Fn fn
-        , A1 const& a1
-        , ...)
-    {
-        this->def_impl(
-            name
-          , fn
-          , detail::def_helper<A1>(a1)
-          , &fn
-        );
-
-    }
-    // }
-};
-
-
-//
-// implementations
-//
-
-// register converters
-template <class T, class X1, class X2, class X3>
-inline void class_<T,X1,X2,X3>::register_() const
-{
-    objects::register_class_from_python<T,bases>();
-
-    typedef BOOST_DEDUCED_TYPENAME select_holder::held_type held_t;
-    detail::register_wrapper_class<held_t,T>();
-    
-    detail::register_class_to_python<T>(
-        mpl::bool_<is_copyable>()
-      , select_holder()
-    );
-}
-
-template <class T, class X1, class X2, class X3>
-inline void class_<T,X1,X2,X3>::register_holder()
-{
-    this->register_();
-    typedef typename select_holder::type holder;
-    this->set_instance_size(
-        objects::additional_instance_size<holder>::value
-    );
-}
-
-template <class T, class X1, class X2, class X3>
-inline class_<T,X1,X2,X3>::class_(char const* name, char const* doc)
-    : base(name, id_vector::size, id_vector().ids, doc)
-{
-    this->register_holder();
-    select_holder::assert_default_constructible();
-    this->def(init<>());
-}
-
-template <class T, class X1, class X2, class X3>
-inline class_<T,X1,X2,X3>::class_(char const* name, no_init_t)
-    : base(name, id_vector::size, id_vector().ids)
-{
-    this->register_();
-    this->def_no_init();
-}
-
-template <class T, class X1, class X2, class X3>
-inline class_<T,X1,X2,X3>::class_(char const* name, char const* doc, no_init_t)
-    : base(name, id_vector::size, id_vector().ids, doc)
-{
-    this->register_();
-    this->def_no_init();
-}
-
-namespace detail
-{
-  template <class T1, class T2, class T3>
-  struct has_noncopyable
-      : mpl::or_<
-          is_same<T1,noncopyable>
-        , is_same<T2,noncopyable>
-        , is_same<T3,noncopyable>
-      >
-  {};
-
-
-  template <class T, class Prev>
-  struct select_held_type
-    : mpl::if_<
-          mpl::or_<
-              specifies_bases<T>
-            , is_same<T,noncopyable>
-              >
-        , Prev
-        , T
-      >
-  {
-  };
-}
-
-}} // namespace boost::python
-
-# undef BOOST_PYTHON_DATA_MEMBER_HELPER
-# undef BOOST_PYTHON_YES_DATA_MEMBER
-# undef BOOST_PYTHON_NO_DATA_MEMBER
-# undef BOOST_PYTHON_NO_MEMBER_POINTER_ORDERING
-
-#endif // CLASS_DWA200216_HPP
diff --git a/include/boost/python/class_fwd.hpp b/include/boost/python/class_fwd.hpp
deleted file mode 100644
index 352e1cd9..00000000
--- a/include/boost/python/class_fwd.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CLASS_FWD_DWA200222_HPP
-# define CLASS_FWD_DWA200222_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/detail/not_specified.hpp>
-
-namespace boost { namespace python { 
-
-template <
-    class T // class being wrapped
-    // arbitrarily-ordered optional arguments. Full qualification needed for MSVC6
-    , class X1 = ::boost::python::detail::not_specified
-    , class X2 = ::boost::python::detail::not_specified
-    , class X3 = ::boost::python::detail::not_specified
-    >
-class class_;
-
-}} // namespace boost::python
-
-#endif // CLASS_FWD_DWA200222_HPP
diff --git a/include/boost/python/converter/arg_from_python.hpp b/include/boost/python/converter/arg_from_python.hpp
deleted file mode 100755
index 54ddae0e..00000000
--- a/include/boost/python/converter/arg_from_python.hpp
+++ /dev/null
@@ -1,344 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ARG_FROM_PYTHON_DWA2002127_HPP
-# define ARG_FROM_PYTHON_DWA2002127_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/converter/from_python.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/type_traits/transform_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
-# include <boost/python/converter/rvalue_from_python_data.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/python/converter/registry.hpp>
-# include <boost/python/converter/registered.hpp>
-# include <boost/python/converter/registered_pointee.hpp>
-# include <boost/python/detail/void_ptr.hpp>
-# include <boost/python/back_reference.hpp>
-# include <boost/python/detail/referent_storage.hpp>
-# include <boost/python/converter/obj_mgr_arg_from_python.hpp>
-
-namespace boost { namespace python
-{
-  template <class T> struct arg_from_python;
-}}
-
-// This header defines Python->C++ function argument converters,
-// parametrized on the argument type.
-
-namespace boost { namespace python { namespace converter {
-
-//
-// lvalue converters
-//
-//   These require that an lvalue of the type U is stored somewhere in
-//   the Python object being converted.
-
-// Used when T == U*const&
-template <class T>
-struct pointer_cref_arg_from_python
-{
-    typedef T result_type;
-    
-    pointer_cref_arg_from_python(PyObject*);
-    T operator()() const;
-    bool convertible() const;
-    
- private: // storage for a U*
-    // needed because not all compilers will let us declare U* as the
-    // return type of operator() -- we return U*const& instead
-    typename python::detail::referent_storage<T>::type m_result;
-};
-
-// Base class for pointer and reference converters
-struct arg_lvalue_from_python_base
-{
- public: // member functions
-    arg_lvalue_from_python_base(void* result);
-    bool convertible() const;
-    
- protected: // member functions
-    void*const& result() const;
-    
- private: // data members
-    void* m_result;
-};
-
-// Used when T == U* 
-template <class T>
-struct pointer_arg_from_python : arg_lvalue_from_python_base
-{
-    typedef T result_type;
-    
-    pointer_arg_from_python(PyObject*);
-    T operator()() const;
-};
-
-// Used when T == U& and (T != V const& or T == W volatile&)
-template <class T>
-struct reference_arg_from_python : arg_lvalue_from_python_base
-{
-    typedef T result_type;
-    
-    reference_arg_from_python(PyObject*);
-    T operator()() const;
-};
-
-// ===================
-
-//
-// rvalue converters
-//
-//   These require only that an object of type T can be created from
-//   the given Python object, but not that the T object exist
-//   somewhere in storage.
-//
-
-// Used when T is a plain value (non-pointer, non-reference) type or
-// a (non-volatile) const reference to a plain value type.
-template <class T>
-struct arg_rvalue_from_python
-{
-    typedef typename boost::add_reference<
-        T
-        // We can't add_const here, or it would be impossible to pass
-        // auto_ptr<U> args from Python to C++
-    >::type result_type;
-    
-    arg_rvalue_from_python(PyObject*);
-    bool convertible() const;
-
-# if BOOST_MSVC < 1301 || _MSC_FULL_VER > 13102196
-    typename arg_rvalue_from_python<T>::
-# endif 
-    result_type operator()();
-    
- private:
-    rvalue_from_python_data<result_type> m_data;
-    PyObject* m_source;
-};
-
-
-// ==================
-
-// Converts to a (PyObject*,T) bundle, for when you need a reference
-// back to the Python object
-template <class T>
-struct back_reference_arg_from_python
-    : boost::python::arg_from_python<typename T::type>
-{
-    typedef T result_type;
-    
-    back_reference_arg_from_python(PyObject*);
-    T operator()();
- private:
-    typedef boost::python::arg_from_python<typename T::type> base;
-    PyObject* m_source;
-};
-
-
-// ==================
-
-// This metafunction selects the appropriate arg_from_python converter
-// type for an argument of type T.
-template <class T>
-struct select_arg_from_python
-{
-    BOOST_STATIC_CONSTANT(
-        bool, obj_mgr = is_object_manager<T>::value);
-    
-    BOOST_STATIC_CONSTANT(
-        bool, obj_mgr_ref = is_reference_to_object_manager<T>::value);
-    
-    BOOST_STATIC_CONSTANT(
-        bool, ptr = is_pointer<T>::value);
-    
-    BOOST_STATIC_CONSTANT(
-        bool, ptr_cref
-            = boost::python::detail::is_reference_to_pointer<T>::value
-            && boost::python::detail::is_reference_to_const<T>::value
-            && !boost::python::detail::is_reference_to_volatile<T>::value);
-
-    
-    BOOST_STATIC_CONSTANT(
-        bool, ref =
-            boost::python::detail::is_reference_to_non_const<T>::value
-        || boost::python::detail::is_reference_to_volatile<T>::value);
-
-    BOOST_STATIC_CONSTANT(
-        bool, back_ref =
-        boost::python::is_back_reference<T>::value);
-
-    typedef typename mpl::if_c<
-        obj_mgr
-        , object_manager_value_arg_from_python<T>
-        , typename mpl::if_c<
-            obj_mgr_ref
-            , object_manager_ref_arg_from_python<T>
-            , typename mpl::if_c<
-                ptr
-                , pointer_arg_from_python<T>
-                , typename mpl::if_c<
-                    ptr_cref
-                    , pointer_cref_arg_from_python<T>
-                    , typename mpl::if_c<
-                        ref
-                        , reference_arg_from_python<T>
-                        , typename mpl::if_c<
-                            back_ref
-                            , back_reference_arg_from_python<T>
-                            , arg_rvalue_from_python<T>
-                          >::type
-                      >::type
-                  >::type
-              >::type
-          >::type
-      >::type type;
-};
-
-// ==================
-
-//
-// implementations
-//
-
-// arg_lvalue_from_python_base
-//
-inline arg_lvalue_from_python_base::arg_lvalue_from_python_base(void* result)
-    : m_result(result)
-{
-}
-
-inline bool arg_lvalue_from_python_base::convertible() const
-{
-    return m_result != 0;
-}
-
-inline void*const& arg_lvalue_from_python_base::result() const
-{
-    return m_result;
-}
-
-// pointer_cref_arg_from_python
-//
-namespace detail
-{
-  // null_ptr_reference -- a function returning a reference to a null
-  // pointer of type U. Needed so that extractors for T*const& can
-  // convert Python's None.
-  template <class T>
-  struct null_ptr_owner
-  {
-      static T value;
-  };
-  template <class T> T null_ptr_owner<T>::value = 0;
-  
-  template <class U>
-  inline U& null_ptr_reference(U&(*)())
-  {
-      return null_ptr_owner<U>::value;
-  }
-}
-
-template <class T>
-inline pointer_cref_arg_from_python<T>::pointer_cref_arg_from_python(PyObject* p)
-{
-    // T == U*const&: store a U* in the m_result storage. Nonzero
-    // indicates success.  If find returns nonzero, it's a pointer to
-    // a U object.
-    python::detail::write_void_ptr_reference(
-        m_result.bytes
-        , p == Py_None ? p : converter::get_lvalue_from_python(p, registered_pointee<T>::converters)
-        , (T(*)())0);
-}
-
-template <class T>
-inline bool pointer_cref_arg_from_python<T>::convertible() const
-{
-    return python::detail::void_ptr_to_reference(m_result.bytes, (T(*)())0) != 0;
-}
-template <class T>
-inline T pointer_cref_arg_from_python<T>::operator()() const
-{
-    return (*(void**)m_result.bytes == Py_None)  // None ==> 0
-        ? detail::null_ptr_reference((T(*)())0)
-        // Otherwise, return a U*const& to the m_result storage.
-        : python::detail::void_ptr_to_reference(m_result.bytes, (T(*)())0);
-}
-
-// pointer_arg_from_python
-//
-template <class T>
-inline pointer_arg_from_python<T>::pointer_arg_from_python(PyObject* p)
-    : arg_lvalue_from_python_base(
-        p == Py_None ? p : converter::get_lvalue_from_python(p, registered_pointee<T>::converters))
-{
-}
-
-template <class T>
-inline T pointer_arg_from_python<T>::operator()() const
-{
-    return (result() == Py_None) ? 0 : T(result());
-}
-
-// reference_arg_from_python
-//
-template <class T>
-inline reference_arg_from_python<T>::reference_arg_from_python(PyObject* p)
-    : arg_lvalue_from_python_base(converter::get_lvalue_from_python(p,registered<T>::converters))
-{
-}
-
-template <class T>
-inline T reference_arg_from_python<T>::operator()() const
-{
-    return python::detail::void_ptr_to_reference(result(), (T(*)())0);
-}
-
-
-// arg_rvalue_from_python
-//
-template <class T>
-inline arg_rvalue_from_python<T>::arg_rvalue_from_python(PyObject* obj)
-    : m_data(converter::rvalue_from_python_stage1(obj, registered<T>::converters))
-    , m_source(obj)
-{
-}
-
-template <class T>
-inline bool arg_rvalue_from_python<T>::convertible() const
-{
-    return m_data.stage1.convertible != 0;
-}
-
-template <class T>
-inline typename arg_rvalue_from_python<T>::result_type
-arg_rvalue_from_python<T>::operator()()
-{
-    if (m_data.stage1.construct != 0)
-        m_data.stage1.construct(m_source, &m_data.stage1);
-    
-    return python::detail::void_ptr_to_reference(m_data.stage1.convertible, (result_type(*)())0);
-}
-
-// back_reference_arg_from_python
-//
-template <class T>
-back_reference_arg_from_python<T>::back_reference_arg_from_python(PyObject* x)
-  : base(x), m_source(x)
-{
-}
-
-template <class T>
-inline T
-back_reference_arg_from_python<T>::operator()()
-{
-    return T(m_source, base::operator()());
-}
-
-}}} // namespace boost::python::converter
-
-#endif // ARG_FROM_PYTHON_DWA2002127_HPP
diff --git a/include/boost/python/converter/arg_to_python.hpp b/include/boost/python/converter/arg_to_python.hpp
deleted file mode 100755
index 3d62eccd..00000000
--- a/include/boost/python/converter/arg_to_python.hpp
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ARG_TO_PYTHON_DWA200265_HPP
-# define ARG_TO_PYTHON_DWA200265_HPP
-
-# include <boost/python/ptr.hpp>
-# include <boost/python/tag.hpp>
-# include <boost/python/to_python_indirect.hpp>
-
-# include <boost/python/converter/registered.hpp>
-# include <boost/python/converter/registered_pointee.hpp>
-# include <boost/python/converter/arg_to_python_base.hpp>
-# include <boost/python/converter/shared_ptr_to_python.hpp>
-// Bring in specializations
-# include <boost/python/converter/builtin_converters.hpp>
-
-# include <boost/python/object/function_handle.hpp>
-
-# include <boost/python/base_type_traits.hpp>
-
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/python/detail/convertible.hpp>
-# include <boost/python/detail/string_literal.hpp>
-# include <boost/python/detail/value_is_shared_ptr.hpp>
-
-# include <boost/type_traits/cv_traits.hpp>
-# include <boost/type_traits/composite_traits.hpp>
-# include <boost/type_traits/function_traits.hpp>
-
-
-# include <boost/mpl/or.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-template <class T> struct is_object_manager;
-
-namespace detail
-{
-  template <class T>
-  struct function_arg_to_python : handle<>
-  {
-      function_arg_to_python(T const& x);
-  };
-
-  template <class T>
-  struct reference_arg_to_python : handle<>
-  {
-      reference_arg_to_python(T& x);
-   private:
-      static PyObject* get_object(T& x);
-  };
-
-  template <class T>
-  struct shared_ptr_arg_to_python : handle<>
-  {
-      shared_ptr_arg_to_python(T const& x);
-   private:
-      static PyObject* get_object(T& x);
-  };
-
-  template <class T>
-  struct value_arg_to_python : arg_to_python_base
-  {
-      // Throw an exception if the conversion can't succeed
-      value_arg_to_python(T const&);
-  };
-
-  template <class Ptr>
-  struct pointer_deep_arg_to_python : arg_to_python_base
-  {
-      // Throw an exception if the conversion can't succeed
-      pointer_deep_arg_to_python(Ptr);
-  };
-
-  template <class Ptr>
-  struct pointer_shallow_arg_to_python : handle<>
-  {
-      // Throw an exception if the conversion can't succeed
-      pointer_shallow_arg_to_python(Ptr);
-   private:
-      static PyObject* get_object(Ptr p);
-  };
-
-  // Convert types that manage a Python object to_python
-  template <class T>
-  struct object_manager_arg_to_python
-  {
-      object_manager_arg_to_python(T const& x) : m_src(x) {}
-      
-      PyObject* get() const
-      {
-          return python::upcast<PyObject>(get_managed_object(m_src, tag));
-      }
-      
-   private:
-      T const& m_src;
-  };
-
-  template <class T>
-  struct select_arg_to_python
-  {
-      typedef typename unwrap_reference<T>::type unwrapped_referent;
-      typedef typename unwrap_pointer<T>::type unwrapped_ptr;
-
-      typedef typename mpl::if_<
-          // Special handling for char const[N]; interpret them as char
-          // const* for the sake of conversion
-          python::detail::is_string_literal<T const>
-        , arg_to_python<char const*>
-
-        , typename mpl::if_<
-              python::detail::value_is_shared_ptr<T>
-            , shared_ptr_arg_to_python<T>
-      
-            , typename mpl::if_<
-                mpl::or_<
-                    is_function<T>
-                  , python::detail::is_pointer_to_function<T>
-                  , is_member_function_pointer<T>
-                >
-                , function_arg_to_python<T>
-
-                , typename mpl::if_<
-                      is_object_manager<T>
-                    , object_manager_arg_to_python<T>
-
-                    , typename mpl::if_<
-                          is_pointer<T>
-                        , pointer_deep_arg_to_python<T>
-
-                        , typename mpl::if_<
-                              is_pointer_wrapper<T>
-                            , pointer_shallow_arg_to_python<unwrapped_ptr>
-
-                            , typename mpl::if_<
-                                  is_reference_wrapper<T>
-                                , reference_arg_to_python<unwrapped_referent>
-                                , value_arg_to_python<T>
-                              >::type
-                          >::type
-                      >::type
-                  >::type
-              >::type
-          >::type
-      >::type
-      
-      type;
-  };
-}
-
-template <class T>
-struct arg_to_python
-    : detail::select_arg_to_python<T>::type
-{
-    typedef typename detail::select_arg_to_python<T>::type base;
- public: // member functions
-    // Throw an exception if the conversion can't succeed
-    arg_to_python(T const& x);
-};
-
-//
-// implementations
-//
-namespace detail
-{
-  // reject_raw_object_ptr -- cause a compile-time error if the user
-  // should pass a raw Python object pointer
-  using python::detail::yes_convertible;
-  using python::detail::no_convertible;
-  using python::detail::unspecialized;
-  
-  template <class T> struct cannot_convert_raw_PyObject;
-
-  template <class T, class Convertibility>
-  struct reject_raw_object_helper
-  {
-      static void error(Convertibility)
-      {
-          cannot_convert_raw_PyObject<T*>::to_python_use_handle_instead();
-      }
-      static void error(...) {}
-  };
-  
-  template <class T>
-  inline void reject_raw_object_ptr(T*)
-  {
-      reject_raw_object_helper<T,yes_convertible>::error(
-          python::detail::convertible<PyObject const volatile*>::check((T*)0));
-      
-      typedef typename remove_cv<T>::type value_type;
-      
-      reject_raw_object_helper<T,no_convertible>::error(
-          python::detail::convertible<unspecialized*>::check(
-              (base_type_traits<value_type>*)0
-              ));
-  }
-  // ---------
-      
-  template <class T>
-  inline function_arg_to_python<T>::function_arg_to_python(T const& x)
-      : handle<>(python::objects::make_function_handle(x))
-  {
-  }
-
-  template <class T>
-  inline value_arg_to_python<T>::value_arg_to_python(T const& x)
-      : arg_to_python_base(&x, registered<T>::converters)
-  {
-  }
-
-  template <class Ptr>
-  inline pointer_deep_arg_to_python<Ptr>::pointer_deep_arg_to_python(Ptr x)
-      : arg_to_python_base(x, registered_pointee<Ptr>::converters)
-  {
-      detail::reject_raw_object_ptr((Ptr)0);
-  }
-
-  template <class T>
-  inline PyObject* reference_arg_to_python<T>::get_object(T& x)
-  {
-      to_python_indirect<T&,python::detail::make_reference_holder> convert;
-      return convert(x);
-  }
-
-  template <class T>
-  inline reference_arg_to_python<T>::reference_arg_to_python(T& x)
-      : handle<>(reference_arg_to_python<T>::get_object(x))
-  {
-  }
-
-  template <class T>
-  inline shared_ptr_arg_to_python<T>::shared_ptr_arg_to_python(T const& x)
-      : handle<>(shared_ptr_to_python(x))
-  {
-  }
-
-  template <class Ptr>
-  inline pointer_shallow_arg_to_python<Ptr>::pointer_shallow_arg_to_python(Ptr x)
-      : handle<>(pointer_shallow_arg_to_python<Ptr>::get_object(x))
-  {
-      detail::reject_raw_object_ptr((Ptr)0);
-  }
-
-  template <class Ptr>
-  inline PyObject* pointer_shallow_arg_to_python<Ptr>::get_object(Ptr x)
-  {
-      to_python_indirect<Ptr,python::detail::make_reference_holder> convert;
-      return convert(x);
-  }
-}
-
-template <class T>
-inline arg_to_python<T>::arg_to_python(T const& x)
-    : base(x)
-{}
-
-}}} // namespace boost::python::converter
-
-#endif // ARG_TO_PYTHON_DWA200265_HPP
diff --git a/include/boost/python/converter/arg_to_python_base.hpp b/include/boost/python/converter/arg_to_python_base.hpp
deleted file mode 100755
index 5bd192d5..00000000
--- a/include/boost/python/converter/arg_to_python_base.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ARG_TO_PYTHON_BASE_DWA200237_HPP
-# define ARG_TO_PYTHON_BASE_DWA200237_HPP
-# include <boost/python/handle.hpp>
-
-namespace boost { namespace python { namespace converter {
-
-struct registration;
-
-namespace detail
-{
-  struct BOOST_PYTHON_DECL arg_to_python_base
-# if !defined(BOOST_MSVC) || BOOST_MSVC <= 1300 || _MSC_FULL_VER > 13102179
-      : handle<>
-# endif 
-  {
-      arg_to_python_base(void const volatile* source, registration const&);
-# if defined(BOOST_MSVC) && BOOST_MSVC > 1300 && _MSC_FULL_VER <= 13102179
-      PyObject* get() const { return m_ptr.get(); }
-      PyObject* release() { return m_ptr.release(); }
-   private:
-      handle<> m_ptr;
-# endif 
-  };
-}
-
-}}} // namespace boost::python::converter
-
-#endif // ARG_TO_PYTHON_BASE_DWA200237_HPP
diff --git a/include/boost/python/converter/as_to_python_function.hpp b/include/boost/python/converter/as_to_python_function.hpp
deleted file mode 100644
index fc4446a0..00000000
--- a/include/boost/python/converter/as_to_python_function.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef AS_TO_PYTHON_FUNCTION_DWA2002121_HPP
-# define AS_TO_PYTHON_FUNCTION_DWA2002121_HPP
-# include <boost/python/converter/to_python_function_type.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-// Given a typesafe to_python conversion function, produces a
-// to_python_function_t which can be registered in the usual way.
-template <class T, class ToPython>
-struct as_to_python_function
-{
-    // Assertion functions used to prevent wrapping of converters
-    // which take non-const reference parameters. The T* argument in
-    // the first overload ensures it isn't used in case T is a
-    // reference.
-    template <class U>
-    static void convert_function_must_take_value_or_const_reference(U(*)(T), int, T* = 0) {}
-    template <class U>
-    static void convert_function_must_take_value_or_const_reference(U(*)(T const&), long ...) {}
-        
-    static PyObject* convert(void const* x)
-    {
-        convert_function_must_take_value_or_const_reference(&ToPython::convert, 1L);
-        
-        // Yes, the const_cast below opens a hole in const-correctness,
-        // but it's needed to convert auto_ptr<U> to python.
-        //
-        // How big a hole is it?  It allows ToPython::convert() to be
-        // a function which modifies its argument. The upshot is that
-        // client converters applied to const objects may invoke
-        // undefined behavior. The damage, however, is limited by the
-        // use of the assertion function. Thus, the only way this can
-        // modify its argument is if T is an auto_ptr-like type. There
-        // is still a const-correctness hole w.r.t. auto_ptr<U> const,
-        // but c'est la vie.
-        return ToPython::convert(*const_cast<T*>(static_cast<T const*>(x)));
-    }
-};
-
-}}} // namespace boost::python::converter
-
-#endif // AS_TO_PYTHON_FUNCTION_DWA2002121_HPP
diff --git a/include/boost/python/converter/builtin_converters.hpp b/include/boost/python/converter/builtin_converters.hpp
deleted file mode 100644
index f64e8e5e..00000000
--- a/include/boost/python/converter/builtin_converters.hpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef BUILTIN_CONVERTERS_DWA2002124_HPP
-# define BUILTIN_CONVERTERS_DWA2002124_HPP
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/detail/none.hpp>
-# include <boost/python/handle.hpp>
-# include <string>
-# include <complex>
-# include <boost/limits.hpp>
-
-// Since all we can use to decide how to convert an object to_python
-// is its C++ type, there can be only one such converter for each
-// type. Therefore, for built-in conversions we can bypass registry
-// lookups using explicit specializations of arg_to_python and
-// result_to_python.
-
-namespace boost { namespace python {
-
-namespace converter
-{
-  template <class T> struct arg_to_python;
-  BOOST_PYTHON_DECL PyObject* do_return_to_python(char);
-  BOOST_PYTHON_DECL PyObject* do_return_to_python(char const*);
-  BOOST_PYTHON_DECL PyObject* do_return_to_python(PyObject*);
-  BOOST_PYTHON_DECL PyObject* do_arg_to_python(PyObject*);
-}
-
-// Provide specializations of to_python_value
-template <class T> struct to_python_value;
-
-namespace detail
-{
-  // Since there's no registry lookup, always report the existence of
-  // a converter.
-  struct builtin_to_python
-  {
-      // This information helps make_getter() decide whether to try to
-      // return an internal reference or not. I don't like it much,
-      // but it will have to serve for now.
-      BOOST_STATIC_CONSTANT(bool, uses_registry = false);
-  };
-}
-
-// Use expr to create the PyObject corresponding to x
-# define BOOST_PYTHON_RETURN_TO_PYTHON_BY_VALUE(T, expr)        \
-    template <> struct to_python_value<T&>                      \
-        : detail::builtin_to_python                             \
-    {                                                           \
-        inline PyObject* operator()(T const& x) const           \
-        {                                                       \
-            return (expr);                                      \
-        }                                                       \
-    };                                                          \
-    template <> struct to_python_value<T const&>                \
-        : detail::builtin_to_python                             \
-    {                                                           \
-        inline PyObject* operator()(T const& x) const           \
-        {                                                       \
-            return (expr);                                      \
-        }                                                       \
-    };
-
-# define BOOST_PYTHON_ARG_TO_PYTHON_BY_VALUE(T, expr)   \
-    namespace converter                                 \
-    {                                                   \
-      template <> struct arg_to_python< T >             \
-        : handle<>                                      \
-      {                                                 \
-          arg_to_python(T const& x)                     \
-            : python::handle<>(expr) {}                 \
-      };                                                \
-    } 
-
-// Specialize argument and return value converters for T using expr
-# define BOOST_PYTHON_TO_PYTHON_BY_VALUE(T, expr)       \
-        BOOST_PYTHON_RETURN_TO_PYTHON_BY_VALUE(T,expr)  \
-        BOOST_PYTHON_ARG_TO_PYTHON_BY_VALUE(T,expr)
-
-// Specialize converters for signed and unsigned T to Python Int
-# define BOOST_PYTHON_TO_INT(T)                                         \
-    BOOST_PYTHON_TO_PYTHON_BY_VALUE(signed T, ::PyInt_FromLong(x))      \
-    BOOST_PYTHON_TO_PYTHON_BY_VALUE(                                    \
-        unsigned T                                                      \
-        , static_cast<unsigned long>(x) > static_cast<unsigned long>(   \
-                std::numeric_limits<long>::max())                       \
-        ? ::PyLong_FromUnsignedLong(x)                                  \
-        : ::PyInt_FromLong(x))
-
-// Bool is not signed.
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(bool, ::PyInt_FromLong(x))
-
-// note: handles signed char and unsigned char, but not char (see below)
-BOOST_PYTHON_TO_INT(char)
-
-BOOST_PYTHON_TO_INT(short)
-BOOST_PYTHON_TO_INT(int)
-BOOST_PYTHON_TO_INT(long)
-
-// using Python's macro instead of Boost's - we don't seem to get the
-// config right all the time.
-# ifdef HAVE_LONG_LONG 
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(signed BOOST_PYTHON_LONG_LONG, ::PyLong_FromLongLong(x))
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(unsigned BOOST_PYTHON_LONG_LONG, ::PyLong_FromUnsignedLongLong(x))
-# endif
-    
-# undef BOOST_TO_PYTHON_INT
-
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(char, converter::do_return_to_python(x))
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(char const*, converter::do_return_to_python(x))
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(std::string, ::PyString_FromStringAndSize(x.data(),x.size()))
-# ifndef BOOST_NO_STD_WSTRING
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(std::wstring, ::PyUnicode_FromWideChar(x.data(),x.size()))
-# endif 
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(float, ::PyFloat_FromDouble(x))
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(double, ::PyFloat_FromDouble(x))
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(long double, ::PyFloat_FromDouble(x))
-BOOST_PYTHON_RETURN_TO_PYTHON_BY_VALUE(PyObject*, converter::do_return_to_python(x))
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(std::complex<float>, ::PyComplex_FromDoubles(x.real(), x.imag()))
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(std::complex<double>, ::PyComplex_FromDoubles(x.real(), x.imag()))
-BOOST_PYTHON_TO_PYTHON_BY_VALUE(std::complex<long double>, ::PyComplex_FromDoubles(x.real(), x.imag()))
-
-# undef BOOST_PYTHON_RETURN_TO_PYTHON_BY_VALUE
-# undef BOOST_PYTHON_ARG_TO_PYTHON_BY_VALUE
-# undef BOOST_PYTHON_TO_PYTHON_BY_VALUE
-# undef BOOST_PYTHON_TO_INT
-    
-namespace converter
-{ 
-
-  void initialize_builtin_converters();
-
-}
-
-}} // namespace boost::python::converter
-
-#endif // BUILTIN_CONVERTERS_DWA2002124_HPP
diff --git a/include/boost/python/converter/constructor_function.hpp b/include/boost/python/converter/constructor_function.hpp
deleted file mode 100644
index f3c49bd4..00000000
--- a/include/boost/python/converter/constructor_function.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CONSTRUCTOR_FUNCTION_DWA200278_HPP
-# define CONSTRUCTOR_FUNCTION_DWA200278_HPP
-
-namespace boost { namespace python { namespace converter { 
-
-// Declares the type of functions used to construct C++ objects for
-// rvalue from_python conversions.
-struct rvalue_from_python_stage1_data;
-typedef void (*constructor_function)(PyObject* source, rvalue_from_python_stage1_data*);
-
-}}} // namespace boost::python::converter
-
-#endif // CONSTRUCTOR_FUNCTION_DWA200278_HPP
diff --git a/include/boost/python/converter/context_result_converter.hpp b/include/boost/python/converter/context_result_converter.hpp
deleted file mode 100755
index c93dba0f..00000000
--- a/include/boost/python/converter/context_result_converter.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CONTEXT_RESULT_CONVERTER_DWA2003917_HPP
-# define CONTEXT_RESULT_CONVERTER_DWA2003917_HPP
-
-namespace boost { namespace python { namespace converter { 
-
-// A ResultConverter base class used to indicate that this result
-// converter should be constructed with the original Python argument
-// list.
-struct context_result_converter {};
-
-}}} // namespace boost::python::converter
-
-#endif // CONTEXT_RESULT_CONVERTER_DWA2003917_HPP
diff --git a/include/boost/python/converter/convertible_function.hpp b/include/boost/python/converter/convertible_function.hpp
deleted file mode 100644
index 98db1cfb..00000000
--- a/include/boost/python/converter/convertible_function.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CONVERTIBLE_FUNCTION_DWA200278_HPP
-# define CONVERTIBLE_FUNCTION_DWA200278_HPP
-
-namespace boost { namespace python { namespace converter { 
-
-typedef void* (*convertible_function)(PyObject*);
-    
-}}} // namespace boost::python::converter
-
-#endif // CONVERTIBLE_FUNCTION_DWA200278_HPP
diff --git a/include/boost/python/converter/from_python.hpp b/include/boost/python/converter/from_python.hpp
deleted file mode 100644
index c0e27050..00000000
--- a/include/boost/python/converter/from_python.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef FIND_FROM_PYTHON_DWA2002223_HPP
-# define FIND_FROM_PYTHON_DWA2002223_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/converter/rvalue_from_python_data.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-struct registration;
-
-
-BOOST_PYTHON_DECL void* get_lvalue_from_python(
-    PyObject* source, registration const&);
-
-BOOST_PYTHON_DECL bool implicit_rvalue_convertible_from_python(
-    PyObject* source, registration const&);
-
-BOOST_PYTHON_DECL rvalue_from_python_stage1_data rvalue_from_python_stage1(
-    PyObject* source, registration const&);
-
-BOOST_PYTHON_DECL void* rvalue_from_python_stage2(
-    PyObject* source, rvalue_from_python_stage1_data&, registration const&);
-
-BOOST_PYTHON_DECL void* rvalue_result_from_python(
-    PyObject*, rvalue_from_python_stage1_data&);
-
-BOOST_PYTHON_DECL void* reference_result_from_python(PyObject*, registration const&);
-BOOST_PYTHON_DECL void* pointer_result_from_python(PyObject*, registration const&);
-
-BOOST_PYTHON_DECL void void_result_from_python(PyObject*);
-
-BOOST_PYTHON_DECL void throw_no_pointer_from_python(PyObject*, registration const&);
-BOOST_PYTHON_DECL void throw_no_reference_from_python(PyObject*, registration const&);
-
-}}} // namespace boost::python::converter
-
-#endif // FIND_FROM_PYTHON_DWA2002223_HPP
diff --git a/include/boost/python/converter/implicit.hpp b/include/boost/python/converter/implicit.hpp
deleted file mode 100644
index fd588f6b..00000000
--- a/include/boost/python/converter/implicit.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef IMPLICIT_DWA2002326_HPP
-# define IMPLICIT_DWA2002326_HPP
-
-# include <boost/python/converter/rvalue_from_python_data.hpp>
-# include <boost/python/converter/registrations.hpp>
-# include <boost/python/converter/registered.hpp>
-
-# include <boost/python/extract.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-template <class Source, class Target>
-struct implicit
-{
-    static void* convertible(PyObject* obj)
-    {
-        // Find a converter which can produce a Source instance from
-        // obj. The user has told us that Source can be converted to
-        // Target, and instantiating construct() below, ensures that
-        // at compile-time.
-        return implicit_rvalue_convertible_from_python(obj, registered<Source>::converters)
-            ? obj : 0;
-    }
-      
-    static void construct(PyObject* obj, rvalue_from_python_stage1_data* data)
-    {
-        void* storage = ((rvalue_from_python_storage<Target>*)data)->storage.bytes;
-        
-        new (storage) Target(extract<Source>(obj)());
-        
-        // record successful construction
-        data->convertible = storage;
-    }
-};
-
-}}} // namespace boost::python::converter
-
-#endif // IMPLICIT_DWA2002326_HPP
diff --git a/include/boost/python/converter/obj_mgr_arg_from_python.hpp b/include/boost/python/converter/obj_mgr_arg_from_python.hpp
deleted file mode 100644
index 6f9aef61..00000000
--- a/include/boost/python/converter/obj_mgr_arg_from_python.hpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJ_MGR_ARG_FROM_PYTHON_DWA2002628_HPP
-# define OBJ_MGR_ARG_FROM_PYTHON_DWA2002628_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/detail/referent_storage.hpp>
-# include <boost/python/detail/destroy.hpp>
-# include <boost/python/detail/construct.hpp>
-# include <boost/python/converter/object_manager.hpp>
-# include <boost/python/detail/raw_pyobject.hpp>
-# include <boost/python/tag.hpp>
-
-//
-// arg_from_python converters for Python type wrappers, to be used as
-// base classes for specializations.
-//
-namespace boost { namespace python { namespace converter { 
-
-template <class T>
-struct object_manager_value_arg_from_python
-{
-    typedef T result_type;
-    
-    object_manager_value_arg_from_python(PyObject*);
-    bool convertible() const;
-    T operator()() const;
- private:
-    PyObject* m_source;
-};
-
-// Used for converting reference-to-object-manager arguments from
-// python. The process used here is a little bit odd. Upon
-// construction, we build the object manager object in the m_result
-// object, *forcing* it to accept the source Python object by casting
-// its pointer to detail::borrowed_reference. This is supposed to
-// bypass any type checking of the source object. The convertible
-// check then extracts the owned object and checks it. If the check
-// fails, nothing else in the program ever gets to touch this strange
-// "forced" object.
-template <class Ref>
-struct object_manager_ref_arg_from_python
-{
-    typedef Ref result_type;
-    
-    object_manager_ref_arg_from_python(PyObject*);
-    bool convertible() const;
-    Ref operator()() const;
-    ~object_manager_ref_arg_from_python();
- private:
-    typename python::detail::referent_storage<Ref>::type m_result;
-};
-
-//
-// implementations
-//
-
-template <class T>
-inline object_manager_value_arg_from_python<T>::object_manager_value_arg_from_python(PyObject* x)
-    : m_source(x)
-{
-}
-    
-template <class T>
-inline bool object_manager_value_arg_from_python<T>::convertible() const
-{
-    return object_manager_traits<T>::check(m_source);
-}
-
-template <class T>
-inline T object_manager_value_arg_from_python<T>::operator()() const
-{
-    return T(python::detail::borrowed_reference(m_source));
-}
-
-template <class Ref>
-inline object_manager_ref_arg_from_python<Ref>::object_manager_ref_arg_from_python(PyObject* x)
-{
-# if defined(__EDG_VERSION__) && __EDG_VERSION__ <= 243
-    // needed for warning suppression
-    python::detail::borrowed_reference x_ = python::detail::borrowed_reference(x);
-    python::detail::construct_referent<Ref>(&m_result.bytes, x_);
-# else 
-    python::detail::construct_referent<Ref>(&m_result.bytes, (python::detail::borrowed_reference)x);
-# endif 
-}
-
-template <class Ref>
-inline object_manager_ref_arg_from_python<Ref>::~object_manager_ref_arg_from_python()
-{
-    python::detail::destroy_referent<Ref>(this->m_result.bytes);
-}
-
-namespace detail
-{
-  template <class T>
-  inline bool object_manager_ref_check(T const& x)
-  {
-      return object_manager_traits<T>::check(get_managed_object(x, tag));
-  }
-}
-
-template <class Ref>
-inline bool object_manager_ref_arg_from_python<Ref>::convertible() const
-{
-    return detail::object_manager_ref_check(
-        python::detail::void_ptr_to_reference(this->m_result.bytes, (Ref(*)())0));
-}
-
-template <class Ref>
-inline Ref object_manager_ref_arg_from_python<Ref>::operator()() const
-{
-    return python::detail::void_ptr_to_reference(
-        this->m_result.bytes, (Ref(*)())0);
-}
-
-}}} // namespace boost::python::converter
-
-#endif // OBJ_MGR_ARG_FROM_PYTHON_DWA2002628_HPP
diff --git a/include/boost/python/converter/object_manager.hpp b/include/boost/python/converter/object_manager.hpp
deleted file mode 100755
index 7c8c9084..00000000
--- a/include/boost/python/converter/object_manager.hpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJECT_MANAGER_DWA2002614_HPP
-# define OBJECT_MANAGER_DWA2002614_HPP
-
-# include <boost/python/handle.hpp>
-# include <boost/python/cast.hpp>
-# include <boost/python/converter/pyobject_traits.hpp>
-# include <boost/type_traits/object_traits.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/mpl/bool.hpp>
-
-// Facilities for dealing with types which always manage Python
-// objects. Some examples are object, list, str, et. al. Different
-// to_python/from_python conversion rules apply here because in
-// contrast to other types which are typically embedded inside a
-// Python object, these are wrapped around a Python object. For most
-// object managers T, a C++ non-const T reference argument does not
-// imply the existence of a T lvalue embedded in the corresponding
-// Python argument, since mutating member functions on T actually only
-// modify the held Python object.
-//
-// handle<T> is an object manager, though strictly speaking it should
-// not be. In other words, even though mutating member functions of
-// hanlde<T> actually modify the handle<T> and not the T object,
-// handle<T>& arguments of wrapped functions will bind to "rvalues"
-// wrapping the actual Python argument, just as with other object
-// manager classes. Making an exception for handle<T> is simply not
-// worth the trouble.
-//
-// borrowed<T> cv* is an object manager so that we can use the general
-// to_python mechanisms to convert raw Python object pointers to
-// python, without the usual semantic problems of using raw pointers.
-
-
-// Object Manager Concept requirements:
-//
-//    T is an Object Manager
-//    p is a PyObject*
-//    x is a T
-//
-//    * object_manager_traits<T>::is_specialized == true
-//
-//    * T(detail::borrowed_reference(p))
-//        Manages p without checking its type
-//
-//    * get_managed_object(x, boost::python::tag)
-//        Convertible to PyObject*
-//
-// Additional requirements if T can be converted from_python:
-//
-//    * T(object_manager_traits<T>::adopt(p))
-//        steals a reference to p, or throws a TypeError exception if
-//        p doesn't have an appropriate type. May assume p is non-null
-//
-//    * X::check(p)
-//        convertible to bool. True iff T(X::construct(p)) will not
-//        throw.
-
-// Forward declarations
-//
-namespace boost { namespace python
-{
-  namespace api
-  {
-    class object; 
-  }
-}}
-
-namespace boost { namespace python { namespace converter { 
-
-
-// Specializations for handle<T>
-template <class T>
-struct handle_object_manager_traits
-    : pyobject_traits<typename T::element_type>
-{
- private:
-  typedef pyobject_traits<typename T::element_type> base;
-  
- public:
-  BOOST_STATIC_CONSTANT(bool, is_specialized = true);
-
-  // Initialize with a null_ok pointer for efficiency, bypassing the
-  // null check since the source is always non-null.
-  static null_ok<typename T::element_type>* adopt(PyObject* p)
-  {
-      return python::allow_null(base::checked_downcast(p));
-  }
-};
-
-template <class T>
-struct default_object_manager_traits
-{
-    BOOST_STATIC_CONSTANT(
-        bool, is_specialized = python::detail::is_borrowed_ptr<T>::value
-        );
-};
-
-template <class T>
-struct object_manager_traits
-    : mpl::if_c<
-         is_handle<T>::value
-       , handle_object_manager_traits<T>
-       , default_object_manager_traits<T>
-    >::type
-{
-};
-
-//
-// Traits for detecting whether a type is an object manager or a
-// (cv-qualified) reference to an object manager.
-// 
-
-template <class T>
-struct is_object_manager
-    : mpl::bool_<object_manager_traits<T>::is_specialized>
-{
-};
-
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-template <class T>
-struct is_reference_to_object_manager
-    : mpl::false_
-{
-};
-
-template <class T>
-struct is_reference_to_object_manager<T&>
-    : is_object_manager<T>
-{
-};
-
-template <class T>
-struct is_reference_to_object_manager<T const&>
-    : is_object_manager<T>
-{
-};
-
-template <class T>
-struct is_reference_to_object_manager<T volatile&>
-    : is_object_manager<T>
-{
-};
-
-template <class T>
-struct is_reference_to_object_manager<T const volatile&>
-    : is_object_manager<T>
-{
-};
-# else
-
-namespace detail
-{
-  typedef char (&yes_reference_to_object_manager)[1];
-  typedef char (&no_reference_to_object_manager)[2];
-
-  // A number of nastinesses go on here in order to work around MSVC6
-  // bugs.
-  template <class T>
-  struct is_object_manager_help
-  {
-      typedef typename mpl::if_<
-          is_object_manager<T>
-          , yes_reference_to_object_manager
-          , no_reference_to_object_manager
-          >::type type;
-
-      // If we just use the type instead of the result of calling this
-      // function, VC6 will ICE.
-      static type call();
-  };
-
-  // A set of overloads for each cv-qualification. The same argument
-  // is passed twice: the first one is used to unwind the cv*, and the
-  // second one is used to avoid relying on partial ordering for
-  // overload resolution.
-  template <class U>
-  typename is_object_manager_help<U>
-  is_object_manager_helper(U*, void*);
-  
-  template <class U>
-  typename is_object_manager_help<U>
-  is_object_manager_helper(U const*, void const*);
-  
-  template <class U>
-  typename is_object_manager_help<U>
-  is_object_manager_helper(U volatile*, void volatile*);
-  
-  template <class U>
-  typename is_object_manager_help<U>
-  is_object_manager_helper(U const volatile*, void const volatile*);
-  
-  template <class T>
-  struct is_reference_to_object_manager_nonref
-      : mpl::false_
-  {
-  };
-
-  template <class T>
-  struct is_reference_to_object_manager_ref
-  {
-      static T sample_object;
-      BOOST_STATIC_CONSTANT(
-        bool, value
-        = (sizeof(is_object_manager_helper(&sample_object, &sample_object).call())
-            == sizeof(detail::yes_reference_to_object_manager)
-          )
-        );
-      typedef mpl::bool_<value> type;
-  };
-}
-
-template <class T>
-struct is_reference_to_object_manager
-    : mpl::if_<
-        is_reference<T>
-        , detail::is_reference_to_object_manager_ref<T>
-        , detail::is_reference_to_object_manager_nonref<T>
-    >::type
-{
-};
-# endif 
-
-}}} // namespace boost::python::converter
-
-#endif // OBJECT_MANAGER_DWA2002614_HPP
diff --git a/include/boost/python/converter/pointer_type_id.hpp b/include/boost/python/converter/pointer_type_id.hpp
deleted file mode 100644
index 01e55977..00000000
--- a/include/boost/python/converter/pointer_type_id.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef POINTER_TYPE_ID_DWA2002222_HPP
-# define POINTER_TYPE_ID_DWA2002222_HPP
-
-# include <boost/python/type_id.hpp>
-# include <boost/type_traits/composite_traits.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-namespace detail
-{
-  template <bool is_ref = false>
-  struct pointer_typeid_select
-  {
-      template <class T>
-      static inline type_info execute(T*(*)() = 0)
-      {
-          return type_id<T>();
-      }
-  };
-
-  template <>
-  struct pointer_typeid_select<true>
-  {
-      template <class T>
-      static inline type_info execute(T* const volatile&(*)() = 0)
-      {
-          return type_id<T>();
-      }
-    
-      template <class T>
-      static inline type_info execute(T*volatile&(*)() = 0)
-      {
-          return type_id<T>();
-      }
-    
-      template <class T>
-      static inline type_info execute(T*const&(*)() = 0)
-      {
-          return type_id<T>();
-      }
-
-      template <class T>
-      static inline type_info execute(T*&(*)() = 0)
-      {
-          return type_id<T>();
-      }
-  };
-}
-
-// Usage: pointer_type_id<T>()
-//
-// Returns a type_info associated with the type pointed
-// to by T, which may be a pointer or a reference to a pointer.
-template <class T>
-type_info pointer_type_id(T(*)() = 0)
-{
-    return detail::pointer_typeid_select<
-          is_reference<T>::value
-        >::execute((T(*)())0);
-}
-
-}}} // namespace boost::python::converter
-
-#endif // POINTER_TYPE_ID_DWA2002222_HPP
diff --git a/include/boost/python/converter/pyobject_traits.hpp b/include/boost/python/converter/pyobject_traits.hpp
deleted file mode 100644
index f67ff58d..00000000
--- a/include/boost/python/converter/pyobject_traits.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef PYOBJECT_TRAITS_DWA2002720_HPP
-# define PYOBJECT_TRAITS_DWA2002720_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/converter/pyobject_type.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-template <class> struct pyobject_traits;
-
-template <>
-struct pyobject_traits<PyObject>
-{
-    // All objects are convertible to PyObject
-    static bool check(PyObject*) { return true; }
-    static PyObject* checked_downcast(PyObject* x) { return x; }
-};
-
-//
-// Specializations
-//
-
-# define BOOST_PYTHON_BUILTIN_OBJECT_TRAITS(T)                  \
-    template <> struct pyobject_traits<Py##T##Object>           \
-        : pyobject_type<Py##T##Object, &Py##T##_Type> {}
-
-// This is not an exhaustive list; should be expanded.
-BOOST_PYTHON_BUILTIN_OBJECT_TRAITS(Type);
-BOOST_PYTHON_BUILTIN_OBJECT_TRAITS(List);
-BOOST_PYTHON_BUILTIN_OBJECT_TRAITS(Int);
-BOOST_PYTHON_BUILTIN_OBJECT_TRAITS(Long);
-BOOST_PYTHON_BUILTIN_OBJECT_TRAITS(Dict);
-BOOST_PYTHON_BUILTIN_OBJECT_TRAITS(Tuple);
-
-}}} // namespace boost::python::converter
-
-#endif // PYOBJECT_TRAITS_DWA2002720_HPP
diff --git a/include/boost/python/converter/pyobject_type.hpp b/include/boost/python/converter/pyobject_type.hpp
deleted file mode 100644
index 014c9c96..00000000
--- a/include/boost/python/converter/pyobject_type.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef PYOBJECT_TYPE_DWA2002720_HPP
-# define PYOBJECT_TYPE_DWA2002720_HPP
-
-# include <boost/python/cast.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-BOOST_PYTHON_DECL PyObject* checked_downcast_impl(PyObject*, PyTypeObject*);
-
-// Used as a base class for specializations which need to provide
-// Python type checking capability.
-template <class Object, PyTypeObject* pytype>
-struct pyobject_type
-{
-    static bool check(PyObject* x)
-    {
-        return ::PyObject_IsInstance(x, (PyObject*)pytype);
-    }
-
-    static Object* checked_downcast(PyObject* x)
-    {
-        return python::downcast<Object>(
-            (checked_downcast_impl)(x, pytype)
-            );
-    }
-};
-
-}}} // namespace boost::python::converter
-
-#endif // PYOBJECT_TYPE_DWA2002720_HPP
diff --git a/include/boost/python/converter/pytype_object_mgr_traits.hpp b/include/boost/python/converter/pytype_object_mgr_traits.hpp
deleted file mode 100644
index 1f2f31e1..00000000
--- a/include/boost/python/converter/pytype_object_mgr_traits.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef PYTYPE_OBJECT_MANAGER_TRAITS_DWA2002716_HPP
-# define PYTYPE_OBJECT_MANAGER_TRAITS_DWA2002716_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/detail/raw_pyobject.hpp>
-# include <boost/python/cast.hpp>
-# include <boost/python/converter/pyobject_type.hpp>
-# include <boost/python/errors.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-// Provide a forward declaration as a convenience for clients, who all
-// need it.
-template <class T> struct object_manager_traits;
-
-// Derive specializations of object_manager_traits from this class
-// when T is an object manager for a particular Python type hierarchy.
-//
-template <PyTypeObject* pytype, class T>
-struct pytype_object_manager_traits
-    : pyobject_type<T, pytype> // provides check()
-{
-    BOOST_STATIC_CONSTANT(bool, is_specialized = true);
-    static inline python::detail::new_reference adopt(PyObject*);
-};
-
-//
-// implementations
-//
-template <PyTypeObject* pytype, class T>
-inline python::detail::new_reference pytype_object_manager_traits<pytype,T>::adopt(PyObject* x)
-{
-    return python::detail::new_reference(python::pytype_check(pytype, x));
-}
-
-}}} // namespace boost::python::converter
-
-#endif // PYTYPE_OBJECT_MANAGER_TRAITS_DWA2002716_HPP
diff --git a/include/boost/python/converter/registered.hpp b/include/boost/python/converter/registered.hpp
deleted file mode 100644
index 27988d52..00000000
--- a/include/boost/python/converter/registered.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef REGISTERED_DWA2002710_HPP
-# define REGISTERED_DWA2002710_HPP
-# include <boost/python/type_id.hpp>
-# include <boost/python/converter/registry.hpp>
-# include <boost/python/converter/registrations.hpp>
-# include <boost/type_traits/transform_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
-# include <boost/detail/workaround.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-struct registration;
-
-namespace detail
-{
-  template <class T>
-  struct registered_base
-  {
-      static registration const& converters;
-  };
-}
-
-template <class T>
-struct registered
-    : detail::registered_base<
-        typename add_reference<
-           typename add_cv<T>::type
-        >::type
-    >
-{
-};
-
-# if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
-    && !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1310))
-// collapses a few more types to the same static instance.  MSVC7.1
-// fails to strip cv-qualification from array types in typeid.  For
-// some reason we can't use this collapse there or array converters
-// will not be found.
-template <class T>
-struct registered<T&>
-  : registered<T> {};
-# endif
-
-//
-// implementations
-//
-namespace detail
-{
-  template <class T>
-  registration const& registered_base<T>::converters
-     = registry::lookup(type_id<T>());
-}
-}}} // namespace boost::python::converter
-
-#endif // REGISTERED_DWA2002710_HPP
diff --git a/include/boost/python/converter/registered_pointee.hpp b/include/boost/python/converter/registered_pointee.hpp
deleted file mode 100644
index 861cf724..00000000
--- a/include/boost/python/converter/registered_pointee.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef REGISTERED_POINTEE_DWA2002710_HPP
-# define REGISTERED_POINTEE_DWA2002710_HPP
-# include <boost/python/converter/registered.hpp>
-# include <boost/python/converter/pointer_type_id.hpp>
-# include <boost/python/converter/registry.hpp>
-# include <boost/type_traits/transform_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-struct registration;
-
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-template <class T>
-struct registered_pointee
-    : registered<
-        typename remove_pointer<
-           typename remove_cv<
-              typename remove_reference<T>::type
-           >::type
-        >::type
-    >
-{
-};
-# else
-namespace detail
-{
-  template <class T>
-  struct registered_pointee_base
-  {
-      static registration const& converters;
-  };
-}
-
-template <class T>
-struct registered_pointee
-    : detail::registered_pointee_base<
-        typename add_reference<
-           typename add_cv<T>::type
-        >::type
-    >
-{
-};
-
-//
-// implementations
-//
-namespace detail
-{
-  template <class T>
-  registration const& registered_pointee_base<T>::converters
-     = registry::lookup(pointer_type_id<T>());
-}
-
-# endif 
-}}} // namespace boost::python::converter
-
-#endif // REGISTERED_POINTEE_DWA2002710_HPP
diff --git a/include/boost/python/converter/registrations.hpp b/include/boost/python/converter/registrations.hpp
deleted file mode 100644
index 8c76a504..00000000
--- a/include/boost/python/converter/registrations.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef REGISTRATIONS_DWA2002223_HPP
-# define REGISTRATIONS_DWA2002223_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/type_id.hpp>
-
-# include <boost/python/converter/convertible_function.hpp>
-# include <boost/python/converter/constructor_function.hpp>
-# include <boost/python/converter/to_python_function_type.hpp>
-
-# include <boost/detail/workaround.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-struct lvalue_from_python_chain
-{
-    convertible_function convert;
-    lvalue_from_python_chain* next;
-};
-
-struct rvalue_from_python_chain
-{
-    convertible_function convertible;
-    constructor_function construct;
-    rvalue_from_python_chain* next;
-};
-
-struct BOOST_PYTHON_DECL registration
-{
- public: // member functions
-    explicit registration(type_info);
-    
-    // Convert the appropriately-typed data to Python
-    PyObject* to_python(void const volatile*) const;
-
-    // Return the class object, or raise an appropriate Python
-    // exception if no class has been registered.
-    PyTypeObject* get_class_object() const;
-
- public: // data members. So sue me.
-    const python::type_info target_type;
-
-    // The chain of eligible from_python converters when an lvalue is required
-    lvalue_from_python_chain* lvalue_chain;
-
-    // The chain of eligible from_python converters when an rvalue is acceptable
-    rvalue_from_python_chain* rvalue_chain;
-    
-    // The class object associated with this type
-    PyTypeObject* m_class_object;
-
-    // The unique to_python converter for the associated C++ type.
-    to_python_function_t m_to_python;
-    
-# if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
- private:
-    void operator=(registration); // This is not defined, and just keeps MWCW happy.
-# endif 
-};
-
-//
-// implementations
-//
-inline registration::registration(type_info target_type)
-    : target_type(target_type)
-      , lvalue_chain(0)
-      , rvalue_chain(0)
-      , m_class_object(0)
-      , m_to_python(0)
-{}
-
-inline bool operator<(registration const& lhs, registration const& rhs)
-{
-    return lhs.target_type < rhs.target_type;
-}
-
-}}} // namespace boost::python::converter
-
-#endif // REGISTRATIONS_DWA2002223_HPP
diff --git a/include/boost/python/converter/registry.hpp b/include/boost/python/converter/registry.hpp
deleted file mode 100644
index ae09f53d..00000000
--- a/include/boost/python/converter/registry.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//  Copyright David Abrahams 2001. Permission to copy, use,
-//  modify, sell and distribute this software is granted provided this
-//  copyright notice appears in all copies. This software is provided
-//  "as is" without express or implied warranty, and with no claim as
-//  to its suitability for any purpose.
-#ifndef REGISTRY_DWA20011127_HPP
-# define REGISTRY_DWA20011127_HPP
-# include <boost/python/type_id.hpp>
-# include <boost/python/converter/to_python_function_type.hpp>
-# include <boost/python/converter/rvalue_from_python_data.hpp>
-# include <boost/python/converter/constructor_function.hpp>
-# include <boost/python/converter/convertible_function.hpp>
-
-namespace boost { namespace python { namespace converter {
-
-struct registration;
-
-// This namespace acts as a sort of singleton
-namespace registry
-{
-  // Get the registration corresponding to the type, creating it if neccessary
-  BOOST_PYTHON_DECL registration const& lookup(type_info);
-
-  // Return a pointer to the corresponding registration, if one exists
-  BOOST_PYTHON_DECL registration const* query(type_info);
-  
-  BOOST_PYTHON_DECL void insert(to_python_function_t, type_info);
-
-  // Insert an lvalue from_python converter
-  BOOST_PYTHON_DECL void insert(void* (*convert)(PyObject*), type_info);
-
-  // Insert an rvalue from_python converter
-  BOOST_PYTHON_DECL void insert(
-      convertible_function
-      , constructor_function
-      , type_info
-      );
-  
-  // Insert an rvalue from_python converter at the tail of the
-  // chain. Used for implicit conversions
-  BOOST_PYTHON_DECL void push_back(
-      convertible_function
-      , constructor_function
-      , type_info
-      );
-}
-
-}}} // namespace boost::python::converter
-
-#endif // REGISTRY_DWA20011127_HPP
diff --git a/include/boost/python/converter/return_from_python.hpp b/include/boost/python/converter/return_from_python.hpp
deleted file mode 100755
index 69c7a71b..00000000
--- a/include/boost/python/converter/return_from_python.hpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef RETURN_FROM_PYTHON_DWA200265_HPP
-# define RETURN_FROM_PYTHON_DWA200265_HPP
-
-# include <boost/python/converter/from_python.hpp>
-# include <boost/python/converter/rvalue_from_python_data.hpp>
-# include <boost/python/converter/registered.hpp>
-# include <boost/python/converter/registered_pointee.hpp>
-# include <boost/python/detail/void_ptr.hpp>
-# include <boost/python/detail/void_return.hpp>
-# include <boost/python/errors.hpp>
-# include <boost/type_traits/has_trivial_copy.hpp>
-# include <boost/mpl/and.hpp>
-# include <boost/mpl/bool.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-template <class T> struct is_object_manager;
-
-namespace detail
-{
-  template <class T>
-  struct return_pointer_from_python
-  {
-      typedef T result_type;
-      T operator()(PyObject*) const;
-  };
-  
-  template <class T>
-  struct return_reference_from_python
-  {
-      typedef T result_type;
-      T operator()(PyObject*) const;
-  };
-  
-  template <class T>
-  struct return_rvalue_from_python
-  {
-      typedef T result_type;
-
-      return_rvalue_from_python();
-      result_type operator()(PyObject*);
-   private:
-      rvalue_from_python_data<T> m_data;
-  };
-  
-  template <class T>
-  struct return_object_manager_from_python
-  {
-      typedef T result_type;
-      result_type operator()(PyObject*) const;
-  };
-  
-  template <class T>
-  struct select_return_from_python
-  {
-      BOOST_STATIC_CONSTANT(
-          bool, obj_mgr = is_object_manager<T>::value);
-
-      BOOST_STATIC_CONSTANT(
-          bool, ptr = is_pointer<T>::value);
-    
-      BOOST_STATIC_CONSTANT(
-          bool, ref = is_reference<T>::value);
-
-      typedef typename mpl::if_c<
-          obj_mgr
-          , return_object_manager_from_python<T>
-          , typename mpl::if_c<
-              ptr
-              , return_pointer_from_python<T>
-              , typename mpl::if_c<
-                  ref
-                  , return_reference_from_python<T>
-                  , return_rvalue_from_python<T>
-                >::type
-            >::type
-         >::type type;
-  };
-}
-
-template <class T>
-struct return_from_python
-    : detail::select_return_from_python<T>::type
-{
-};
-
-// Specialization as a convenience for call and call_method
-template <>
-struct return_from_python<void>
-{
-    typedef python::detail::returnable<void>::type result_type;
-    
-    result_type operator()(PyObject* x) const
-    {
-        (void_result_from_python)(x);
-# ifdef BOOST_NO_VOID_RETURNS
-        return result_type();
-# endif 
-    }
-};
-
-//
-// Implementations
-//
-namespace detail
-{
-  template <class T>
-  inline return_rvalue_from_python<T>::return_rvalue_from_python()
-      : m_data(
-          const_cast<registration*>(&registered<T>::converters)
-          )
-  {
-  }
-  
-  template <class T>
-  inline typename return_rvalue_from_python<T>::result_type
-  return_rvalue_from_python<T>::operator()(PyObject* obj)
-  {
-    // Take possession of the source object here.  If the result is in
-    // fact going to be a copy of an lvalue embedded in the object,
-    // and we take possession inside rvalue_result_from_python, it
-    // will be destroyed too early.
-    handle<> holder(obj);
-
-      return *(T*)
-          (rvalue_result_from_python)(obj, m_data.stage1);
-  }
-
-  template <class T>
-  inline T return_reference_from_python<T>::operator()(PyObject* obj) const
-  {
-      return python::detail::void_ptr_to_reference(
-          (reference_result_from_python)(obj, registered<T>::converters)
-          , (T(*)())0);
-  }
-
-  template <class T>
-  inline T return_pointer_from_python<T>::operator()(PyObject* obj) const
-  {
-      return T(
-          (pointer_result_from_python)(obj, registered_pointee<T>::converters)
-          );
-  }
-
-  template <class T>
-  inline T return_object_manager_from_python<T>::operator()(PyObject* obj) const
-  {
-      return T(
-          object_manager_traits<T>::adopt(expect_non_null(obj))
-          );
-  }
-}
-  
-}}} // namespace boost::python::converter
-
-#endif // RETURN_FROM_PYTHON_DWA200265_HPP
diff --git a/include/boost/python/converter/rvalue_from_python_data.hpp b/include/boost/python/converter/rvalue_from_python_data.hpp
deleted file mode 100644
index 91b5afd8..00000000
--- a/include/boost/python/converter/rvalue_from_python_data.hpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef FROM_PYTHON_AUX_DATA_DWA2002128_HPP
-# define FROM_PYTHON_AUX_DATA_DWA2002128_HPP
-
-# include <boost/python/converter/constructor_function.hpp>
-# include <boost/python/detail/referent_storage.hpp>
-# include <boost/python/detail/destroy.hpp>
-# include <boost/static_assert.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/type_traits/add_cv.hpp>
-# include <cstddef>
-
-// Data management for potential rvalue conversions from Python to C++
-// types. When a client requests a conversion to T* or T&, we
-// generally require that an object of type T exists in the source
-// Python object, and the code here does not apply**. This implements
-// conversions which may create new temporaries of type T. The classic
-// example is a conversion which converts a Python tuple to a
-// std::vector. Since no std::vector lvalue exists in the Python
-// object -- it must be created "on-the-fly" by the converter, and
-// which must manage the lifetime of the created object.
-//
-// Note that the client is not precluded from using a registered
-// lvalue conversion to T in this case. In other words, we will
-// happily accept a Python object which /does/ contain a std::vector
-// lvalue, provided an appropriate converter is registered. So, while
-// this is an rvalue conversion from the client's point-of-view, the
-// converter registry may serve up lvalue or rvalue conversions for
-// the target type.
-//
-// ** C++ argument from_python conversions to T const& are an
-// exception to the rule for references: since in C++, const
-// references can bind to temporary rvalues, we allow rvalue
-// converters to be chosen when the target type is T const& for some
-// T.
-namespace boost { namespace python { namespace converter { 
-
-// Conversions begin by filling in and returning a copy of this
-// structure. The process looks up a converter in the rvalue converter
-// registry for the target type. It calls the convertible() function
-// of each registered converter, passing the source PyObject* as an
-// argument, until a non-null result is returned. This result goes in
-// the convertible field, and the converter's construct() function is
-// stored in the construct field.
-//
-// If no appropriate converter is found, conversion fails and the
-// convertible field is null. When used in argument conversion for
-// wrapped C++ functions, it causes overload resolution to reject the
-// current function but not to fail completely. If an exception is
-// thrown, overload resolution stops and the exception propagates back
-// through the caller.
-//
-// If an lvalue converter is matched, its convertible() function is
-// expected to return a pointer to the stored T object; its
-// construct() function will be NULL. The convertible() function of
-// rvalue converters may return any non-singular pointer; the actual
-// target object will only be available once the converter's
-// construct() function is called.
-struct rvalue_from_python_stage1_data
-{
-    void* convertible;
-    constructor_function construct;
-};
-
-// Augments rvalue_from_python_stage1_data by adding storage for
-// constructing an object of remove_reference<T>::type. The
-// construct() function of rvalue converters (stored in m_construct
-// above) will cast the rvalue_from_python_stage1_data to an
-// appropriate instantiation of this template in order to access that
-// storage.
-template <class T>
-struct rvalue_from_python_storage
-{
-    rvalue_from_python_stage1_data stage1;
-
-    // Storage for the result, in case an rvalue must be constructed
-    typename python::detail::referent_storage<
-        typename add_reference<T>::type
-    >::type storage;
-};
-
-// Augments rvalue_from_python_storage<T> with a destructor. If
-// stage1.convertible == storage.bytes, it indicates that an object of
-// remove_reference<T>::type has been constructed in storage and
-// should will be destroyed in ~rvalue_from_python_data(). It is
-// crucial that successful rvalue conversions establish this equality
-// and that unsuccessful ones do not.
-template <class T>
-struct rvalue_from_python_data : rvalue_from_python_storage<T>
-{
-# if (!defined(__MWERKS__) || __MWERKS__ >= 0x3000) \
-        && (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 245) \
-        && (!defined(__DECCXX_VER) || __DECCXX_VER > 60590014) \
-        && !defined(BOOST_PYTHON_SYNOPSIS) /* Synopsis' OpenCXX has trouble parsing this */
-    // This must always be a POD struct with m_data its first member.
-    BOOST_STATIC_ASSERT(BOOST_PYTHON_OFFSETOF(rvalue_from_python_storage<T>,stage1) == 0);
-# endif
-    
-    // The usual constructor 
-    rvalue_from_python_data(rvalue_from_python_stage1_data const&);
-
-    // This constructor just sets m_convertible -- used by
-    // implicitly_convertible<> to perform the final step of the
-    // conversion, where the construct() function is already known.
-    rvalue_from_python_data(void* convertible);
-
-    // Destroys any object constructed in the storage.
-    ~rvalue_from_python_data();
- private:
-    typedef typename add_reference<typename add_cv<T>::type>::type ref_type;
-};
-
-//
-// Implementataions
-//
-template <class T>
-inline rvalue_from_python_data<T>::rvalue_from_python_data(rvalue_from_python_stage1_data const& stage1)
-{
-    this->stage1 = stage1;
-}
-
-template <class T>
-inline rvalue_from_python_data<T>::rvalue_from_python_data(void* convertible)
-{
-    this->stage1.convertible = convertible;
-}
-
-template <class T>
-inline rvalue_from_python_data<T>::~rvalue_from_python_data()
-{
-    if (this->stage1.convertible == this->storage.bytes)
-        python::detail::destroy_referent<ref_type>(this->storage.bytes);
-}
-
-}}} // namespace boost::python::converter
-
-#endif // FROM_PYTHON_AUX_DATA_DWA2002128_HPP
diff --git a/include/boost/python/converter/shared_ptr_deleter.hpp b/include/boost/python/converter/shared_ptr_deleter.hpp
deleted file mode 100644
index f2ebfc40..00000000
--- a/include/boost/python/converter/shared_ptr_deleter.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef SHARED_PTR_DELETER_DWA2002121_HPP
-# define SHARED_PTR_DELETER_DWA2002121_HPP
-
-namespace boost { namespace python { namespace converter { 
-
-struct BOOST_PYTHON_DECL shared_ptr_deleter
-{
-    shared_ptr_deleter(handle<> owner);
-    ~shared_ptr_deleter();
-
-    void operator()(void const*);
-        
-    handle<> owner;
-};
-
-}}} // namespace boost::python::converter
-
-#endif // SHARED_PTR_DELETER_DWA2002121_HPP
diff --git a/include/boost/python/converter/shared_ptr_from_python.hpp b/include/boost/python/converter/shared_ptr_from_python.hpp
deleted file mode 100644
index 1535740a..00000000
--- a/include/boost/python/converter/shared_ptr_from_python.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef SHARED_PTR_FROM_PYTHON_DWA20021130_HPP
-# define SHARED_PTR_FROM_PYTHON_DWA20021130_HPP
-
-# include <boost/python/handle.hpp>
-# include <boost/python/converter/shared_ptr_deleter.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-template <class T>
-struct shared_ptr_from_python
-{
-    shared_ptr_from_python()
-    {
-        converter::registry::insert(&convertible, &construct, type_id<shared_ptr<T> >());
-    }
-
-    static shared_ptr_from_python const registration;
- private:
-    static void* convertible(PyObject* p)
-    {
-        return p == Py_None
-            ? p
-            : converter::get_lvalue_from_python(p, registered<T>::converters)
-            ;
-    }
-    
-    static void construct(PyObject* source, rvalue_from_python_stage1_data* data)
-    {
-        void* const storage = ((converter::rvalue_from_python_storage<shared_ptr<T> >*)data)->storage.bytes;
-        // Deal with the "None" case.
-        if (data->convertible == source)
-            new (storage) shared_ptr<T>();
-        else
-            new (storage) shared_ptr<T>(
-                static_cast<T*>(data->convertible),
-                shared_ptr_deleter(handle<>(borrowed(source)))
-                );
-        
-        data->convertible = storage;
-    }
-};
-
-template <class T>
-shared_ptr_from_python<T> const shared_ptr_from_python<T>::registration;
-
-}}} // namespace boost::python::converter
-
-#endif // SHARED_PTR_FROM_PYTHON_DWA20021130_HPP
diff --git a/include/boost/python/converter/shared_ptr_to_python.hpp b/include/boost/python/converter/shared_ptr_to_python.hpp
deleted file mode 100644
index ac89aad0..00000000
--- a/include/boost/python/converter/shared_ptr_to_python.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef SHARED_PTR_TO_PYTHON_DWA2003224_HPP
-# define SHARED_PTR_TO_PYTHON_DWA2003224_HPP
-
-# include <boost/python/refcount.hpp>
-# include <boost/python/converter/shared_ptr_deleter.hpp>
-# include <boost/shared_ptr.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-template <class T>
-PyObject* shared_ptr_to_python(shared_ptr<T> const& x)
-{
-    if (!x)
-        return python::detail::none();
-    else if (shared_ptr_deleter* d = boost::get_deleter<shared_ptr_deleter>(x))
-        return incref(d->owner.get());
-    else
-        return converter::registered<shared_ptr<T> const&>::converters.to_python(&x);
-}
-
-}}} // namespace boost::python::converter
-
-#endif // SHARED_PTR_TO_PYTHON_DWA2003224_HPP
diff --git a/include/boost/python/converter/to_python_function_type.hpp b/include/boost/python/converter/to_python_function_type.hpp
deleted file mode 100644
index 336b1a27..00000000
--- a/include/boost/python/converter/to_python_function_type.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef TO_PYTHON_FUNCTION_TYPE_DWA200236_HPP
-# define TO_PYTHON_FUNCTION_TYPE_DWA200236_HPP
-# include <boost/python/detail/prefix.hpp>
-# include <boost/static_assert.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-// The type of stored function pointers which actually do conversion
-// by-value. The void* points to the object to be converted, and
-// type-safety is preserved through runtime registration.
-typedef PyObject* (*to_python_function_t)(void const*);
-
-}}} // namespace boost::python::converter
-
-#endif // TO_PYTHON_FUNCTION_TYPE_DWA200236_HPP
diff --git a/include/boost/python/copy_const_reference.hpp b/include/boost/python/copy_const_reference.hpp
deleted file mode 100644
index b0b96dc6..00000000
--- a/include/boost/python/copy_const_reference.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef COPY_CONST_REFERENCE_DWA2002131_HPP
-# define COPY_CONST_REFERENCE_DWA2002131_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/python/to_python_value.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  template <class R>
-  struct copy_const_reference_expects_a_const_reference_return_type
-# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
-  {}
-# endif
-  ;
-}
-
-template <class T> struct to_python_value;
-
-struct copy_const_reference
-{
-    template <class T>
-    struct apply
-    {
-        typedef typename mpl::if_c<
-            detail::is_reference_to_const<T>::value
-            , to_python_value<T>
-            , detail::copy_const_reference_expects_a_const_reference_return_type<T>
-        >::type type;
-    };
-};
-
-
-}} // namespace boost::python
-
-#endif // COPY_CONST_REFERENCE_DWA2002131_HPP
diff --git a/include/boost/python/copy_non_const_reference.hpp b/include/boost/python/copy_non_const_reference.hpp
deleted file mode 100644
index 35beec34..00000000
--- a/include/boost/python/copy_non_const_reference.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef COPY_NON_CONST_REFERENCE_DWA2002131_HPP
-# define COPY_NON_CONST_REFERENCE_DWA2002131_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/python/to_python_value.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  template <class R>
-  struct copy_non_const_reference_expects_a_non_const_reference_return_type
-# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
-  {}
-# endif
-  ;
-}
-
-template <class T> struct to_python_value;
-
-struct copy_non_const_reference
-{
-    template <class T>
-    struct apply
-    {
-        typedef typename mpl::if_c<
-            boost::python::detail::is_reference_to_non_const<T>::value
-            , to_python_value<T>
-            , detail::copy_non_const_reference_expects_a_non_const_reference_return_type<T>
-        >::type type;
-    };
-};
-
-
-}} // namespace boost::python
-
-#endif // COPY_NON_CONST_REFERENCE_DWA2002131_HPP
diff --git a/include/boost/python/data_members.hpp b/include/boost/python/data_members.hpp
deleted file mode 100644
index 733c8b43..00000000
--- a/include/boost/python/data_members.hpp
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DATA_MEMBERS_DWA2002328_HPP
-# define DATA_MEMBERS_DWA2002328_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/handle.hpp>
-
-# include <boost/python/return_value_policy.hpp>
-# include <boost/python/return_by_value.hpp>
-# include <boost/python/return_internal_reference.hpp>
-# include <boost/python/make_function.hpp>
-
-# include <boost/python/converter/builtin_converters.hpp>
-
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/python/detail/not_specified.hpp>
-
-# include <boost/type_traits/add_const.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/type_traits/is_member_pointer.hpp>
-
-# if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
-#  include <boost/type_traits/remove_cv.hpp>
-# endif 
-
-# include <boost/mpl/apply_if.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/mpl/vector/vector10.hpp>
-
-# include <boost/detail/workaround.hpp>
-
-namespace boost { namespace python { 
-
-//
-// This file defines the make_getter and make_setter function
-// families, which are responsible for turning pointers, references,
-// and pointers-to-data-members into callable Python objects which
-// can be used for attribute access on wrapped classes.
-//
-
-namespace detail
-{
-
-  // A small function object which handles the getting and setting of
-  // data members.
-  template <class Data, class Class>
-  struct member
-  {
-   private:
-      typedef typename add_const<Data>::type data_const;
-      typedef typename add_reference<data_const>::type data_cref;
-      
-   public:      
-      member(Data Class::*which) : m_which(which) {}
-      
-      Data& operator()(Class& c) const
-      {
-          return c.*m_which;
-      }
-
-      void operator()(Class& c, data_cref d) const
-      {
-          c.*m_which = d;
-      }
-   private:
-      Data Class::*m_which;
-  };
-
-  // A small function object which handles the getting and setting of
-  // non-member objects.
-  template <class Data>
-  struct datum
-  {
-   private:
-      typedef typename add_const<Data>::type data_const;
-      typedef typename add_reference<data_const>::type data_cref;
-      
-   public:      
-      datum(Data *which) : m_which(which) {}
-      
-      Data& operator()() const
-      {
-          return *m_which;
-      }
-
-      void operator()(data_cref d) const
-      {
-          *m_which = d;
-      }
-   private:
-      Data *m_which;
-  };
-  
-  //
-  // Helper metafunction for determining the default CallPolicy to use
-  // for attribute access.  If T is a [reference to a] class type X
-  // whose conversion to python would normally produce a new copy of X
-  // in a wrapped X class instance (as opposed to types such as
-  // std::string, which are converted to native Python types, and
-  // smart pointer types which produce a wrapped class instance of the
-  // pointee type), to-python conversions will attempt to produce an
-  // object which refers to the original C++ object, rather than a
-  // copy.  See default_member_getter_policy for rationale.
-  // 
-  template <class T>
-  struct default_getter_by_ref
-      : mpl::and_<
-          mpl::bool_<
-              to_python_value<
-                  typename add_reference<typename add_const<T>::type>::type
-              >::uses_registry
-          >
-        , is_reference_to_class<
-              typename add_reference<typename add_const<T>::type>::type
-          >
-       >
-  {
-  };
-
-  // Metafunction computing the default CallPolicy to use for reading
-  // data members
-  //
-  // If it's a regular class type (not an object manager or other
-  // type for which we have to_python specializations, use
-  // return_internal_reference so that we can do things like
-  //    x.y.z =  1
-  // and get the right result.
-  template <class T>
-  struct default_member_getter_policy
-    : mpl::if_<
-          default_getter_by_ref<T>
-        , return_internal_reference<>
-        , return_value_policy<return_by_value>
-      >
-  {};
-
-  // Metafunction computing the default CallPolicy to use for reading
-  // non-member data.
-  template <class T>
-  struct default_datum_getter_policy
-    : mpl::if_<
-          default_getter_by_ref<T>
-        , return_value_policy<reference_existing_object>
-        , return_value_policy<return_by_value>
-      >
-  {};
-
-  //
-  // make_getter helper function family -- These helpers to
-  // boost::python::make_getter are used to dispatch behavior.  The
-  // third argument is a workaround for a CWPro8 partial ordering bug
-  // with pointers to data members.  It should be convertible to
-  // mpl::true_ iff the first argument is a pointer-to-member, and
-  // mpl::false_ otherwise.  The fourth argument is for compilers
-  // which don't support partial ordering at all and should always be
-  // passed 0L.
-  //
-
-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-  template <class D, class P>
-  inline object make_getter(D& d, P& p, mpl::false_, ...);
-#endif
-
-  // Handle non-member pointers with policies
-  template <class D, class Policies>
-  inline object make_getter(D* d, Policies const& policies, mpl::false_, int)
-  {
-      return python::make_function(
-          detail::datum<D>(d), policies, mpl::vector1<D&>()
-      );
-  }
-  
-  // Handle non-member pointers without policies
-  template <class D>
-  inline object make_getter(D* d, not_specified, mpl::false_, long)
-  {
-      typedef typename default_datum_getter_policy<D>::type policies;
-      return detail::make_getter(d, policies(), mpl::false_(), 0);
-  }
-
-  // Handle pointers-to-members with policies
-  template <class C, class D, class Policies>
-  inline object make_getter(D C::*pm, Policies const& policies, mpl::true_, int)
-  {
-#if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
-      typedef typename remove_cv<C>::type Class;
-#else
-      typedef C Class;
-#endif 
-      return python::make_function(
-          detail::member<D,Class>(pm)
-        , policies
-        , mpl::vector2<D&,Class&>()
-      );
-  }
-      
-  // Handle pointers-to-members without policies
-  template <class C, class D>
-  inline object make_getter(D C::*pm, not_specified, mpl::true_, long)
-  {
-      typedef typename default_member_getter_policy<D>::type policies;
-      return detail::make_getter(pm, policies(), mpl::true_(), 0);
-  }
-
-  // Handle references
-  template <class D, class P>
-  inline object make_getter(D& d, P& p, mpl::false_, ...)
-  {
-      // Just dispatch to the handler for pointer types.
-      return detail::make_getter(&d, p, mpl::false_(), 0L);
-  }
-
-  //
-  // make_setter helper function family -- These helpers to
-  // boost::python::make_setter are used to dispatch behavior.  The
-  // third argument is for compilers which don't support partial
-  // ordering at all and should always be passed 0.
-  //
-
-  
-  // Handle non-member pointers
-  template <class D, class Policies>
-  inline object make_setter(D* p, Policies const& policies, mpl::false_, int)
-  {
-      return python::make_function(
-          detail::datum<D>(p), policies, mpl::vector2<void,D const&>()
-      );
-  }
-
-  // Handle pointers-to-members
-  template <class C, class D, class Policies>
-  inline object make_setter(D C::*pm, Policies const& policies, mpl::true_, int)
-  {
-      return python::make_function(
-          detail::member<D,C>(pm)
-        , policies
-        , mpl::vector3<void, C&, D const&>()
-      );
-  }
-
-  // Handle references
-  template <class D, class Policies>
-  inline object make_setter(D& x, Policies const& policies, mpl::false_, ...)
-  {
-      return detail::make_setter(&x, policies, mpl::false_(), 0L);
-  }
-}
-
-//
-// make_getter function family -- build a callable object which
-// retrieves data through the first argument and is appropriate for
-// use as the `get' function in Python properties .  The second,
-// policies argument, is optional.  We need both D& and D const&
-// overloads in order be able to handle rvalues.
-//
-template <class D, class Policies>
-inline object make_getter(D& d, Policies const& policies)
-{
-    return detail::make_getter(d, policies, is_member_pointer<D>(), 0L);
-}
-
-template <class D, class Policies>
-inline object make_getter(D const& d, Policies const& policies)
-{
-    return detail::make_getter(d, policies, is_member_pointer<D>(), 0L);
-}
-
-template <class D>
-inline object make_getter(D& x)
-{
-    detail::not_specified policy;
-    return detail::make_getter(x, policy, is_member_pointer<D>(), 0L);
-}
-
-#  if !BOOST_WORKAROUND(__EDG_VERSION__, <= 238) && !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-template <class D>
-inline object make_getter(D const& d)
-{
-    detail::not_specified policy;
-    return detail::make_getter(d, policy, is_member_pointer<D>(), 0L);
-}
-#  endif
-
-//
-// make_setter function family -- build a callable object which
-// writes data through the first argument and is appropriate for
-// use as the `set' function in Python properties .  The second,
-// policies argument, is optional.  We need both D& and D const&
-// overloads in order be able to handle rvalues.
-//
-template <class D, class Policies>
-inline object make_setter(D& x, Policies const& policies)
-{
-    return detail::make_setter(x, policies, is_member_pointer<D>(), 0);
-}
-
-template <class D, class Policies>
-inline object make_setter(D const& x, Policies const& policies)
-{
-    return detail::make_setter(x, policies, is_member_pointer<D>(), 0);
-}
-
-template <class D>
-inline object make_setter(D& x)
-{
-    return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0);
-}
-
-# if !(BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || BOOST_WORKAROUND(__EDG_VERSION__, <= 238))
-template <class D>
-inline object make_setter(D const& x)
-{
-    return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0);
-}
-# endif
-
-}} // namespace boost::python
-
-#endif // DATA_MEMBERS_DWA2002328_HPP
diff --git a/include/boost/python/def.hpp b/include/boost/python/def.hpp
deleted file mode 100644
index 894b6e08..00000000
--- a/include/boost/python/def.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DEF_DWA200292_HPP
-# define DEF_DWA200292_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/object_fwd.hpp>
-# include <boost/python/make_function.hpp>
-# include <boost/python/detail/def_helper.hpp>
-# include <boost/python/detail/overloads_fwd.hpp>
-# include <boost/python/scope.hpp>
-# include <boost/python/signature.hpp>
-# include <boost/python/detail/scope.hpp>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  namespace error
-  {
-    // Compile-time error messages
-    template <bool> struct multiple_functions_passed_to_def;
-    template <> struct multiple_functions_passed_to_def<false> { typedef char type; };
-  }
-  
-  //
-  // def_from_helper --
-  //
-  // Use a def_helper to define a regular wrapped function in the current scope.
-  template <class F, class Helper>
-  void def_from_helper(
-      char const* name, F const& fn, Helper const& helper)
-  {
-      // Must not try to use default implementations except with method definitions.
-      typedef typename error::multiple_functions_passed_to_def<
-          Helper::has_default_implementation
-          >::type assertion;
-      
-      detail::scope_setattr_doc(
-          name, boost::python::make_function(
-              fn
-              , helper.policies()
-              , helper.keywords())
-          , helper.doc()
-          );
-  }
-
-  //
-  // These two overloads discriminate between def() as applied to
-  // regular functions and def() as applied to the result of
-  // BOOST_PYTHON_FUNCTION_OVERLOADS(). The final argument is used to
-  // discriminate.
-  //
-  template <class Fn, class A1>
-  void
-  def_maybe_overloads(
-      char const* name
-      , Fn fn
-      , A1 const& a1
-      , ...)
-  {
-      detail::def_from_helper(name, fn, def_helper<A1>(a1));
-  }
-
-  template <class StubsT, class SigT>
-  void def_maybe_overloads(
-      char const* name
-      , SigT sig
-      , StubsT const& stubs
-      , detail::overloads_base const*)
-  {
-      scope current;
-      
-      detail::define_with_defaults(
-          name, stubs, current, detail::get_signature(sig));
-  }
-
-  template <class T>
-  object make_function1(T fn, ...) { return make_function(fn); }
-
-  inline
-  object make_function1(object const& x, object const*) { return x; }
-}
-
-template <class Fn>
-void def(char const* name, Fn fn)
-{
-    detail::scope_setattr_doc(name, detail::make_function1(fn, &fn), 0);
-}
-
-template <class Arg1T, class Arg2T>
-void def(char const* name, Arg1T arg1, Arg2T const& arg2)
-{
-    detail::def_maybe_overloads(name, arg1, arg2, &arg2);
-}
-
-template <class F, class A1, class A2>
-void def(char const* name, F f, A1 const& a1, A2 const& a2)
-{
-    detail::def_from_helper(name, f, detail::def_helper<A1,A2>(a1,a2));
-}
-
-template <class F, class A1, class A2, class A3>
-void def(char const* name, F f, A1 const& a1, A2 const& a2, A3 const& a3)
-{
-    detail::def_from_helper(name, f, detail::def_helper<A1,A2,A3>(a1,a2,a3));
-}
-
-}} // namespace boost::python
-
-#endif // DEF_DWA200292_HPP
diff --git a/include/boost/python/def_visitor.hpp b/include/boost/python/def_visitor.hpp
deleted file mode 100755
index 50c510f4..00000000
--- a/include/boost/python/def_visitor.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DEF_VISITOR_DWA2003810_HPP
-# define DEF_VISITOR_DWA2003810_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/detail/workaround.hpp>
-
-namespace boost { namespace python { 
-
-template <class DerivedVisitor> class def_visitor;
-template <class T, class X1, class X2, class X3> class class_;
-
-class def_visitor_access
-{
-# if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
-    // Tasteless as this may seem, making all members public allows member templates
-    // to work in the absence of member template friends.
- public:
-# else      
-    template <class Derived> friend class def_visitor;
-# endif
-    
-    // unnamed visit, c.f. init<...>, container suites
-    template <class V, class classT>
-    static void visit(V const& v, classT& c)
-    {
-        v.derived_visitor().visit(c);
-    }
-
-    // named visit, c.f. object, pure_virtual
-    template <class V, class classT, class OptionalArgs>
-    static void visit(
-        V const& v
-      , classT& c
-      , char const* name
-      , OptionalArgs const& options
-    ) 
-    {
-        v.derived_visitor().visit(c, name, options);
-    }
-    
-};
-
-
-template <class DerivedVisitor>
-class def_visitor
-{
-    friend class def_visitor_access;
-    
-# if defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)                  \
-    || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
-    // Tasteless as this may seem, making all members public allows member templates
-    // to work in the absence of member template friends.
- public:
-# else      
-    template <class T, class X1, class X2, class X3> friend class class_;
-# endif
-    
-    // unnamed visit, c.f. init<...>, container suites
-    template <class classT>
-    void visit(classT& c) const
-    {
-        def_visitor_access::visit(*this, c);
-    }
-
-    // named visit, c.f. object, pure_virtual
-    template <class classT, class OptionalArgs>
-    void visit(classT& c, char const* name, OptionalArgs const& options) const
-    {
-        def_visitor_access::visit(*this, c, name, options);
-    }
-    
- protected:
-    DerivedVisitor const& derived_visitor() const
-    {
-        return static_cast<DerivedVisitor const&>(*this);
-    }
-};
-
-}} // namespace boost::python
-
-#endif // DEF_VISITOR_DWA2003810_HPP
diff --git a/include/boost/python/default_call_policies.hpp b/include/boost/python/default_call_policies.hpp
deleted file mode 100644
index db4e4cd3..00000000
--- a/include/boost/python/default_call_policies.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DEFAULT_CALL_POLICIES_DWA2002131_HPP
-# define DEFAULT_CALL_POLICIES_DWA2002131_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/python/to_python_value.hpp>
-# include <boost/type_traits/transform_traits.hpp>
-
-namespace boost { namespace python { 
-
-template <class T> struct to_python_value;
-
-namespace detail
-{
-// for "readable" error messages
-  template <class T> struct specify_a_return_value_policy_to_wrap_functions_returning
-# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
-  {}
-# endif 
-  ;
-}
-
-struct default_result_converter;
-
-struct default_call_policies
-{
-    // Ownership of this argument tuple will ultimately be adopted by
-    // the caller.
-    template <class ArgumentPackage>
-    static bool precall(ArgumentPackage const&)
-    {
-        return true;
-    }
-
-    // Pass the result through
-    template <class ArgumentPackage>
-    static PyObject* postcall(ArgumentPackage const&, PyObject* result)
-    {
-        return result;
-    }
-
-    typedef default_result_converter result_converter;
-    typedef PyObject* argument_package;
-};
-
-struct default_result_converter
-{
-    template <class R>
-    struct apply
-    {
-        BOOST_STATIC_CONSTANT(bool, is_illegal = is_reference<R>::value || is_pointer<R>::value);
-        
-        typedef typename mpl::if_c<
-            is_illegal
-            , detail::specify_a_return_value_policy_to_wrap_functions_returning<R>
-            , boost::python::to_python_value<
-                typename add_reference<typename add_const<R>::type>::type
-                >
-        >::type type;
-    };
-};
-
-// Exceptions for c strings an PyObject*s
-template <>
-struct default_result_converter::apply<char const*>
-{
-    typedef boost::python::to_python_value<char const*const&> type;
-};
-
-template <>
-struct default_result_converter::apply<PyObject*>
-{
-    typedef boost::python::to_python_value<PyObject*const&> type;
-};
-
-}} // namespace boost::python
-
-#endif // DEFAULT_CALL_POLICIES_DWA2002131_HPP
diff --git a/include/boost/python/detail/aix_init_module.hpp b/include/boost/python/detail/aix_init_module.hpp
deleted file mode 100644
index 8a83bf63..00000000
--- a/include/boost/python/detail/aix_init_module.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef AIX_INIT_MODULE_DWA2002529_HPP
-# define AIX_INIT_MODULE_DWA2002529_HPP
-# ifdef _AIX
-# include <boost/python/detail/prefix.hpp>
-# include <cstdio>
-# ifdef __KCC
-#  include <iostream> // this works around a problem in KCC 4.0f
-# endif 
-
-namespace boost { namespace python { namespace detail { 
-
-extern "C"
-{
-    typedef PyObject* (*so_load_function)(char*,char*,FILE*);
-}
-
-void aix_init_module(so_load_function, char const* name, void (*init_module)());
-
-}}} // namespace boost::python::detail
-# endif
-
-#endif // AIX_INIT_MODULE_DWA2002529_HPP
diff --git a/include/boost/python/detail/api_placeholder.hpp b/include/boost/python/detail/api_placeholder.hpp
deleted file mode 100644
index 38a0d029..00000000
--- a/include/boost/python/detail/api_placeholder.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef BOOST_PYTHON_API_PLACE_HOLDER_HPP
-#define BOOST_PYTHON_API_PLACE_HOLDER_HPP
-
-namespace boost { namespace python {
-
-    inline long len(object const& obj)
-    {
-        long result = PyObject_Length(obj.ptr());
-        if (PyErr_Occurred()) throw_error_already_set();
-        return result;
-    }
-}} // namespace boost::python
-
-#endif // BOOST_PYTHON_API_PLACE_HOLDER_HPP
diff --git a/include/boost/python/detail/borrowed_ptr.hpp b/include/boost/python/detail/borrowed_ptr.hpp
deleted file mode 100755
index 6b35c862..00000000
--- a/include/boost/python/detail/borrowed_ptr.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef BORROWED_PTR_DWA20020601_HPP
-# define BORROWED_PTR_DWA20020601_HPP
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# include <boost/config.hpp>
-# include <boost/type.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/type_traits/object_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
-# include <boost/python/tag.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-template<class T> class borrowed
-{ 
-    typedef T type;
-};
-
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-template<typename T>
-struct is_borrowed_ptr
-{
-    BOOST_STATIC_CONSTANT(bool, value = false); 
-};
-
-#  if !defined(__MWERKS__) || __MWERKS__ > 0x3000
-template<typename T>
-struct is_borrowed_ptr<borrowed<T>*>
-{
-    BOOST_STATIC_CONSTANT(bool, value = true);
-};
-
-template<typename T>
-struct is_borrowed_ptr<borrowed<T> const*>
-{
-    BOOST_STATIC_CONSTANT(bool, value = true);
-};
-
-template<typename T>
-struct is_borrowed_ptr<borrowed<T> volatile*>
-{
-    BOOST_STATIC_CONSTANT(bool, value = true);
-};
-
-template<typename T>
-struct is_borrowed_ptr<borrowed<T> const volatile*>
-{
-    BOOST_STATIC_CONSTANT(bool, value = true);
-};
-#  else
-template<typename T>
-struct is_borrowed
-{
-    BOOST_STATIC_CONSTANT(bool, value = false);
-};
-template<typename T>
-struct is_borrowed<borrowed<T> >
-{
-    BOOST_STATIC_CONSTANT(bool, value = true);
-};
-template<typename T>
-struct is_borrowed_ptr<T*>
-    : is_borrowed<typename remove_cv<T>::type>
-{
-};
-#  endif 
-
-# else // no partial specialization
-
-typedef char (&yes_borrowed_ptr_t)[1];
-typedef char (&no_borrowed_ptr_t)[2];
-
-no_borrowed_ptr_t is_borrowed_ptr_test(...);
-
-template <class T>
-typename mpl::if_c<
-    is_pointer<T>::value
-    , T
-    , int
-    >::type
-is_borrowed_ptr_test1(boost::type<T>);
-
-template<typename T>
-yes_borrowed_ptr_t is_borrowed_ptr_test(borrowed<T> const volatile*);
-
-template<typename T>
-class is_borrowed_ptr
-{
- public:
-    BOOST_STATIC_CONSTANT(
-        bool, value = (
-            sizeof(detail::is_borrowed_ptr_test(is_borrowed_ptr_test1(boost::type<T>())))
-            == sizeof(detail::yes_borrowed_ptr_t)));
-};
-
-# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-
-}
-
-template <class T>
-inline T* get_managed_object(detail::borrowed<T> const volatile* p, tag_t)
-{
-    return (T*)p;
-}
-
-}} // namespace boost::python::detail
-
-#endif // #ifndef BORROWED_PTR_DWA20020601_HPP
diff --git a/include/boost/python/detail/caller.hpp b/include/boost/python/detail/caller.hpp
deleted file mode 100644
index 7682a91d..00000000
--- a/include/boost/python/detail/caller.hpp
+++ /dev/null
@@ -1,237 +0,0 @@
-#if !defined(BOOST_PP_IS_ITERATING)
-
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# ifndef CALLER_DWA20021121_HPP
-#  define CALLER_DWA20021121_HPP
-
-#  include <boost/python/type_id.hpp>
-#  include <boost/python/handle.hpp>
-
-#  include <boost/python/detail/invoke.hpp>
-#  include <boost/python/detail/signature.hpp>
-#  include <boost/python/detail/preprocessor.hpp>
-
-#  include <boost/python/arg_from_python.hpp>
-#  include <boost/python/converter/context_result_converter.hpp>
-
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/cat.hpp>
-#  include <boost/preprocessor/dec.hpp>
-#  include <boost/preprocessor/if.hpp>
-#  include <boost/preprocessor/iteration/local.hpp>
-#  include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#  include <boost/preprocessor/repetition/repeat.hpp>
-
-#  include <boost/compressed_pair.hpp>
-
-#  include <boost/type_traits/is_same.hpp>
-#  include <boost/type_traits/is_convertible.hpp>
-
-#  include <boost/mpl/apply.hpp>
-#  include <boost/mpl/apply_if.hpp>
-#  include <boost/mpl/identity.hpp>
-#  include <boost/mpl/size.hpp>
-#  include <boost/mpl/at.hpp>
-#  include <boost/mpl/int.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-#  if 0 // argpkg
-template <class N>
-inline PyObject* get(N, PyObject* const& args_)
-{
-    return PyTuple_GET_ITEM(args_,N::value);
-}
-#  else
-template <unsigned N>
-inline PyObject* get(PyObject* const& args_ BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(unsigned,N))
-{
-    return PyTuple_GET_ITEM(args_,N);
-}
-#  endif 
-
-inline unsigned arity(PyObject* const& args_)
-{
-    return PyTuple_GET_SIZE(args_);
-}
-
-// This "result converter" is really just used as
-// a dispatch tag to invoke(...), selecting the appropriate
-// implementation
-typedef int void_result_to_python;
-
-// Given a model of CallPolicies and a C++ result type, this
-// metafunction selects the appropriate converter to use for
-// converting the result to python.
-template <class Policies, class Result>
-struct select_result_converter
-  : mpl::apply_if<
-        is_same<Result,void>
-      , mpl::identity<void_result_to_python>
-      , mpl::apply1<typename Policies::result_converter,Result>
-    >
-{
-};
-
-template <class ArgPackage, class ResultConverter>
-inline ResultConverter create_result_converter(
-    ArgPackage const& args_
-  , ResultConverter*
-  , converter::context_result_converter*
-)
-{
-    return ResultConverter(args_);
-}
-    
-template <class ArgPackage, class ResultConverter>
-inline ResultConverter create_result_converter(
-    ArgPackage const& args_
-  , ResultConverter*
-  , ...
-)
-{
-    return ResultConverter();
-}
-    
-template <unsigned> struct caller_arity;
-
-template <class F, class CallPolicies, class Sig>
-struct caller;
-
-#  define BOOST_PYTHON_NEXT(init,name,n)                                                        \
-     typedef BOOST_PP_IF(n,typename BOOST_PP_CAT(name,BOOST_PP_DEC(n)) ::next, init) name##n;
-
-#  if 0 // argpkg
-#  define BOOST_PYTHON_ARG_CONVERTER(n)                                         \
-     BOOST_PYTHON_NEXT(typename first::next, arg_iter,n)                        \
-     typedef arg_from_python<BOOST_DEDUCED_TYPENAME arg_iter##n::type> c_t##n;  \
-     c_t##n c##n(get(mpl::int_<n>(), inner_args));                              \
-     if (!c##n.convertible())                                                   \
-          return 0;
-# else
-#  define BOOST_PYTHON_ARG_CONVERTER(n)                                         \
-     BOOST_PYTHON_NEXT(typename first::next, arg_iter,n)                        \
-     typedef arg_from_python<BOOST_DEDUCED_TYPENAME arg_iter##n::type> c_t##n;  \
-     c_t##n c##n(get<n>(inner_args));                                           \
-     if (!c##n.convertible())                                                   \
-          return 0;
-# endif
-
-#  define BOOST_PP_ITERATION_PARAMS_1                                            \
-        (3, (0, BOOST_PYTHON_MAX_ARITY + 1, <boost/python/detail/caller.hpp>))
-#  include BOOST_PP_ITERATE()
-
-#  undef BOOST_PYTHON_ARG_CONVERTER
-#  undef BOOST_PYTHON_NEXT
-
-// A metafunction returning the base class used for caller<class F,
-// class ConverterGenerators, class CallPolicies, class Sig>.
-template <class F, class CallPolicies, class Sig>
-struct caller_base_select
-{
-    enum { arity = mpl::size<Sig>::value - 1 };
-    typedef typename caller_arity<arity>::template impl<F,CallPolicies,Sig> type;
-};
-
-// A function object type which wraps C++ objects as Python callable
-// objects.
-//
-// Template Arguments:
-//
-//   F -
-//      the C++ `function object' that will be called. Might
-//      actually be any data for which an appropriate invoke_tag() can
-//      be generated. invoke(...) takes care of the actual invocation syntax.
-//
-//   CallPolicies -
-//      The precall, postcall, and what kind of resultconverter to
-//      generate for mpl::front<Sig>::type
-//
-//   Sig -
-//      The `intended signature' of the function. An MPL sequence
-//      beginning with a result type and continuing with a list of
-//      argument types.
-template <class F, class CallPolicies, class Sig>
-struct caller
-    : caller_base_select<F,CallPolicies,Sig>::type
-{
-    typedef typename caller_base_select<
-        F,CallPolicies,Sig
-        >::type base;
-
-    typedef PyObject* result_type;
-    
-    caller(F f, CallPolicies p) : base(f,p) {}
-
-};
-
-}}} // namespace boost::python::detail
-
-# endif // CALLER_DWA20021121_HPP
-
-#else
-
-# define N BOOST_PP_ITERATION()
-
-template <>
-struct caller_arity<N>
-{
-    template <class F, class Policies, class Sig>
-    struct impl
-    {
-        impl(F f, Policies p) : m_data(f,p) {}
-
-        PyObject* operator()(PyObject* args_, PyObject*) // eliminate
-                                                         // this
-                                                         // trailing
-                                                         // keyword dict
-        {
-            typedef typename mpl::begin<Sig>::type first;
-            typedef typename first::type result_t;
-            typedef typename select_result_converter<Policies, result_t>::type result_converter;
-            typedef typename Policies::argument_package argument_package;
-            
-            argument_package inner_args(args_);
-
-# if N
-#  define BOOST_PP_LOCAL_MACRO(i) BOOST_PYTHON_ARG_CONVERTER(i)
-#  define BOOST_PP_LOCAL_LIMITS (0, N-1)
-#  include BOOST_PP_LOCAL_ITERATE()
-# endif 
-            // all converters have been checked. Now we can do the
-            // precall part of the policy
-            if (!m_data.second().precall(inner_args))
-                return 0;
-
-            PyObject* result = detail::invoke(
-                detail::invoke_tag<result_t,F>()
-              , create_result_converter(args_, (result_converter*)0, (result_converter*)0)
-              , m_data.first()
-                BOOST_PP_ENUM_TRAILING_PARAMS(N, c)
-            );
-            
-            return m_data.second().postcall(inner_args, result);
-        }
-
-        static unsigned min_arity() { return N; }
-        
-        static signature_element const* signature()
-        {
-            return detail::signature<Sig>::elements();
-        }
-        
-     private:
-        compressed_pair<F,Policies> m_data;
-    };
-};
-
-
-
-#endif // BOOST_PP_IS_ITERATING 
-
-
diff --git a/include/boost/python/detail/char_array.hpp b/include/boost/python/detail/char_array.hpp
deleted file mode 100644
index d68aea47..00000000
--- a/include/boost/python/detail/char_array.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CHAR_ARRAY_DWA2002129_HPP
-# define CHAR_ARRAY_DWA2002129_HPP
-
-namespace boost { namespace python { namespace detail { 
-
-// This little package is used to transmit the number of arguments
-// from the helper functions below to the sizeof() expression below.
-// Because we can never have an array of fewer than 1 element, we
-// add 1 to n and then subtract 1 from the result of sizeof() below.
-template <int n>
-struct char_array
-{
-    char elements[n+1];
-};
-
-}}} // namespace boost::python::detail
-
-#endif // CHAR_ARRAY_DWA2002129_HPP
diff --git a/include/boost/python/detail/config.hpp b/include/boost/python/detail/config.hpp
deleted file mode 100644
index 142f56c1..00000000
--- a/include/boost/python/detail/config.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//  (C) Copyright David Abrahams 2000. Permission to copy, use, modify, sell and
-//  distribute this software is granted provided this copyright notice appears
-//  in all copies. This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-//  The author gratefully acknowleges the support of Dragon Systems, Inc., in
-//  producing this work.
-
-//  Revision History:
-//  04 Mar 01  Some fixes so it will compile with Intel C++ (Dave Abrahams)
-
-#ifndef CONFIG_DWA052200_H_
-# define CONFIG_DWA052200_H_
-
-# include <boost/config.hpp>
-
-# ifdef BOOST_NO_OPERATORS_IN_NAMESPACE
-   // A gcc bug forces some symbols into the global namespace
-#  define BOOST_PYTHON_BEGIN_CONVERSION_NAMESPACE
-#  define BOOST_PYTHON_END_CONVERSION_NAMESPACE
-#  define BOOST_PYTHON_CONVERSION
-#  define BOOST_PYTHON_IMPORT_CONVERSION(x) using ::x
-# else
-#  define BOOST_PYTHON_BEGIN_CONVERSION_NAMESPACE namespace boost { namespace python {
-#  define BOOST_PYTHON_END_CONVERSION_NAMESPACE }} // namespace boost::python
-#  define BOOST_PYTHON_CONVERSION boost::python
-#  define BOOST_PYTHON_IMPORT_CONVERSION(x) void never_defined() // so we can follow the macro with a ';'
-# endif
-
-# if defined(BOOST_MSVC)
-#  if _MSC_VER <= 1200
-#   define BOOST_MSVC6_OR_EARLIER 1
-#  endif
-
-# pragma warning (disable : 4786) // disable truncated debug symbols
-# pragma warning (disable : 4251) // disable exported dll function
-# pragma warning (disable : 4800) //'int' : forcing value to bool 'true' or 'false'
-# pragma warning (disable : 4275) // non dll-interface class
-
-# elif defined(__ICL) && __ICL < 600 // Intel C++ 5
-
-#  pragma warning(disable: 985) // identifier was truncated in debug information
-
-# endif
-
-// The STLport puts all of the standard 'C' library names in std (as far as the
-// user is concerned), but without it you need a fix if you're using MSVC or
-// Intel C++
-# if defined(BOOST_MSVC_STD_ITERATOR)
-#  define BOOST_CSTD_
-# else
-#  define BOOST_CSTD_ std
-# endif
-
-/*****************************************************************************
- *
- *  Set up dll import/export options:
- *
- ****************************************************************************/
-
-// backwards compatibility:
-#ifdef BOOST_PYTHON_STATIC_LIB
-#  define BOOST_PYTHON_STATIC_LINK
-# elif !defined(BOOST_PYTHON_DYNAMIC_LIB)
-#  define BOOST_PYTHON_DYNAMIC_LIB
-#endif
-
-#if defined(__MWERKS__) \
-  || (defined(__DECCXX_VER) && __DECCXX_VER <= 60590002) \
-  || (defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
-# define BOOST_PYTHON_NO_TEMPLATE_EXPORT
-#endif
-
-#if defined(BOOST_PYTHON_DYNAMIC_LIB) && (defined(_WIN32) || defined(__CYGWIN__))
-#  if defined(BOOST_PYTHON_SOURCE)
-#     define BOOST_PYTHON_DECL __declspec(dllexport)
-#     define BOOST_PYTHON_BUILD_DLL
-#  else
-#     define BOOST_PYTHON_DECL __declspec(dllimport)
-#  endif
-
-// MinGW, at least, has some problems exporting template instantiations
-#  if defined(__GNUC__) && __GNUC__ < 3 && !defined(__CYGWIN__)
-#   define BOOST_PYTHON_NO_TEMPLATE_EXPORT
-#  endif
-
-#endif
-
-#ifndef BOOST_PYTHON_DECL
-#  define BOOST_PYTHON_DECL
-#endif
-
-#ifndef BOOST_PYTHON_EXPORT
-# define BOOST_PYTHON_EXPORT extern
-#endif 
-
-#if !defined(BOOST_PYTHON_NO_TEMPLATE_EXPORT)
-# define BOOST_PYTHON_EXPORT_CLASS_TEMPLATE(instantiation) BOOST_PYTHON_EXPORT template class BOOST_PYTHON_DECL instantiation
-#else
-# define BOOST_PYTHON_EXPORT_CLASS_TEMPLATE(instantiation) struct ThIsTyPeNeVeRuSeD
-#endif
-
-#if (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031)
-// Replace broken Tru64/cxx offsetof macro
-# define BOOST_PYTHON_OFFSETOF(s_name, s_member) \
-        ((size_t)__INTADDR__(&(((s_name *)0)->s_member)))
-#else
-# define BOOST_PYTHON_OFFSETOF offsetof
-#endif
-
-#endif // CONFIG_DWA052200_H_
diff --git a/include/boost/python/detail/construct.hpp b/include/boost/python/detail/construct.hpp
deleted file mode 100644
index f7b747f6..00000000
--- a/include/boost/python/detail/construct.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CONSTRUCT_REFERENCE_DWA2002716_HPP
-# define CONSTRUCT_REFERENCE_DWA2002716_HPP
-
-namespace boost { namespace python { namespace detail { 
-
-template <class T, class Arg>
-void construct_pointee(void* storage, Arg& x
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-                       , T const volatile*
-# else 
-                       , T const*
-# endif 
-    )
-{
-    new (storage) T(x);
-}
-
-template <class T, class Arg>
-void construct_referent_impl(void* storage, Arg& x, T&(*)())
-{
-    construct_pointee(storage, x, (T*)0);
-}
-
-template <class T, class Arg>
-void construct_referent(void* storage, Arg const& x, T(*tag)() = 0)
-{
-    construct_referent_impl(storage, x, tag);
-}
-
-template <class T, class Arg>
-void construct_referent(void* storage, Arg& x, T(*tag)() = 0)
-{
-    construct_referent_impl(storage, x, tag);
-}
-
-}}} // namespace boost::python::detail
-
-#endif // CONSTRUCT_REFERENCE_DWA2002716_HPP
diff --git a/include/boost/python/detail/convertible.hpp b/include/boost/python/detail/convertible.hpp
deleted file mode 100755
index 74440090..00000000
--- a/include/boost/python/detail/convertible.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CONVERTIBLE_DWA2002614_HPP
-# define CONVERTIBLE_DWA2002614_HPP
-
-# if defined(__EDG_VERSION__) && __EDG_VERSION__ <= 241
-#  include <boost/mpl/if.hpp>
-#  include <boost/type_traits/conversion_traits.hpp>
-# endif 
-
-// Supplies a runtime is_convertible check which can be used with tag
-// dispatching to work around the Metrowerks Pro7 limitation with boost::is_convertible
-namespace boost { namespace python { namespace detail { 
-
-typedef char* yes_convertible;
-typedef int* no_convertible;
-
-template <class Target>
-struct convertible
-{
-# if !defined(__EDG_VERSION__) || __EDG_VERSION__ > 241 || __EDG_VERSION__ == 238
-    static inline no_convertible check(...) { return 0; }
-    static inline yes_convertible check(Target) { return 0; }
-# else
-    template <class X>
-    static inline typename mpl::if_c<
-        is_convertible<X,Target>::value
-        , yes_convertible
-        , no_convertible
-        >::type check(X const&) { return 0; }
-# endif 
-};
-
-}}} // namespace boost::python::detail
-
-#endif // CONVERTIBLE_DWA2002614_HPP
diff --git a/include/boost/python/detail/copy_ctor_mutates_rhs.hpp b/include/boost/python/detail/copy_ctor_mutates_rhs.hpp
deleted file mode 100755
index b1613924..00000000
--- a/include/boost/python/detail/copy_ctor_mutates_rhs.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef COPY_CTOR_MUTATES_RHS_DWA2003219_HPP
-# define COPY_CTOR_MUTATES_RHS_DWA2003219_HPP
-
-#include <boost/python/detail/is_auto_ptr.hpp>
-#include <boost/mpl/bool.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-template <class T>
-struct copy_ctor_mutates_rhs
-    : is_auto_ptr<T>
-{
-};
-
-}}} // namespace boost::python::detail
-
-#endif // COPY_CTOR_MUTATES_RHS_DWA2003219_HPP
diff --git a/include/boost/python/detail/cv_category.hpp b/include/boost/python/detail/cv_category.hpp
deleted file mode 100644
index e8c91d07..00000000
--- a/include/boost/python/detail/cv_category.hpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CV_CATEGORY_DWA200222_HPP
-# define CV_CATEGORY_DWA200222_HPP
-# include <boost/type_traits/cv_traits.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-template <bool is_const_, bool is_volatile_>
-struct cv_tag
-{
-    BOOST_STATIC_CONSTANT(bool, is_const = is_const_);
-    BOOST_STATIC_CONSTANT(bool, is_volatile = is_const_);
-};
-
-typedef cv_tag<false,false> cv_unqualified;
-typedef cv_tag<true,false> const_;
-typedef cv_tag<false,true> volatile_;
-typedef cv_tag<true,true> const_volatile_;
-
-template <class T>
-struct cv_category
-{
-//    BOOST_STATIC_CONSTANT(bool, c = is_const<T>::value);
-//    BOOST_STATIC_CONSTANT(bool, v = is_volatile<T>::value);
-    typedef cv_tag<
-        ::boost::is_const<T>::value
-      , ::boost::is_volatile<T>::value
-    > type;
-};
-
-}}} // namespace boost::python::detail
-
-#endif // CV_CATEGORY_DWA200222_HPP
diff --git a/include/boost/python/detail/dealloc.hpp b/include/boost/python/detail/dealloc.hpp
deleted file mode 100644
index dd708bc4..00000000
--- a/include/boost/python/detail/dealloc.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright Gottfried Ganßauge 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# ifndef BOOST_PYTHON_DETAIL_DEALLOC_HPP_
-# define BOOST_PYTHON_DETAIL_DEALLOC_HPP_
-namespace boost { namespace python { namespace detail {
-    extern "C"
-    {
-        inline void dealloc(PyObject* self)
-        {
-          PyObject_Del(self);
-        }
-    }
-}}} // namespace boost::python::detail
-# endif	// BOOST_PYTHON_DETAIL_DEALLOC_HPP_
diff --git a/include/boost/python/detail/decorated_type_id.hpp b/include/boost/python/detail/decorated_type_id.hpp
deleted file mode 100755
index c43a4160..00000000
--- a/include/boost/python/detail/decorated_type_id.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DECORATED_TYPE_ID_DWA2002517_HPP
-# define DECORATED_TYPE_ID_DWA2002517_HPP
-
-# include <boost/python/type_id.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-struct decorated_type_info : totally_ordered<decorated_type_info>
-{
-    enum decoration { const_ = 0x1, volatile_ = 0x2, reference = 0x4 };
-    
-    decorated_type_info(type_info, decoration = decoration());
-
-    inline bool operator<(decorated_type_info const& rhs) const;
-    inline bool operator==(decorated_type_info const& rhs) const;
-
-    friend BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream&, decorated_type_info const&);
-
-    operator type_info const&() const;
- private: // type
-    typedef type_info base_id_t;
-    
- private: // data members
-    decoration m_decoration;
-    base_id_t m_base_type;
-};
-
-template <class T>
-inline decorated_type_info decorated_type_id(boost::type<T>* = 0)
-{
-    return decorated_type_info(
-        type_id<T>()
-        , decorated_type_info::decoration(
-            (is_const<T>::value || python::detail::is_reference_to_const<T>::value
-             ? decorated_type_info::const_ : 0)
-            | (is_volatile<T>::value || python::detail::is_reference_to_volatile<T>::value
-               ? decorated_type_info::volatile_ : 0)
-            | (is_reference<T>::value ? decorated_type_info::reference : 0)
-            )
-        );
-}
-
-inline decorated_type_info::decorated_type_info(type_info base_t, decoration decoration)
-    : m_decoration(decoration)
-    , m_base_type(base_t)
-{
-}
-
-inline bool decorated_type_info::operator<(decorated_type_info const& rhs) const
-{
-    return m_decoration < rhs.m_decoration
-        || m_decoration == rhs.m_decoration
-           && m_base_type < rhs.m_base_type;
-}
-
-inline bool decorated_type_info::operator==(decorated_type_info const& rhs) const
-{
-    return m_decoration == rhs.m_decoration && m_base_type == rhs.m_base_type;
-}
-
-inline decorated_type_info::operator type_info const&() const
-{
-    return m_base_type;
-}
-
-BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream&, decorated_type_info const&);
-
-}}} // namespace boost::python::detail
-
-#endif // DECORATED_TYPE_ID_DWA2002517_HPP
diff --git a/include/boost/python/detail/decref_guard.hpp b/include/boost/python/detail/decref_guard.hpp
deleted file mode 100644
index 67455706..00000000
--- a/include/boost/python/detail/decref_guard.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DECREF_GUARD_DWA20021220_HPP
-# define DECREF_GUARD_DWA20021220_HPP
-
-namespace boost { namespace python { namespace detail { 
-
-struct decref_guard
-{
-    decref_guard(PyObject* o) : obj(o) {}
-    ~decref_guard() { Py_XDECREF(obj); }
-    void cancel() { obj = 0; }
- private:
-    PyObject* obj;
-};
-
-}}} // namespace boost::python::detail
-
-#endif // DECREF_GUARD_DWA20021220_HPP
diff --git a/include/boost/python/detail/def_helper.hpp b/include/boost/python/detail/def_helper.hpp
deleted file mode 100644
index 12ed5099..00000000
--- a/include/boost/python/detail/def_helper.hpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DEF_HELPER_DWA200287_HPP
-# define DEF_HELPER_DWA200287_HPP
-
-# include <boost/python/args.hpp>
-# include <boost/type_traits/ice.hpp>
-# include <boost/type_traits/same_traits.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/mpl/not.hpp>
-# include <boost/mpl/and.hpp>
-# include <boost/mpl/or.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/mpl/lambda.hpp>
-# include <boost/mpl/apply.hpp>
-# include <boost/tuple/tuple.hpp>
-# include <boost/python/detail/not_specified.hpp>
-# include <boost/python/detail/def_helper_fwd.hpp>
-
-namespace boost { namespace python {
-
-struct default_call_policies;
-
-namespace detail
-{
-  // tuple_extract<Tuple,Predicate>::extract(t) returns the first
-  // element of a Tuple whose type E satisfies the given Predicate
-  // applied to add_reference<E>. The Predicate must be an MPL
-  // metafunction class.
-  template <class Tuple, class Predicate>
-  struct tuple_extract;
-
-  // Implementation class for when the tuple's head type does not
-  // satisfy the Predicate
-  template <bool matched>
-  struct tuple_extract_impl
-  {
-      template <class Tuple, class Predicate>
-      struct apply
-      {
-          typedef typename Tuple::head_type result_type;
-          
-          static typename Tuple::head_type extract(Tuple const& x)
-          {
-              return x.get_head();
-          }
-      };
-  };
-
-  // Implementation specialization for when the tuple's head type
-  // satisfies the predicate
-  template <>
-  struct tuple_extract_impl<false>
-  {
-      template <class Tuple, class Predicate>
-      struct apply
-      {
-          // recursive application of tuple_extract on the tail of the tuple
-          typedef tuple_extract<typename Tuple::tail_type, Predicate> next;
-          typedef typename next::result_type result_type;
-          
-          static result_type extract(Tuple const& x)
-          {
-              return next::extract(x.get_tail());
-          }
-      };
-  };
-
-  // A metafunction which selects a version of tuple_extract_impl to
-  // use for the implementation of tuple_extract
-  template <class Tuple, class Predicate>
-  struct tuple_extract_base_select
-  {
-      typedef typename Tuple::head_type head_type;
-      typedef typename mpl::apply1<Predicate, typename add_reference<head_type>::type>::type match_t;
-      BOOST_STATIC_CONSTANT(bool, match = match_t::value);
-      typedef typename tuple_extract_impl<match>::template apply<Tuple,Predicate> type;
-  };
-  
-  template <class Tuple, class Predicate>
-  struct tuple_extract
-      : tuple_extract_base_select<
-         Tuple
-         , typename mpl::lambda<Predicate>::type
-      >::type
-  {
-  };
-
-
-  //
-  // Specialized extractors for the docstring, keywords, CallPolicies,
-  // and default implementation of virtual functions
-  //
-
-  template <class Tuple>
-  struct doc_extract
-      : tuple_extract<
-        Tuple
-        , mpl::not_<
-           mpl::or_<
-              is_reference_to_class<mpl::_1>
-              , is_reference_to_member_function_pointer<mpl::_1 >
-           >
-        >
-     >
-  {
-  };
-  
-  template <class Tuple>
-  struct keyword_extract
-      : tuple_extract<Tuple, is_reference_to_keywords<mpl::_1 > >
-  {
-  };
-
-  template <class Tuple>
-  struct policy_extract
-      : tuple_extract<
-          Tuple
-          , mpl::and_<
-             mpl::not_<is_same<not_specified const&,mpl::_1> >
-               , is_reference_to_class<mpl::_1 >
-               , mpl::not_<is_reference_to_keywords<mpl::_1 > >
-          >
-        >
-  {
-  };
-
-  template <class Tuple>
-  struct default_implementation_extract
-      : tuple_extract<
-          Tuple
-          , is_reference_to_member_function_pointer<mpl::_1 >
-          >
-  {
-  };
-
-  //
-  // A helper class for decoding the optional arguments to def()
-  // invocations, which can be supplied in any order and are
-  // discriminated by their type properties. The template parameters
-  // are expected to be the types of the actual (optional) arguments
-  // passed to def().
-  //
-  template <class T1, class T2, class T3, class T4>
-  struct def_helper
-  {
-      // A tuple type which begins with references to the supplied
-      // arguments and ends with actual representatives of the default
-      // types.
-      typedef boost::tuples::tuple<
-          T1 const&
-          , T2 const&
-          , T3 const&
-          , T4 const&
-          , default_call_policies
-          , keywords<0>
-          , char const*
-          , void(not_specified::*)()   // A function pointer type which is never an
-                                       // appropriate default implementation
-          > all_t;
-
-      // Constructors; these initialize an member of the tuple type
-      // shown above.
-      def_helper(T1 const& a1) : m_all(a1,m_nil,m_nil,m_nil) {}
-      def_helper(T1 const& a1, T2 const& a2) : m_all(a1,a2,m_nil,m_nil) {}
-      def_helper(T1 const& a1, T2 const& a2, T3 const& a3) : m_all(a1,a2,a3,m_nil) {}
-      def_helper(T1 const& a1, T2 const& a2, T3 const& a3, T4 const& a4) : m_all(a1,a2,a3,a4) {}
-
-   private: // types
-      typedef typename default_implementation_extract<all_t>::result_type default_implementation_t;
-      
-   public: // Constants which can be used for static assertions.
-
-      // Users must not supply a default implementation for non-class
-      // methods.
-      BOOST_STATIC_CONSTANT(
-          bool, has_default_implementation = (
-              !is_same<default_implementation_t, void(not_specified::*)()>::value));
-      
-   public: // Extractor functions which pull the appropriate value out
-           // of the tuple
-      char const* doc() const
-      {
-          return doc_extract<all_t>::extract(m_all);
-      }
-      
-      typename keyword_extract<all_t>::result_type keywords() const
-      {
-          return keyword_extract<all_t>::extract(m_all);
-      }
-      
-      typename policy_extract<all_t>::result_type policies() const
-      {
-          return policy_extract<all_t>::extract(m_all);
-      }
-
-      default_implementation_t default_implementation() const
-      {
-          return default_implementation_extract<all_t>::extract(m_all);
-      }
-      
-   private: // data members
-      all_t m_all; 
-      not_specified m_nil; // for filling in not_specified slots
-  };
-}
-
-}} // namespace boost::python::detail
-
-#endif // DEF_HELPER_DWA200287_HPP
diff --git a/include/boost/python/detail/def_helper_fwd.hpp b/include/boost/python/detail/def_helper_fwd.hpp
deleted file mode 100755
index 38af07f3..00000000
--- a/include/boost/python/detail/def_helper_fwd.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DEF_HELPER_FWD_DWA2003810_HPP
-# define DEF_HELPER_FWD_DWA2003810_HPP
-
-# include <boost/python/detail/not_specified.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-template <class T1, class T2 = not_specified, class T3 = not_specified, class T4 = not_specified>
-struct def_helper;
-
-}}} // namespace boost::python::detail
-
-#endif // DEF_HELPER_FWD_DWA2003810_HPP
diff --git a/include/boost/python/detail/defaults_def.hpp b/include/boost/python/detail/defaults_def.hpp
deleted file mode 100644
index 6a208b3d..00000000
--- a/include/boost/python/detail/defaults_def.hpp
+++ /dev/null
@@ -1,292 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// Copyright David Abrahams 2002, Joel de Guzman, 2002. Permission to copy,
-// use, modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
-//
-///////////////////////////////////////////////////////////////////////////////
-#if !defined(BOOST_PP_IS_ITERATING)
-
-#ifndef DEFAULTS_DEF_JDG20020811_HPP
-#define DEFAULTS_DEF_JDG20020811_HPP
-
-#include <boost/python/detail/defaults_gen.hpp>
-#include <boost/type_traits.hpp>
-#include <boost/mpl/front.hpp>
-#include <boost/mpl/size.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/python/class_fwd.hpp>
-#include <boost/python/scope.hpp>
-#include <boost/preprocessor/debug/line.hpp>
-#include <boost/python/detail/scope.hpp>
-#include <boost/python/detail/make_keyword_range_fn.hpp>
-#include <boost/python/object/add_to_namespace.hpp>
-
-///////////////////////////////////////////////////////////////////////////////
-namespace boost { namespace python {
-
-struct module;
-
-namespace objects
-{
-  struct class_base;
-}
-
-namespace detail
-{
-  // Called as::
-  //
-  //    name_space_def(ns, "func", func, kw, policies, docstring, &ns)
-  //
-  // Dispatch to properly add f to namespace ns.
-  //
-  // @group define_stub_function helpers { 
-  template <class Func, class CallPolicies, class NameSpaceT>
-  static void name_space_def(
-      NameSpaceT& name_space
-      , char const* name
-      , Func f
-      , keyword_range const& kw
-      , CallPolicies const& policies
-      , char const* doc
-      , objects::class_base*
-      )
-  {
-      typedef typename NameSpaceT::wrapped_type wrapped_type;
-      
-      objects::add_to_namespace(
-          name_space, name,
-          detail::make_keyword_range_function(
-              f, policies, kw, get_signature(f, (wrapped_type*)0))
-        , doc
-      );
-  }
-
-  template <class Func, class CallPolicies>
-  static void name_space_def(
-      object& name_space
-      , char const* name
-      , Func f
-      , keyword_range const& kw
-      , CallPolicies const& policies
-      , char const* doc
-      , ...
-      )
-  {
-      scope within(name_space);
-
-      detail::scope_setattr_doc(
-          name
-          , detail::make_keyword_range_function(f, policies, kw)
-          , doc);
-  }
-
-  // For backward compatibility -- is this obsolete?
-  template <class Func, class CallPolicies, class NameSpaceT>
-  static void name_space_def(
-      NameSpaceT& name_space
-      , char const* name
-      , Func f
-      , keyword_range const& kw // ignored
-      , CallPolicies const& policies
-      , char const* doc
-      , module*
-      )
-  {
-      name_space.def(name, f, policies, doc);
-  }
-  // }
-
-
-  //  Expansions of ::
-  //
-  //      template <typename OverloadsT, typename NameSpaceT>
-  //      inline void
-  //      define_stub_function(
-  //          char const* name, OverloadsT s, NameSpaceT& name_space, mpl::int_<N>)
-  //      {
-  //          name_space.def(name, &OverloadsT::func_N);
-  //      }
-  //
-  //  where N runs from 0 to BOOST_PYTHON_MAX_ARITY.
-  //
-  //  The set of overloaded functions (define_stub_function) expects:
-  //
-  //      1. char const* name:        function name that will be visible to python
-  //      2. OverloadsT:              a function overloads struct (see defaults_gen.hpp)
-  //      3. NameSpaceT& name_space:  a python::class_ or python::module instance
-  //      4. int_t<N>:                the Nth overloaded function (OverloadsT::func_N)
-  //                                  (see defaults_gen.hpp)
-  //      5. char const* name:        doc string
-  //
-  // @group define_stub_function<N> {
-  template <int N>
-  struct define_stub_function {};
-
-#define BOOST_PP_ITERATION_PARAMS_1                                             \
-    (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/defaults_def.hpp>))
-
-#include BOOST_PP_ITERATE()
-  
-  // }
-  
-  //  This helper template struct does the actual recursive
-  //  definition.  There's a generic version
-  //  define_with_defaults_helper<N> and a terminal case
-  //  define_with_defaults_helper<0>. The struct and its
-  //  specialization has a sole static member function def that
-  //  expects:
-  //
-  //    1. char const* name:        function name that will be
-  //                                visible to python
-  //
-  //    2. OverloadsT:              a function overloads struct
-  //                                (see defaults_gen.hpp)
-  //
-  //    3. NameSpaceT& name_space:  a python::class_ or
-  //                                python::module instance
-  //
-  //    4. char const* name:        doc string
-  //
-  //  The def static member function calls a corresponding
-  //  define_stub_function<N>. The general case recursively calls
-  //  define_with_defaults_helper<N-1>::def until it reaches the
-  //  terminal case case define_with_defaults_helper<0>.
-  template <int N>
-  struct define_with_defaults_helper {
-
-      template <class StubsT, class CallPolicies, class NameSpaceT>
-      static void
-      def(
-          char const* name,
-          StubsT stubs,
-          keyword_range kw,
-          CallPolicies const& policies,
-          NameSpaceT& name_space,
-          char const* doc)
-      {
-          //  define the NTH stub function of stubs
-          define_stub_function<N>::define(name, stubs, kw, policies, name_space, doc);
-
-          if (kw.second > kw.first)
-              --kw.second;
-
-          //  call the next define_with_defaults_helper
-          define_with_defaults_helper<N-1>::def(name, stubs, kw, policies, name_space, doc);
-      }
-  };
-
-  template <>
-  struct define_with_defaults_helper<0> {
-
-      template <class StubsT, class CallPolicies, class NameSpaceT>
-      static void
-      def(
-          char const* name,
-          StubsT stubs,
-          keyword_range const& kw,
-          CallPolicies const& policies,
-          NameSpaceT& name_space,
-          char const* doc)
-      {
-          //  define the Oth stub function of stubs
-          define_stub_function<0>::define(name, stubs, kw, policies, name_space, doc);
-          //  return
-      }
-  };
-
-  //  define_with_defaults
-  //
-  //      1. char const* name:        function name that will be
-  //                                  visible to python
-  //
-  //      2. OverloadsT:              a function overloads struct
-  //                                  (see defaults_gen.hpp)
-  //
-  //      3. CallPolicies& policies:  Call policies
-  //      4. NameSpaceT& name_space:  a python::class_ or
-  //                                  python::module instance
-  //
-  //      5. SigT sig:                Function signature typelist
-  //                                  (see defaults_gen.hpp)
-  //
-  //      6. char const* name:        doc string
-  //
-  //  This is the main entry point. This function recursively
-  //  defines all stub functions of StubT (see defaults_gen.hpp) in
-  //  NameSpaceT name_space which can be either a python::class_ or
-  //  a python::module. The sig argument is a typelist that
-  //  specifies the return type, the class (for member functions,
-  //  and the arguments. Here are some SigT examples:
-  //
-  //      int foo(int)        mpl::vector<int, int>
-  //      void bar(int, int)  mpl::vector<void, int, int>
-  //      void C::foo(int)    mpl::vector<void, C, int>
-  //
-  template <class OverloadsT, class NameSpaceT, class SigT>
-  inline void
-  define_with_defaults(
-      char const* name,
-      OverloadsT const& overloads,
-      NameSpaceT& name_space,
-      SigT const&)
-  {
-      typedef typename mpl::front<SigT>::type return_type;
-      typedef typename OverloadsT::void_return_type void_return_type;
-      typedef typename OverloadsT::non_void_return_type non_void_return_type;
-
-      typedef typename mpl::if_c<
-          boost::is_same<void, return_type>::value
-          , void_return_type
-          , non_void_return_type
-      >::type stubs_type;
-
-      BOOST_STATIC_ASSERT(
-          (stubs_type::max_args) <= mpl::size<SigT>::value);
-
-      typedef typename stubs_type::template gen<SigT> gen_type;
-      define_with_defaults_helper<stubs_type::n_funcs-1>::def(
-          name
-          , gen_type()
-          , overloads.keywords()
-          , overloads.call_policies()
-          , name_space
-          , overloads.doc_string());
-  }
-
-} // namespace detail
-
-}} // namespace boost::python
-
-#endif // DEFAULTS_DEF_JDG20020811_HPP
-
-#else // defined(BOOST_PP_IS_ITERATING)
-// PP vertical iteration code
-
-
-template <>
-struct define_stub_function<BOOST_PP_ITERATION()> {
-    template <class StubsT, class CallPolicies, class NameSpaceT>
-    static void define(
-        char const* name
-        , StubsT const&
-        , keyword_range const& kw
-        , CallPolicies const& policies
-        , NameSpaceT& name_space
-        , char const* doc)
-    {
-        detail::name_space_def(
-            name_space
-            , name
-            , &StubsT::BOOST_PP_CAT(func_, BOOST_PP_ITERATION())
-            , kw
-            , policies
-            , doc
-            , &name_space);
-    }
-};
-
-#endif // !defined(BOOST_PP_IS_ITERATING)
diff --git a/include/boost/python/detail/defaults_gen.hpp b/include/boost/python/detail/defaults_gen.hpp
deleted file mode 100644
index 4416bdda..00000000
--- a/include/boost/python/detail/defaults_gen.hpp
+++ /dev/null
@@ -1,389 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// Copyright David Abrahams 2002, Joel de Guzman, 2002. Permission to copy,
-// use, modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
-//
-///////////////////////////////////////////////////////////////////////////////
-#ifndef DEFAULTS_GEN_JDG20020807_HPP
-#define DEFAULTS_GEN_JDG20020807_HPP
-
-#include <boost/python/detail/preprocessor.hpp>
-#include <boost/preprocessor/repeat.hpp>
-#include <boost/preprocessor/repeat_from_to.hpp>
-#include <boost/preprocessor/enum.hpp>
-#include <boost/preprocessor/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/tuple.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/arithmetic/sub.hpp>
-#include <boost/preprocessor/stringize.hpp>
-#include <boost/preprocessor/inc.hpp>
-#include <boost/preprocessor/empty.hpp>
-#include <boost/preprocessor/comma_if.hpp>
-#include <boost/config.hpp>
-#include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/next.hpp>
-#include <boost/mpl/apply.hpp>
-#include <cstddef>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  // overloads_base is used as a base class for all function
-  // stubs. This class holds the doc_string of the stubs.
-  struct overloads_base
-  {
-      overloads_base(char const* doc_)
-          : m_doc(doc_) {}
-
-      overloads_base(char const* doc_, detail::keyword_range const& kw)
-          : m_doc(doc_), m_keywords(kw) {}
-
-      char const* doc_string() const
-      {
-          return m_doc;
-      }
-
-      detail::keyword_range const& keywords() const
-      {
-          return m_keywords;
-      }
-
-   private:
-      char const* m_doc;
-      detail::keyword_range m_keywords;
-  };
-
-  // overloads_proxy is generated by the overloads_common operator[] (see
-  // below). This class holds a user defined call policies of the stubs.
-  template <class CallPoliciesT, class OverloadsT>
-  struct overloads_proxy
-      : public overloads_base
-  {
-      typedef typename OverloadsT::non_void_return_type   non_void_return_type;
-      typedef typename OverloadsT::void_return_type       void_return_type;
-
-      overloads_proxy(
-          CallPoliciesT const& policies_
-          , char const* doc
-          , keyword_range const& kw
-          )
-          : overloads_base(doc, kw)
-            , policies(policies_)
-      {}
-
-      CallPoliciesT
-      call_policies() const
-      {
-          return policies;
-      }
-
-      CallPoliciesT policies;
-  };
-
-  // overloads_common is our default function stubs base class. This
-  // class returns the default_call_policies in its call_policies()
-  // member function.  It can generate a overloads_proxy however through
-  // its operator[]
-  template <class DerivedT>
-  struct overloads_common
-      : public overloads_base
-  {
-      overloads_common(char const* doc)
-          : overloads_base(doc) {}
-
-      overloads_common(char const* doc, keyword_range const& kw)
-          : overloads_base(doc, kw) {}
-
-      default_call_policies
-      call_policies() const
-      {
-          return default_call_policies();
-      }
-
-      template <class CallPoliciesT>
-      overloads_proxy<CallPoliciesT, DerivedT>
-      operator[](CallPoliciesT const& policies) const
-      {
-          return overloads_proxy<CallPoliciesT, DerivedT>(
-              policies, this->doc_string(), this->keywords());
-      }
-  };
-
-}}} // namespace boost::python::detail
-
-
-#define BOOST_PYTHON_TYPEDEF_GEN(z, index, data)                                \
-    typedef typename ::boost::mpl::next<BOOST_PP_CAT(iter, index)>::type        \
-        BOOST_PP_CAT(iter, BOOST_PP_INC(index));                                \
-    typedef typename ::boost::mpl::apply0<BOOST_PP_CAT(iter, index)>::type      \
-        BOOST_PP_CAT(T, index);
-
-#define BOOST_PYTHON_FUNC_WRAPPER_GEN(z, index, data)                   \
-    static RT BOOST_PP_CAT(func_,                                       \
-        BOOST_PP_SUB_D(1, index, BOOST_PP_TUPLE_ELEM(3, 1, data))) (    \
-        BOOST_PP_ENUM_BINARY_PARAMS_Z(                                  \
-            1, index, T, arg))                                          \
-    {                                                                   \
-        BOOST_PP_TUPLE_ELEM(3, 2, data)                                 \
-        BOOST_PP_TUPLE_ELEM(3, 0, data)(                                \
-            BOOST_PP_ENUM_PARAMS(                                       \
-                index,                                                  \
-                arg));                                                  \
-    }
-
-#define BOOST_PYTHON_GEN_FUNCTION(fname, fstubs_name, n_args, n_dflts, ret)     \
-    struct fstubs_name                                                          \
-    {                                                                           \
-        BOOST_STATIC_CONSTANT(int, n_funcs = BOOST_PP_INC(n_dflts));            \
-        BOOST_STATIC_CONSTANT(int, max_args = n_funcs);                         \
-                                                                                \
-        template <typename SigT>                                                \
-        struct gen                                                              \
-        {                                                                       \
-            typedef typename ::boost::mpl::begin<SigT>::type rt_iter;           \
-            typedef typename ::boost::mpl::apply0<rt_iter>::type RT;            \
-            typedef typename ::boost::mpl::next<rt_iter>::type iter0;           \
-                                                                                \
-            BOOST_PP_REPEAT_2ND(                                                \
-                n_args,                                                         \
-                BOOST_PYTHON_TYPEDEF_GEN,                                       \
-                0)                                                              \
-                                                                                \
-            BOOST_PP_REPEAT_FROM_TO_2(                                          \
-                BOOST_PP_SUB_D(1, n_args, n_dflts),                             \
-                BOOST_PP_INC(n_args),                                           \
-                BOOST_PYTHON_FUNC_WRAPPER_GEN,                                  \
-                (fname, BOOST_PP_SUB_D(1, n_args, n_dflts), ret))               \
-        };                                                                      \
-    };                                                                          \
-
-///////////////////////////////////////////////////////////////////////////////
-#define BOOST_PYTHON_MEM_FUNC_WRAPPER_GEN(z, index, data)                       \
-    static RT BOOST_PP_CAT(func_,                                               \
-        BOOST_PP_SUB_D(1, index, BOOST_PP_TUPLE_ELEM(3, 1, data))) (            \
-            ClassT obj BOOST_PP_COMMA_IF(index)                                 \
-            BOOST_PP_ENUM_BINARY_PARAMS_Z(1, index, T, arg)                     \
-        )                                                                       \
-    {                                                                           \
-        BOOST_PP_TUPLE_ELEM(3, 2, data) obj.BOOST_PP_TUPLE_ELEM(3, 0, data)(    \
-            BOOST_PP_ENUM_PARAMS(index, arg)                                    \
-        );                                                                      \
-    }
-
-#define BOOST_PYTHON_GEN_MEM_FUNCTION(fname, fstubs_name, n_args, n_dflts, ret) \
-    struct fstubs_name                                                          \
-    {                                                                           \
-        BOOST_STATIC_CONSTANT(int, n_funcs = BOOST_PP_INC(n_dflts));            \
-        BOOST_STATIC_CONSTANT(int, max_args = n_funcs + 1);                     \
-                                                                                \
-        template <typename SigT>                                                \
-        struct gen                                                              \
-        {                                                                       \
-            typedef typename ::boost::mpl::begin<SigT>::type rt_iter;           \
-            typedef typename ::boost::mpl::apply0<rt_iter>::type RT;            \
-                                                                                \
-            typedef typename ::boost::mpl::next<rt_iter>::type class_iter;      \
-            typedef typename ::boost::mpl::apply0<class_iter>::type ClassT;     \
-            typedef typename ::boost::mpl::next<class_iter>::type iter0;        \
-                                                                                \
-            BOOST_PP_REPEAT_2ND(                                                \
-                n_args,                                                         \
-                BOOST_PYTHON_TYPEDEF_GEN,                                       \
-                0)                                                              \
-                                                                                \
-            BOOST_PP_REPEAT_FROM_TO_2(                                          \
-                BOOST_PP_SUB_D(1, n_args, n_dflts),                             \
-                BOOST_PP_INC(n_args),                                           \
-                BOOST_PYTHON_MEM_FUNC_WRAPPER_GEN,                              \
-                (fname, BOOST_PP_SUB_D(1, n_args, n_dflts), ret))               \
-        };                                                                      \
-    };
-
-#define BOOST_PYTHON_OVERLOAD_CONSTRUCTORS(fstubs_name, n_args, n_dflts)                    \
-    fstubs_name(char const* doc = 0)                                                        \
-        : ::boost::python::detail::overloads_common<fstubs_name>(doc) {}                    \
-    template <std::size_t N>                                                                \
-    fstubs_name(char const* doc, ::boost::python::detail::keywords<N> const& keywords)      \
-        : ::boost::python::detail::overloads_common<fstubs_name>(                           \
-            doc, keywords.range())                                                          \
-    {                                                                                       \
-        typedef typename ::boost::python::detail::                                          \
-            error::more_keywords_than_function_arguments<                                   \
-                N,n_args>::too_many_keywords assertion;                                     \
-    }                                                                                       \
-    template <std::size_t N>                                                                \
-    fstubs_name(::boost::python::detail::keywords<N> const& keywords, char const* doc = 0)  \
-        : ::boost::python::detail::overloads_common<fstubs_name>(                           \
-            doc, keywords.range())                                                          \
-    {                                                                                       \
-        typedef typename ::boost::python::detail::                                          \
-            error::more_keywords_than_function_arguments<                                   \
-                N,n_args>::too_many_keywords assertion;                                     \
-    }
-
-# if defined(BOOST_NO_VOID_RETURNS)
-
-#  define BOOST_PYTHON_GEN_FUNCTION_STUB(fname, fstubs_name, n_args, n_dflts)   \
-    struct fstubs_name                                                          \
-        : public ::boost::python::detail::overloads_common<fstubs_name>         \
-    {                                                                           \
-        BOOST_PYTHON_GEN_FUNCTION(                                              \
-            fname, non_void_return_type, n_args, n_dflts, return)               \
-        BOOST_PYTHON_GEN_FUNCTION(                                              \
-            fname, void_return_type, n_args, n_dflts, ;)                        \
-                                                                                \
-        BOOST_PYTHON_OVERLOAD_CONSTRUCTORS(fstubs_name, n_args, n_dflts)        \
-    };
-
-#  define BOOST_PYTHON_GEN_MEM_FUNCTION_STUB(fname, fstubs_name, n_args, n_dflts)       \
-    struct fstubs_name                                                                  \
-        : public ::boost::python::detail::overloads_common<fstubs_name>                 \
-    {                                                                                   \
-        BOOST_PYTHON_GEN_MEM_FUNCTION(                                                  \
-            fname, non_void_return_type, n_args, n_dflts, return)                       \
-        BOOST_PYTHON_GEN_MEM_FUNCTION(                                                  \
-            fname, void_return_type, n_args, n_dflts, ;)                                \
-                                                                                        \
-        BOOST_PYTHON_OVERLOAD_CONSTRUCTORS(fstubs_name, n_args, n_dflts)                \
-    };
-
-# else // !defined(BOOST_NO_VOID_RETURNS)
-
-#  define BOOST_PYTHON_GEN_FUNCTION_STUB(fname, fstubs_name, n_args, n_dflts)   \
-    struct fstubs_name                                                          \
-        : public ::boost::python::detail::overloads_common<fstubs_name>         \
-    {                                                                           \
-        BOOST_PYTHON_GEN_FUNCTION(                                              \
-            fname, non_void_return_type, n_args, n_dflts, return)               \
-                                                                                \
-        typedef non_void_return_type void_return_type;                          \
-        BOOST_PYTHON_OVERLOAD_CONSTRUCTORS(fstubs_name, n_args, n_dflts)        \
-    };
-
-
-#  define BOOST_PYTHON_GEN_MEM_FUNCTION_STUB(fname, fstubs_name, n_args, n_dflts)       \
-    struct fstubs_name                                                                  \
-        : public ::boost::python::detail::overloads_common<fstubs_name>                 \
-    {                                                                                   \
-        BOOST_PYTHON_GEN_MEM_FUNCTION(                                                  \
-            fname, non_void_return_type, n_args, n_dflts, return)                       \
-                                                                                        \
-        typedef non_void_return_type void_return_type;                                  \
-        BOOST_PYTHON_OVERLOAD_CONSTRUCTORS(fstubs_name, n_args, n_dflts)                \
-    };
-
-# endif // !defined(BOOST_NO_VOID_RETURNS)
-
-///////////////////////////////////////////////////////////////////////////////
-//
-//  MAIN MACROS
-//
-//      Given generator_name, fname, min_args and max_args, These macros
-//      generate function stubs that forward to a function or member function
-//      named fname. max_args is the arity of the function or member function
-//      fname. fname can have default arguments. min_args is the minimum
-//      arity that fname can accept.
-//
-//      There are two versions:
-//
-//          1. BOOST_PYTHON_FUNCTION_OVERLOADS for free functions
-//          2. BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS for member functions.
-//
-//      For instance, given a function:
-//
-//      int
-//      foo(int a, char b = 1, unsigned c = 2, double d = 3)
-//      {
-//          return a + b + c + int(d);
-//      }
-//
-//      The macro invocation:
-//
-//          BOOST_PYTHON_FUNCTION_OVERLOADS(foo_stubs, foo, 1, 4)
-//
-//      Generates this code:
-//
-//      struct foo_stubsNonVoid
-//      {
-//          static const int n_funcs = 4;
-//          static const int max_args = n_funcs;
-//
-//          template <typename SigT>
-//          struct gen
-//          {
-//              typedef typename ::boost::mpl::begin<SigT>::type    rt_iter;
-//              typedef typename rt_iter::type                      RT;
-//              typedef typename rt_iter::next                      iter0;
-//              typedef typename iter0::type                        T0;
-//              typedef typename iter0::next                        iter1;
-//              typedef typename iter1::type                        T1;
-//              typedef typename iter1::next                        iter2;
-//              typedef typename iter2::type                        T2;
-//              typedef typename iter2::next                        iter3;
-//              typedef typename iter3::type                        T3;
-//              typedef typename iter3::next                        iter4;
-//
-//              static RT func_0(T0 arg0)
-//              { return foo(arg0); }
-//
-//              static RT func_1(T0 arg0, T1 arg1)
-//              { return foo(arg0, arg1); }
-//
-//              static RT func_2(T0 arg0, T1 arg1, T2 arg2)
-//              { return foo(arg0, arg1, arg2); }
-//
-//              static RT func_3(T0 arg0, T1 arg1, T2 arg2, T3 arg3)
-//              { return foo(arg0, arg1, arg2, arg3); }
-//          };
-//      };
-//
-//      struct foo_overloads
-//          : public boost::python::detail::overloads_common<foo_overloads>
-//      {
-//          typedef foo_overloadsNonVoid    non_void_return_type;
-//          typedef foo_overloadsNonVoid    void_return_type;
-//
-//          foo_overloads(char const* doc = 0)
-//             : boost::python::detail::overloads_common<foo_overloads>(doc) {}
-//      };
-//
-//      The typedefs non_void_return_type and void_return_type are
-//      used to handle compilers that do not support void returns. The
-//      example above typedefs non_void_return_type and
-//      void_return_type to foo_overloadsNonVoid. On compilers that do
-//      not support void returns, there are two versions:
-//      foo_overloadsNonVoid and foo_overloadsVoid.  The "Void"
-//      version is almost identical to the "NonVoid" version except
-//      for the return type (void) and the lack of the return keyword.
-//
-//      See the overloads_common above for a description of the
-//      foo_overloads' base class.
-//
-///////////////////////////////////////////////////////////////////////////////
-#define BOOST_PYTHON_FUNCTION_OVERLOADS(generator_name, fname, min_args, max_args)          \
-    BOOST_PYTHON_GEN_FUNCTION_STUB(                                                         \
-        fname,                                                                              \
-        generator_name,                                                                     \
-        max_args,                                                                           \
-        BOOST_PP_SUB_D(1, max_args, min_args))
-
-#define BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(generator_name, fname, min_args, max_args)   \
-    BOOST_PYTHON_GEN_MEM_FUNCTION_STUB(                                                     \
-        fname,                                                                              \
-        generator_name,                                                                     \
-        max_args,                                                                           \
-        BOOST_PP_SUB_D(1, max_args, min_args))
-
-// deprecated macro names (to be removed)
-#define BOOST_PYTHON_FUNCTION_GENERATOR BOOST_PYTHON_FUNCTION_OVERLOADS
-#define BOOST_PYTHON_MEM_FUN_GENERATOR BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS
-
-///////////////////////////////////////////////////////////////////////////////
-#endif // DEFAULTS_GEN_JDG20020807_HPP
-
-
diff --git a/include/boost/python/detail/dependent.hpp b/include/boost/python/detail/dependent.hpp
deleted file mode 100644
index 4fc48766..00000000
--- a/include/boost/python/detail/dependent.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DEPENDENT_DWA200286_HPP
-# define DEPENDENT_DWA200286_HPP
-
-namespace boost { namespace python { namespace detail { 
-
-// A way to turn a concrete type T into a type dependent on U. This
-// keeps conforming compilers (those implementing proper 2-phase
-// name lookup for templates) from complaining about incomplete
-// types in situations where it would otherwise be inconvenient or
-// impossible to re-order code so that all types are defined in time.
-
-// One such use is when we must return an incomplete T from a member
-// function template (which must be defined in the class body to
-// keep MSVC happy).
-template <class T, class U>
-struct dependent
-{
-    typedef T type;
-};
-
-}}} // namespace boost::python::detail
-
-#endif // DEPENDENT_DWA200286_HPP
diff --git a/include/boost/python/detail/destroy.hpp b/include/boost/python/detail/destroy.hpp
deleted file mode 100644
index 475548b6..00000000
--- a/include/boost/python/detail/destroy.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DESTROY_DWA2002221_HPP
-# define DESTROY_DWA2002221_HPP
-
-# include <boost/type_traits/is_array.hpp>
-# include <boost/detail/workaround.hpp>
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
-#  include <boost/type_traits/is_enum.hpp>
-# endif 
-namespace boost { namespace python { namespace detail { 
-
-template <
-    bool array
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
-  , bool enum_  // vc7 has a problem destroying enums
-# endif 
-    > struct value_destroyer;
-    
-template <>
-struct value_destroyer<
-    false
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
-  , false
-# endif 
-    >
-{
-    template <class T>
-    static void execute(T const volatile* p)
-    {
-        p->T::~T();
-    }
-};
-
-template <>
-struct value_destroyer<
-    true
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
-  , false
-# endif 
-    >
-{
-    template <class A, class T>
-    static void execute(A*, T const volatile* const first)
-    {
-        for (T const volatile* p = first; p != first + sizeof(A)/sizeof(T); ++p)
-        {
-            value_destroyer<
-                boost::is_array<T>::value
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
-              , boost::is_enum<T>::value
-# endif 
-            >::execute(p);
-        }
-    }
-    
-    template <class T>
-    static void execute(T const volatile* p)
-    {
-        execute(p, *p);
-    }
-};
-
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
-template <>
-struct value_destroyer<true,true>
-{
-    template <class T>
-    static void execute(T const volatile*)
-    {
-    }
-};
-
-template <>
-struct value_destroyer<false,true>
-{
-    template <class T>
-    static void execute(T const volatile*)
-    {
-    }
-};
-# endif 
-template <class T>
-inline void destroy_referent_impl(void* p, T& (*)())
-{
-    // note: cv-qualification needed for MSVC6
-    // must come *before* T for metrowerks
-    value_destroyer<
-         (boost::is_array<T>::value)
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1300)
-       , (boost::is_enum<T>::value)
-# endif 
-    >::execute((const volatile T*)p);
-}
-
-template <class T>
-inline void destroy_referent(void* p, T(*)() = 0)
-{
-    destroy_referent_impl(p, (T(*)())0);
-}
-
-}}} // namespace boost::python::detail
-
-#endif // DESTROY_DWA2002221_HPP
diff --git a/include/boost/python/detail/exception_handler.hpp b/include/boost/python/detail/exception_handler.hpp
deleted file mode 100644
index 3e36a7a5..00000000
--- a/include/boost/python/detail/exception_handler.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef EXCEPTION_HANDLER_DWA2002810_HPP
-# define EXCEPTION_HANDLER_DWA2002810_HPP
-
-# include <boost/python/detail/config.hpp>
-# include <boost/function/function0.hpp>
-# include <boost/function/function2.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-struct BOOST_PYTHON_DECL exception_handler;
-
-typedef function2<bool, exception_handler const&, function0<void> const&> handler_function;
-
-struct BOOST_PYTHON_DECL exception_handler
-{
- private: // types
-    
- public:
-    explicit exception_handler(handler_function const& impl);
-
-    inline bool handle(function0<void> const& f) const;
-    
-    bool operator()(function0<void> const& f) const;
- 
-    static exception_handler* chain;
-    
- private:
-    static exception_handler* tail;
-    
-    handler_function m_impl;
-    exception_handler* m_next;
-};
-
-
-inline bool exception_handler::handle(function0<void> const& f) const
-{
-    return this->m_impl(*this, f);
-}
-
-BOOST_PYTHON_DECL void register_exception_handler(handler_function const& f);
-
-}}} // namespace boost::python::detail
-
-#endif // EXCEPTION_HANDLER_DWA2002810_HPP
diff --git a/include/boost/python/detail/force_instantiate.hpp b/include/boost/python/detail/force_instantiate.hpp
deleted file mode 100755
index 62446c32..00000000
--- a/include/boost/python/detail/force_instantiate.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef FORCE_INSTANTIATE_DWA200265_HPP
-# define FORCE_INSTANTIATE_DWA200265_HPP
-
-namespace boost { namespace python { namespace detail { 
-
-// Allows us to force the argument to be instantiated without
-// incurring unused variable warnings
-
-# if !defined(BOOST_MSVC) || BOOST_MSVC == 1200 || _MSC_FULL_VER > 13102196
-
-template <class T>
-inline void force_instantiate(T const&) {}
-
-# else
-
-#  pragma optimize("g", off)
-inline void force_instantiate_impl(...) {}
-#  pragma optimize("", on)
-template <class T>
-inline void force_instantiate(T const& x)
-{
-    detail::force_instantiate_impl(&x);
-}
-# endif
-
-}}} // namespace boost::python::detail
-
-#endif // FORCE_INSTANTIATE_DWA200265_HPP
diff --git a/include/boost/python/detail/if_else.hpp b/include/boost/python/detail/if_else.hpp
deleted file mode 100644
index 6668617c..00000000
--- a/include/boost/python/detail/if_else.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef IF_ELSE_DWA2002322_HPP
-# define IF_ELSE_DWA2002322_HPP
-# include <boost/config.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-template <class T> struct elif_selected;
-
-template <class T>
-struct if_selected
-{
-    template <bool b>
-    struct elif : elif_selected<T>
-    {
-    };
-
-    template <class U>
-    struct else_
-    {
-        typedef T type;
-    };
-};
-
-# if defined(BOOST_MSVC) && (BOOST_MSVC == 1300)
-namespace msvc70_aux {
-
-template< bool > struct inherit_from
-{
-    template< typename T > struct result
-    {
-        typedef T type;
-    };
-};
-
-template<> struct inherit_from<true>
-{
-    template< typename T > struct result
-    {
-        struct type {};
-    };
-};
-
-template< typename T >
-struct never_true
-{
-    BOOST_STATIC_CONSTANT(bool, value = false);
-};
-
-} // namespace msvc70_aux
-
-#endif // # if defined(BOOST_MSVC) && (BOOST_MSVC == 1300)
-
-template <class T>
-struct elif_selected
-{
-# if !(defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__MWERKS__) && __MWERKS__ <= 0x2407)
-    template <class U> class then;
-# elif defined(BOOST_MSVC) && (BOOST_MSVC == 1300)
-    template <class U>
-    struct then : msvc70_aux::inherit_from< msvc70_aux::never_true<U>::value >
-        ::template result< if_selected<T> >::type
-    {
-    };
-# else
-    template <class U>
-    struct then : if_selected<T>
-    {
-    };
-# endif 
-};
-
-# if !(defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__MWERKS__) && __MWERKS__ <= 0x2407)
-template <class T>
-template <class U>
-class elif_selected<T>::then : public if_selected<T>
-{
-};
-# endif 
-
-template <bool b> struct if_
-{
-    template <class T>
-    struct then : if_selected<T>
-    {
-    };
-};
-
-struct if_unselected
-{
-    template <bool b> struct elif : if_<b>
-    {
-    };
-
-    template <class U>
-    struct else_
-    {
-        typedef U type;
-    };
-};
-
-template <>
-struct if_<false>
-{
-    template <class T>
-    struct then : if_unselected
-    {
-    };
-};
-
-}}} // namespace boost::python::detail
-
-#endif // IF_ELSE_DWA2002322_HPP
diff --git a/include/boost/python/detail/indirect_traits.hpp b/include/boost/python/detail/indirect_traits.hpp
deleted file mode 100644
index 752cd7d2..00000000
--- a/include/boost/python/detail/indirect_traits.hpp
+++ /dev/null
@@ -1,472 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef INDIRECT_TRAITS_DWA2002131_HPP
-# define INDIRECT_TRAITS_DWA2002131_HPP
-# include <boost/type_traits/is_function.hpp>
-# include <boost/type_traits/is_reference.hpp>
-# include <boost/type_traits/is_pointer.hpp>
-# include <boost/type_traits/is_class.hpp>
-# include <boost/type_traits/is_const.hpp>
-# include <boost/type_traits/is_volatile.hpp>
-# include <boost/type_traits/is_member_function_pointer.hpp>
-# include <boost/type_traits/remove_cv.hpp>
-# include <boost/type_traits/remove_reference.hpp>
-# include <boost/type_traits/remove_pointer.hpp>
-
-# include <boost/type_traits/detail/ice_and.hpp>
-
-# include <boost/detail/workaround.hpp>
-# if 0 &&  BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
-#  include <boost/type_traits/is_enum.hpp>
-# endif 
-
-# include <boost/mpl/if.hpp>
-# include <boost/mpl/bool.hpp>
-# include <boost/mpl/and.hpp>
-# include <boost/mpl/not.hpp>
-# include <boost/mpl/aux_/lambda_support.hpp>
-
-#  ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#   include <boost/python/detail/is_function_ref_tester.hpp>
-#  endif 
-
-namespace boost { namespace python { namespace detail { 
-
-#  ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-template <class T>
-struct is_reference_to_const : mpl::false_
-{
-};
-
-template <class T>
-struct is_reference_to_const<T const&> : mpl::true_
-{
-};
-
-#   if defined(BOOST_MSVC) && _MSC_FULL_VER <= 13102140 // vc7.01 alpha workaround
-template<class T>
-struct is_reference_to_const<T const volatile&> : mpl::true_
-{
-};
-#   endif 
-
-template <class T>
-struct is_reference_to_function : mpl::false_
-{
-};
-
-template <class T>
-struct is_reference_to_function<T&> : is_function<T>
-{
-};
-
-template <class T>
-struct is_pointer_to_function : mpl::false_
-{
-};
-
-// There's no such thing as a pointer-to-cv-function, so we don't need
-// specializations for those
-template <class T>
-struct is_pointer_to_function<T*> : is_function<T>
-{
-};
-
-template <class T>
-struct is_reference_to_member_function_pointer_impl : mpl::false_
-{
-};
-
-template <class T>
-struct is_reference_to_member_function_pointer_impl<T&>
-    : is_member_function_pointer<typename remove_cv<T>::type>
-{
-};
-
-
-template <class T>
-struct is_reference_to_member_function_pointer
-    : is_reference_to_member_function_pointer_impl<T>
-{
-    BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_reference_to_member_function_pointer,(T))
-};
-
-template <class T>
-struct is_reference_to_function_pointer_aux
-    : mpl::and_<
-          is_reference<T>
-        , is_pointer_to_function<
-              typename remove_cv<
-                  typename remove_reference<T>::type
-              >::type
-          >
-      >
-{
-    // There's no such thing as a pointer-to-cv-function, so we don't need specializations for those
-};
-
-template <class T>
-struct is_reference_to_function_pointer
-    : mpl::if_<
-          is_reference_to_function<T>
-        , mpl::false_
-        , is_reference_to_function_pointer_aux<T>
-     >::type
-{
-};
-
-template <class T>
-struct is_reference_to_non_const
-    : mpl::and_<
-          is_reference<T>
-        , mpl::not_<
-             is_reference_to_const<T>
-          >
-      >
-{
-};
-
-template <class T>
-struct is_reference_to_volatile : mpl::false_
-{
-};
-
-template <class T>
-struct is_reference_to_volatile<T volatile&> : mpl::true_
-{
-};
-
-#   if defined(BOOST_MSVC) && _MSC_FULL_VER <= 13102140 // vc7.01 alpha workaround
-template <class T>
-struct is_reference_to_volatile<T const volatile&> : mpl::true_
-{
-};
-#   endif 
-
-
-template <class T>
-struct is_reference_to_pointer : mpl::false_
-{
-};
-
-template <class T>
-struct is_reference_to_pointer<T*&> : mpl::true_
-{
-};
-
-template <class T>
-struct is_reference_to_pointer<T* const&> : mpl::true_
-{
-};
-
-template <class T>
-struct is_reference_to_pointer<T* volatile&> : mpl::true_
-{
-};
-
-template <class T>
-struct is_reference_to_pointer<T* const volatile&> : mpl::true_
-{
-};
-
-template <class T>
-struct is_reference_to_class
-    : mpl::and_<
-          is_reference<T>
-        , is_class<
-              typename remove_cv<
-                  typename remove_reference<T>::type
-              >::type
-          >
-      >
-{
-    BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_reference_to_class,(T))
-};
-
-template <class T>
-struct is_pointer_to_class
-    : mpl::and_<
-          is_pointer<T>
-        , is_class<
-              typename remove_cv<
-                  typename remove_pointer<T>::type
-              >::type
-          >
-      >
-{
-    BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_pointer_to_class,(T))
-};
-
-#  else
-
-typedef char (&inner_yes_type)[3];
-typedef char (&inner_no_type)[2];
-typedef char (&outer_no_type)[1];
-
-template <typename V>
-struct is_const_help
-{
-    typedef typename mpl::if_<
-          is_const<V>
-        , inner_yes_type
-        , inner_no_type
-        >::type type;
-};
-
-template <typename V>
-struct is_volatile_help
-{
-    typedef typename mpl::if_<
-          is_volatile<V>
-        , inner_yes_type
-        , inner_no_type
-        >::type type;
-};
-
-template <typename V>
-struct is_pointer_help
-{
-    typedef typename mpl::if_<
-          is_pointer<V>
-        , inner_yes_type
-        , inner_no_type
-        >::type type;
-};
-
-template <typename V>
-struct is_class_help
-{
-    typedef typename mpl::if_<
-          is_class<V>
-        , inner_yes_type
-        , inner_no_type
-        >::type type;
-};
-
-template <class T>
-struct is_reference_to_function_aux
-{
-    static T t;
-    BOOST_STATIC_CONSTANT(
-        bool, value = sizeof(detail::is_function_ref_tester(t,0)) == sizeof(::boost::type_traits::yes_type));
- };
-
-template <class T>
-struct is_reference_to_function
-    : mpl::if_<is_reference<T>, is_reference_to_function_aux<T>, mpl::bool_<false> >::type
-{
-};
-
-template <class T>
-struct is_pointer_to_function_aux
-{
-    static T t;
-    BOOST_STATIC_CONSTANT(
-        bool, value
-        = sizeof(::boost::type_traits::is_function_ptr_tester(t)) == sizeof(::boost::type_traits::yes_type));
-    typedef mpl::bool_<value> type;
-};
-
-template <class T>
-struct is_pointer_to_function
-    : mpl::if_<is_pointer<T>, is_pointer_to_function_aux<T>, mpl::bool_<false> >::type
-{
-    BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_pointer_to_function,(T))
-};
-
-struct false_helper1
-{
-    template <class T>
-    struct apply : mpl::false_
-    {
-    };
-};
-
-template <typename V>
-typename is_const_help<V>::type reference_to_const_helper(V&);    
-outer_no_type
-reference_to_const_helper(...);
-
-struct true_helper1
-{
-    template <class T>
-    struct apply
-    {
-        static T t;
-        BOOST_STATIC_CONSTANT(
-            bool, value
-            = sizeof(reference_to_const_helper(t)) == sizeof(inner_yes_type));
-        typedef mpl::bool_<value> type;
-    };
-};
-
-template <bool ref = true>
-struct is_reference_to_const_helper1 : true_helper1
-{
-};
-
-template <>
-struct is_reference_to_const_helper1<false> : false_helper1
-{
-};
-
-
-template <class T>
-struct is_reference_to_const
-    : is_reference_to_const_helper1<is_reference<T>::value>::template apply<T>
-{
-};
-
-
-template <bool ref = true>
-struct is_reference_to_non_const_helper1
-{
-    template <class T>
-    struct apply
-    {
-        static T t;
-        BOOST_STATIC_CONSTANT(
-            bool, value
-            = sizeof(reference_to_const_helper(t)) == sizeof(inner_no_type));
-    };
-};
-
-template <>
-struct is_reference_to_non_const_helper1<false> : false_helper1
-{
-};
-
-
-template <class T>
-struct is_reference_to_non_const
-    : is_reference_to_non_const_helper1<is_reference<T>::value>::template apply<T>
-{
-};
-
-
-template <typename V>
-typename is_volatile_help<V>::type reference_to_volatile_helper(V&);    
-outer_no_type
-reference_to_volatile_helper(...);
-
-template <bool ref = true>
-struct is_reference_to_volatile_helper1
-{
-    template <class T>
-    struct apply
-    {
-        static T t;
-        BOOST_STATIC_CONSTANT(
-            bool, value
-            = sizeof(reference_to_volatile_helper(t)) == sizeof(inner_yes_type));
-    };
-};
-
-template <>
-struct is_reference_to_volatile_helper1<false> : false_helper1
-{
-};
-
-
-template <class T>
-struct is_reference_to_volatile
-    : is_reference_to_volatile_helper1<is_reference<T>::value>::template apply<T>
-{
-};
-
-template <typename V>
-typename is_pointer_help<V>::type reference_to_pointer_helper(V&);
-outer_no_type reference_to_pointer_helper(...);
-
-template <class T>
-struct is_reference_to_pointer
-{
-    static T t;
-    BOOST_STATIC_CONSTANT(
-        bool, value
-        = (is_reference<T>::value
-           && sizeof((reference_to_pointer_helper)(t)) == sizeof(inner_yes_type))
-        );
-};
-
-template <class T>
-struct is_reference_to_function_pointer
-    : mpl::if_<
-        is_reference<T>
-        , is_pointer_to_function_aux<T>
-        , mpl::bool_<false>
-     >::type
-{
-    BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_reference_to_function_pointer,(T))
-};
-
-
-template <class T>
-struct is_member_function_pointer_help
-    : mpl::if_<is_member_function_pointer<T>, inner_yes_type, inner_no_type>
-{};
-
-template <typename V>
-typename is_member_function_pointer_help<V>::type member_function_pointer_helper(V&);
-outer_no_type member_function_pointer_helper(...);
-
-template <class T>
-struct is_pointer_to_member_function_aux
-{
-    static T t;
-    BOOST_STATIC_CONSTANT(
-        bool, value
-        = sizeof((member_function_pointer_helper)(t)) == sizeof(inner_yes_type));
-    typedef mpl::bool_<value> type;
-};
-
-template <class T>
-struct is_reference_to_member_function_pointer
-    : mpl::if_<
-        is_reference<T>
-        , is_pointer_to_member_function_aux<T>
-        , mpl::bool_<false>
-     >::type
-{
-    BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_reference_to_member_function_pointer,(T))
-};
-
-template <typename V>
-typename is_class_help<V>::type reference_to_class_helper(V const volatile&);
-outer_no_type reference_to_class_helper(...);
-
-template <class T>
-struct is_reference_to_class
-{
-    static T t;
-    BOOST_STATIC_CONSTANT(
-        bool, value
-        = (is_reference<T>::value
-           & (sizeof(reference_to_class_helper(t)) == sizeof(inner_yes_type)))
-        );
-    typedef mpl::bool_<value> type;
-    BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_reference_to_class,(T))
-};
-
-template <typename V>
-typename is_class_help<V>::type pointer_to_class_helper(V const volatile*);
-outer_no_type pointer_to_class_helper(...);
-
-template <class T>
-struct is_pointer_to_class
-{
-    static T t;
-    BOOST_STATIC_CONSTANT(
-        bool, value
-        = (is_pointer<T>::value
-           && sizeof(pointer_to_class_helper(t)) == sizeof(inner_yes_type))
-        );
-};
-#  endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION 
-
-}}} // namespace boost::python::detail
-
-#endif // INDIRECT_TRAITS_DWA2002131_HPP
diff --git a/include/boost/python/detail/invoke.hpp b/include/boost/python/detail/invoke.hpp
deleted file mode 100644
index cda53fea..00000000
--- a/include/boost/python/detail/invoke.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-#if !defined(BOOST_PP_IS_ITERATING)
-
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-# ifndef INVOKE_DWA20021122_HPP
-#  define INVOKE_DWA20021122_HPP
-
-#  include <boost/python/detail/prefix.hpp>
-#  include <boost/python/detail/preprocessor.hpp>
-#  include <boost/python/detail/none.hpp>
-
-#  include <boost/type_traits/is_member_function_pointer.hpp>
-
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/facilities/intercept.hpp>
-#  include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-#  include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-#  include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#  include <boost/python/to_python_value.hpp>
-
-// This file declares a series of overloaded invoke(...)  functions,
-// used to invoke wrapped C++ function (object)s from Python. Each one
-// accepts:
-//
-//   - a tag which identifies the invocation syntax (e.g. member
-//   functions must be invoked with a different syntax from regular
-//   functions)
-//
-//   - a pointer to a result converter type, used solely as a way of
-//   transmitting the type of the result converter to the function (or
-//   an int, if the return type is void).
-//
-//   - the "function", which may be a function object, a function or
-//   member function pointer, or a defaulted_virtual_fn.
-//
-//   - The arg_from_python converters for each of the arguments to be
-//   passed to the function being invoked.
-
-namespace boost { namespace python { namespace detail { 
-
-// This "result converter" is really just used as a dispatch tag to
-// invoke(...), selecting the appropriate implementation
-typedef int void_result_to_python;
-
-template <bool void_return, bool member>
-struct invoke_tag_ {};
-
-// A metafunction returning the appropriate tag type for invoking an
-// object of type F with return type R.
-template <class R, class F>
-struct invoke_tag
-  : invoke_tag_<
-        is_same<R,void>::value
-      , is_member_function_pointer<F>::value
-    >
-{
-};
-
-#  define BOOST_PP_ITERATION_PARAMS_1                                            \
-        (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/invoke.hpp>))
-#  include BOOST_PP_ITERATE()
-
-}}} // namespace boost::python::detail
-
-# endif // INVOKE_DWA20021122_HPP
-#else 
-
-# define N BOOST_PP_ITERATION()
-
-template <class RC, class F BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class AC)>
-inline PyObject* invoke(invoke_tag_<false,false>, RC const& rc, F& f BOOST_PP_ENUM_TRAILING_BINARY_PARAMS_Z(1, N, AC, & ac) )
-{
-    return rc(f( BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, ac, () BOOST_PP_INTERCEPT) ));
-}
-                 
-template <class RC, class F BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class AC)>
-inline PyObject* invoke(invoke_tag_<true,false>, RC const&, F& f BOOST_PP_ENUM_TRAILING_BINARY_PARAMS_Z(1, N, AC, & ac) )
-{
-    f( BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, ac, () BOOST_PP_INTERCEPT) );
-    return none();
-}
-
-template <class RC, class F, class TC BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class AC)>
-inline PyObject* invoke(invoke_tag_<false,true>, RC const& rc, F& f, TC& tc BOOST_PP_ENUM_TRAILING_BINARY_PARAMS_Z(1, N, AC, & ac) )
-{
-    return rc( (tc().*f)(BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, ac, () BOOST_PP_INTERCEPT)) );
-}
-                 
-template <class RC, class F, class TC BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class AC)>
-inline PyObject* invoke(invoke_tag_<true,true>, RC const&, F& f, TC& tc BOOST_PP_ENUM_TRAILING_BINARY_PARAMS_Z(1, N, AC, & ac) )
-{
-    (tc().*f)(BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, ac, () BOOST_PP_INTERCEPT));
-    return none();
-}
-
-# undef N
-
-#endif // BOOST_PP_IS_ITERATING 
diff --git a/include/boost/python/detail/is_auto_ptr.hpp b/include/boost/python/detail/is_auto_ptr.hpp
deleted file mode 100644
index 986a6309..00000000
--- a/include/boost/python/detail/is_auto_ptr.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef IS_AUTO_PTR_DWA2003224_HPP
-# define IS_AUTO_PTR_DWA2003224_HPP
-
-# ifndef BOOST_NO_AUTO_PTR
-#  include <boost/python/detail/is_xxx.hpp>
-#  include <memory>
-# endif
-
-namespace boost { namespace python { namespace detail { 
-
-# if !defined(BOOST_NO_AUTO_PTR)
-
-BOOST_PYTHON_IS_XXX_DEF(auto_ptr, std::auto_ptr, 1)
-
-# else
-
-template <class T>
-struct is_auto_ptr : mpl::false_
-{
-};
-
-# endif
-    
-}}} // namespace boost::python::detail
-
-#endif // IS_AUTO_PTR_DWA2003224_HPP
diff --git a/include/boost/python/detail/is_function_ref_tester.hpp b/include/boost/python/detail/is_function_ref_tester.hpp
deleted file mode 100644
index c9ab4818..00000000
--- a/include/boost/python/detail/is_function_ref_tester.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-
-// (C) Copyright Dave Abrahams, Steve Cleary, Beman Dawes, 
-// Aleksey Gurtovoy, Howard Hinnant & John Maddock 2000.  
-// Permission to copy, use, modify, sell and distribute this software 
-// is granted provided this copyright notice appears in all copies. 
-// This software is provided "as is" without express or implied warranty, 
-// and with no claim as to its suitability for any purpose.
-
-#if !defined(BOOST_PP_IS_ITERATING)
-
-///// header body
-
-#ifndef BOOST_TT_DETAIL_IS_FUNCTION_REF_TESTER_HPP_INCLUDED
-#define BOOST_TT_DETAIL_IS_FUNCTION_REF_TESTER_HPP_INCLUDED
-
-#include "boost/type_traits/detail/yes_no_type.hpp"
-#include "boost/type_traits/config.hpp"
-
-#if defined(BOOST_TT_PREPROCESSING_MODE)
-#   include "boost/preprocessor/iterate.hpp"
-#   include "boost/preprocessor/enum_params.hpp"
-#   include "boost/preprocessor/comma_if.hpp"
-#endif
-
-namespace boost {
-namespace python {
-namespace detail {
-
-template <class T>
-boost::type_traits::no_type BOOST_TT_DECL is_function_ref_tester(T& ...);
-
-#if !defined(BOOST_TT_PREPROCESSING_MODE)
-// preprocessor-generated part, don't edit by hand!
-
-template <class R>
-boost::type_traits::yes_type is_function_ref_tester(R (&)(), int);
-
-template <class R,class T0 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0), int);
-
-template <class R,class T0,class T1 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1), int);
-
-template <class R,class T0,class T1,class T2 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2), int);
-
-template <class R,class T0,class T1,class T2,class T3 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14,class T15 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14,class T15,class T16 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14,class T15,class T16,class T17 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14,class T15,class T16,class T17,class T18 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14,class T15,class T16,class T17,class T18,class T19 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14,class T15,class T16,class T17,class T18,class T19,class T20 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14,class T15,class T16,class T17,class T18,class T19,class T20,class T21 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14,class T15,class T16,class T17,class T18,class T19,class T20,class T21,class T22 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14,class T15,class T16,class T17,class T18,class T19,class T20,class T21,class T22,class T23 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23), int);
-
-template <class R,class T0,class T1,class T2,class T3,class T4,class T5,class T6,class T7,class T8,class T9,class T10,class T11,class T12,class T13,class T14,class T15,class T16,class T17,class T18,class T19,class T20,class T21,class T22,class T23,class T24 >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(T0,T1,T2,T3,T4,T5,T6,T7,T8,T9,T10,T11,T12,T13,T14,T15,T16,T17,T18,T19,T20,T21,T22,T23,T24), int);
-
-#else
-
-#define BOOST_PP_ITERATION_PARAMS_1 \
-    (3, (0, 25, "boost/type_traits/detail/is_function_ref_tester.hpp"))
-#include BOOST_PP_ITERATE()
-
-#endif // BOOST_TT_PREPROCESSING_MODE
-
-} // namespace detail
-} // namespace python
-} // namespace boost
-
-#endif // BOOST_TT_DETAIL_IS_FUNCTION_REF_TESTER_HPP_INCLUDED
-
-///// iteration
-
-#else
-#define i BOOST_PP_FRAME_ITERATION(1)
-
-template <class R BOOST_PP_COMMA_IF(i) BOOST_PP_ENUM_PARAMS(i,class T) >
-boost::type_traits::yes_type is_function_ref_tester(R (&)(BOOST_PP_ENUM_PARAMS(i,T)), int);
-
-#undef i
-#endif // BOOST_PP_IS_ITERATING
diff --git a/include/boost/python/detail/is_shared_ptr.hpp b/include/boost/python/detail/is_shared_ptr.hpp
deleted file mode 100755
index d3579a6a..00000000
--- a/include/boost/python/detail/is_shared_ptr.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef IS_SHARED_PTR_DWA2003224_HPP
-# define IS_SHARED_PTR_DWA2003224_HPP
-
-# include <boost/python/detail/is_xxx.hpp>
-# include <boost/shared_ptr.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-BOOST_PYTHON_IS_XXX_DEF(shared_ptr, shared_ptr, 1)
-    
-}}} // namespace boost::python::detail
-
-#endif // IS_SHARED_PTR_DWA2003224_HPP
diff --git a/include/boost/python/detail/is_xxx.hpp b/include/boost/python/detail/is_xxx.hpp
deleted file mode 100644
index 0faea999..00000000
--- a/include/boost/python/detail/is_xxx.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef IS_XXX_DWA2003224_HPP
-# define IS_XXX_DWA2003224_HPP
-
-# include <boost/config.hpp>
-# include <boost/mpl/bool.hpp>
-# include <boost/preprocessor/enum_params.hpp>
-
-# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-# include <boost/type_traits/is_reference.hpp>
-# include <boost/type_traits/add_reference.hpp>
-
-#  define BOOST_PYTHON_IS_XXX_DEF(name, qualified_name, nargs)      \
-template <class X_>                                                 \
-struct is_##name                                                    \
-{                                                                   \
-    typedef char yes;                                               \
-    typedef char (&no)[2];                                          \
-                                                                    \
-    static typename add_reference<X_>::type dummy;                  \
-                                                                    \
-    template < BOOST_PP_ENUM_PARAMS_Z(1, nargs, class U) >          \
-    static yes test(                                                \
-       qualified_name< BOOST_PP_ENUM_PARAMS_Z(1, nargs, U) >&, int  \
-    );                                                              \
-                                                                    \
-    template <class U>                                              \
-    static no test(U&, ...);                                        \
-                                                                    \
-    BOOST_STATIC_CONSTANT(                                          \
-        bool, value                                                 \
-        = !is_reference<X_>::value                                  \
-        & (sizeof(test(dummy, 0)) == sizeof(yes)));                 \
-                                                                    \
-    typedef mpl::bool_<value> type;                                \
-};
-
-# else
-
-#  define BOOST_PYTHON_IS_XXX_DEF(name, qualified_name, nargs)  \
-template <class T>                                              \
-struct is_##name : mpl::false_                                 \
-{                                                               \
-};                                                              \
-                                                                \
-template < BOOST_PP_ENUM_PARAMS_Z(1, nargs, class T) >          \
-struct is_##name<                                               \
-   qualified_name< BOOST_PP_ENUM_PARAMS_Z(1, nargs, T) >        \
->                                                               \
-   : mpl::true_                                                \
-{                                                               \
-};
-
-# endif
-
-#endif // IS_XXX_DWA2003224_HPP
diff --git a/include/boost/python/detail/make_keyword_range_fn.hpp b/include/boost/python/detail/make_keyword_range_fn.hpp
deleted file mode 100644
index 4e0d5353..00000000
--- a/include/boost/python/detail/make_keyword_range_fn.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MAKE_KEYWORD_RANGE_FN_DWA2002927_HPP
-# define MAKE_KEYWORD_RANGE_FN_DWA2002927_HPP
-
-# include <boost/python/make_function.hpp>
-# include <boost/python/args_fwd.hpp>
-
-# include <boost/python/object/make_holder.hpp>
-
-# include <boost/mpl/size.hpp>
-
-
-namespace boost { namespace python { namespace detail { 
-
-// Think of this as a version of make_function without a compile-time
-// check that the size of kw is no greater than the expected arity of
-// F. This version is needed when defining functions with default
-// arguments, because compile-time information about the number of
-// keywords is missing for all but the initial function definition.
-//
-// @group make_keyword_range_function {
-template <class F, class Policies>
-object make_keyword_range_function(
-    F f
-  , Policies const& policies
-  , keyword_range const& kw)
-{
-    return detail::make_function_aux(
-        f, policies, detail::get_signature(f), kw, mpl::int_<0>());
-}
-
-template <class F, class Policies, class Signature>
-object make_keyword_range_function(
-    F f
-  , Policies const& policies
-  , keyword_range const& kw
-  , Signature const& sig)
-{
-    return detail::make_function_aux(
-        f, policies, sig, kw, mpl::int_<0>());
-}
-// }
-
-// Builds an '__init__' function which inserts the given Holder type
-// in a wrapped C++ class instance. ArgList is an MPL type sequence
-// describing the C++ argument types to be passed to Holder's
-// constructor.
-//
-// Holder and ArgList are intended to be explicitly specified. 
-template <class ArgList, class Arity, class Holder, class CallPolicies>
-object make_keyword_range_constructor(
-    CallPolicies const& policies        // The CallPolicies with which to invoke the Holder's constructor
-    , detail::keyword_range const& kw   // The (possibly empty) set of associated argument keywords
-    , Holder* = 0                       
-    , ArgList* = 0, Arity* = 0)
-{
-    return detail::make_keyword_range_function(
-        objects::make_holder<Arity::value>
-            ::template apply<Holder,ArgList>::execute
-        , policies
-        , kw);
-}
-
-}}} // namespace boost::python::detail
-
-#endif // MAKE_KEYWORD_RANGE_FN_DWA2002927_HPP
diff --git a/include/boost/python/detail/make_tuple.hpp b/include/boost/python/detail/make_tuple.hpp
deleted file mode 100644
index 399498bc..00000000
--- a/include/boost/python/detail/make_tuple.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-# ifndef BOOST_PYTHON_SYNOPSIS 
-# // Copyright David Abrahams 2002. Permission to copy, use,
-# // modify, sell and distribute this software is granted provided this
-# // copyright notice appears in all copies. This software is provided
-# // "as is" without express or implied warranty, and with no claim as
-# // to its suitability for any purpose.
-
-#  if !defined(BOOST_PP_IS_ITERATING)
-#   error Boost.Python - do not include this file!
-#  endif
-
-#  define N BOOST_PP_ITERATION()
-
-#  define BOOST_PYTHON_MAKE_TUPLE_ARG(z, N, ignored)    \
-    PyTuple_SET_ITEM(                                   \
-        result.ptr()                                    \
-        , N                                             \
-        , python::incref(python::object(a##N).ptr())    \
-        );
-
-    template <BOOST_PP_ENUM_PARAMS_Z(1, N, class A)>
-    tuple
-    make_tuple(BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, A, const& a))
-    {
-        tuple result((detail::new_reference)::PyTuple_New(N));
-        BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_MAKE_TUPLE_ARG, _)
-        return result;
-    }
-
-#  undef BOOST_PYTHON_MAKE_TUPLE_ARG
-
-#  undef N
-# endif // BOOST_PYTHON_SYNOPSIS 
diff --git a/include/boost/python/detail/map_entry.hpp b/include/boost/python/detail/map_entry.hpp
deleted file mode 100644
index 9249523a..00000000
--- a/include/boost/python/detail/map_entry.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MAP_ENTRY_DWA2002118_HPP
-# define MAP_ENTRY_DWA2002118_HPP
-
-namespace boost { namespace python { namespace detail { 
-
-// A trivial type that works well as the value_type of associative
-// vector maps
-template <class Key, class Value>
-struct map_entry
-{
-    map_entry() {}
-    map_entry(Key k) : key(k), value() {}
-    map_entry(Key k, Value v) : key(k), value(v) {}
-    
-    bool operator<(map_entry const& rhs) const
-    {
-        return this->key < rhs.key;
-    }
-        
-    Key key;
-    Value value;
-};
-
-template <class Key, class Value>
-bool operator<(map_entry<Key,Value> const& e, Key const& k)
-{
-    return e.key < k;
-}
-
-template <class Key, class Value>
-bool operator<(Key const& k, map_entry<Key,Value> const& e)
-{
-    return k < e.key;
-}
-
-
-}}} // namespace boost::python::detail
-
-#endif // MAP_ENTRY_DWA2002118_HPP
diff --git a/include/boost/python/detail/mpl_lambda.hpp b/include/boost/python/detail/mpl_lambda.hpp
deleted file mode 100644
index 953bca63..00000000
--- a/include/boost/python/detail/mpl_lambda.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MPL_LAMBDA_DWA2002122_HPP
-# define MPL_LAMBDA_DWA2002122_HPP
-
-// this header should go away soon
-# include <boost/mpl/aux_/lambda_support.hpp>
-# define BOOST_PYTHON_MPL_LAMBDA_SUPPORT BOOST_MPL_AUX_LAMBDA_SUPPORT
-
-#endif // MPL_LAMBDA_DWA2002122_HPP
diff --git a/include/boost/python/detail/msvc_typeinfo.hpp b/include/boost/python/detail/msvc_typeinfo.hpp
deleted file mode 100644
index 2c9990fb..00000000
--- a/include/boost/python/detail/msvc_typeinfo.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MSVC_TYPEINFO_DWA200222_HPP
-# define MSVC_TYPEINFO_DWA200222_HPP
-
-#include <typeinfo>
-#include <boost/type.hpp>
-#include <boost/type_traits/config.hpp>
-
-//
-// Fix for MSVC's broken typeid() implementation which doesn't strip
-// decoration. This fix doesn't handle cv-qualified array types. It
-// could probably be done, but I haven't figured it out yet.
-//
-
-# if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(BOOST_INTEL_CXX_VERSION) && BOOST_INTEL_CXX_VERSION <= 700
-
-namespace boost { namespace python { namespace detail { 
-
-typedef std::type_info const& typeinfo;
-
-template <class T>
-static typeinfo typeid_nonref(T const volatile*) { return typeid(T); }
-
-template <class T>
-inline typeinfo typeid_ref_1(T&(*)())
-{
-    return detail::typeid_nonref((T*)0);
-}
-
-// A non-reference
-template <class T>
-inline typeinfo typeid_ref(type<T>*, T&(*)(type<T>))
-{
-    return detail::typeid_nonref((T*)0);
-}
-
-// A reference
-template <class T>
-inline typeinfo typeid_ref(type<T>*, ...)
-{
-    return detail::typeid_ref_1((T(*)())0);
-}
-
-template< typename T > T&(* is_ref_tester1(type<T>) )(type<T>) { return 0; }
-inline char BOOST_TT_DECL is_ref_tester1(...) { return 0; }
-
-template <class T>
-inline typeinfo msvc_typeid(boost::type<T>*)
-{
-    return detail::typeid_ref(
-        (boost::type<T>*)0, detail::is_ref_tester1(type<T>())
-        );
-}
-
-template <>
-inline typeinfo msvc_typeid<void>(boost::type<void>*)
-{
-    return typeid(void);
-}
-
-#  ifndef NDEBUG
-inline typeinfo assert_array_typeid_compiles()
-{
-    return msvc_typeid((boost::type<char const[3]>*)0)
-        , msvc_typeid((boost::type<char[3]>*)0);
-}
-#  endif
-
-}}} // namespace boost::python::detail
-
-# endif // BOOST_MSVC
-#endif // MSVC_TYPEINFO_DWA200222_HPP
diff --git a/include/boost/python/detail/none.hpp b/include/boost/python/detail/none.hpp
deleted file mode 100644
index 49039696..00000000
--- a/include/boost/python/detail/none.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//  (C) Copyright David Abrahams 2000. Permission to copy, use, modify, sell and
-//  distribute this software is granted provided this copyright notice appears
-//  in all copies. This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-//  The author gratefully acknowleges the support of Dragon Systems, Inc., in
-//  producing this work.
-
-#ifndef NONE_DWA_052000_H_
-# define NONE_DWA_052000_H_
-
-# include <boost/python/detail/prefix.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-inline PyObject* none() { Py_INCREF(Py_None); return Py_None; }
-    
-}}} // namespace boost::python::detail
-
-#endif // NONE_DWA_052000_H_
diff --git a/include/boost/python/detail/not_specified.hpp b/include/boost/python/detail/not_specified.hpp
deleted file mode 100644
index ce1b280d..00000000
--- a/include/boost/python/detail/not_specified.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef NOT_SPECIFIED_DWA2002321_HPP
-# define NOT_SPECIFIED_DWA2002321_HPP
-
-namespace boost { namespace python { namespace detail { 
-
-  struct not_specified {};
-
-}}} // namespace boost::python::detail
-
-#endif // NOT_SPECIFIED_DWA2002321_HPP
diff --git a/include/boost/python/detail/nullary_function_adaptor.hpp b/include/boost/python/detail/nullary_function_adaptor.hpp
deleted file mode 100755
index a63fd82e..00000000
--- a/include/boost/python/detail/nullary_function_adaptor.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef NULLARY_FUNCTION_ADAPTOR_DWA2003824_HPP
-# define NULLARY_FUNCTION_ADAPTOR_DWA2003824_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/preprocessor/iteration/local.hpp>
-# include <boost/preprocessor/facilities/intercept.hpp>
-# include <boost/preprocessor/repetition/enum_params.hpp>
-# include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-// nullary_function_adaptor -- a class template which ignores its
-// arguments and calls a nullary function instead.  Used for building
-// error-reporting functions, c.f. pure_virtual
-template <class NullaryFunction>
-struct nullary_function_adaptor
-{
-    nullary_function_adaptor(NullaryFunction fn)
-      : m_fn(fn)
-    {}
-
-    void operator()() const { m_fn(); }
-
-# define BOOST_PP_LOCAL_MACRO(i)                                            \
-    template <BOOST_PP_ENUM_PARAMS_Z(1, i, class A)>                        \
-    void operator()(                                                        \
-        BOOST_PP_ENUM_BINARY_PARAMS_Z(1, i, A, const& BOOST_PP_INTERCEPT)   \
-    ) const                                                                 \
-    {                                                                       \
-        m_fn();                                                             \
-    }
-
-# define BOOST_PP_LOCAL_LIMITS (1, BOOST_PYTHON_MAX_ARITY)
-# include BOOST_PP_LOCAL_ITERATE()
-    
- private:
-    NullaryFunction m_fn;
-};
-
-}}} // namespace boost::python::detail
-
-#endif // NULLARY_FUNCTION_ADAPTOR_DWA2003824_HPP
diff --git a/include/boost/python/detail/operator_id.hpp b/include/boost/python/detail/operator_id.hpp
deleted file mode 100755
index e1104541..00000000
--- a/include/boost/python/detail/operator_id.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OPERATOR_ID_DWA2002531_HPP
-# define OPERATOR_ID_DWA2002531_HPP
-
-namespace boost { namespace python { namespace detail {
-
-enum operator_id
-{ 
-    op_add, 
-    op_sub, 
-    op_mul, 
-    op_div, 
-    op_mod, 
-    op_divmod,
-    op_pow, 
-    op_lshift, 
-    op_rshift, 
-    op_and, 
-    op_xor, 
-    op_or, 
-    op_neg, 
-    op_pos, 
-    op_abs, 
-    op_invert, 
-    op_int, 
-    op_long, 
-    op_float, 
-    op_str,
-    op_cmp,
-    op_gt,
-    op_ge,
-    op_lt,
-    op_le,
-    op_eq,
-    op_ne,
-    op_iadd,
-    op_isub,
-    op_imul,
-    op_idiv,
-    op_imod,
-    op_ilshift,
-    op_irshift,
-    op_iand,
-    op_ixor,
-    op_ior,
-    op_complex,
-    op_nonzero
-};
-
-}}} // namespace boost::python::detail
-
-#endif // OPERATOR_ID_DWA2002531_HPP
diff --git a/include/boost/python/detail/overloads_fwd.hpp b/include/boost/python/detail/overloads_fwd.hpp
deleted file mode 100644
index 94ec503f..00000000
--- a/include/boost/python/detail/overloads_fwd.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OVERLOADS_FWD_DWA2002101_HPP
-# define OVERLOADS_FWD_DWA2002101_HPP
-
-namespace boost { namespace python { namespace detail { 
-
-// forward declarations
-struct overloads_base;
-  
-template <class OverloadsT, class NameSpaceT, class SigT>
-inline void define_with_defaults(char const* name, OverloadsT const&, NameSpaceT&, SigT const&);
-
-}}} // namespace boost::python::detail
-
-#endif // OVERLOADS_FWD_DWA2002101_HPP
diff --git a/include/boost/python/detail/pointee.hpp b/include/boost/python/detail/pointee.hpp
deleted file mode 100644
index 2af1535f..00000000
--- a/include/boost/python/detail/pointee.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef POINTEE_DWA2002323_HPP
-# define POINTEE_DWA2002323_HPP
-
-# include <boost/type_traits/object_traits.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-template <bool is_ptr = true>
-struct pointee_impl
-{
-    template <class T> struct apply : remove_pointer<T> {};
-};
-
-template <>
-struct pointee_impl<false>
-{
-    template <class T> struct apply
-    {
-        typedef typename T::element_type type;
-    };
-};
-
-template <class T>
-struct pointee
-    : pointee_impl<is_pointer<T>::value>::template apply<T>
-{
-};
-
-}}} // namespace boost::python::detail
-
-#endif // POINTEE_DWA2002323_HPP
diff --git a/include/boost/python/detail/prefix.hpp b/include/boost/python/detail/prefix.hpp
deleted file mode 100755
index 1e55f428..00000000
--- a/include/boost/python/detail/prefix.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef PREFIX_DWA2003531_HPP
-# define PREFIX_DWA2003531_HPP
-
-// The rule is that <Python.h> must be included before any system
-// headers (so it can get control over some awful macros).
-// Unfortunately, Boost.Python needs to #include <limits.h> first, at
-// least... but this gets us as close as possible.
-# include <boost/python/detail/wrap_python.hpp>
-# include <boost/python/detail/config.hpp>
-
-#endif // PREFIX_DWA2003531_HPP
diff --git a/include/boost/python/detail/preprocessor.hpp b/include/boost/python/detail/preprocessor.hpp
deleted file mode 100644
index 45e307d4..00000000
--- a/include/boost/python/detail/preprocessor.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef PREPROCESSOR_DWA200247_HPP
-# define PREPROCESSOR_DWA200247_HPP
-
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/comma_if.hpp>
-# include <boost/preprocessor/repeat.hpp>
-# include <boost/preprocessor/tuple/elem.hpp>
-
-// stuff that should be in the preprocessor library
-
-# define BOOST_PYTHON_APPLY(x) BOOST_PP_CAT(BOOST_PYTHON_APPLY_, x)
-
-# define BOOST_PYTHON_APPLY_BOOST_PYTHON_ITEM(v) v
-# define BOOST_PYTHON_APPLY_BOOST_PYTHON_NIL
-
-// cv-qualifiers
-
-# if !defined(__MWERKS__) || __MWERKS__ > 0x2407
-#  define BOOST_PYTHON_CV_COUNT 4
-# else
-#  define BOOST_PYTHON_CV_COUNT 1
-# endif
-
-# ifndef BOOST_PYTHON_MAX_ARITY
-#  define BOOST_PYTHON_MAX_ARITY 15
-# endif
-
-# ifndef BOOST_PYTHON_MAX_BASES
-#  define BOOST_PYTHON_MAX_BASES 10
-# endif 
-
-# define BOOST_PYTHON_CV_QUALIFIER(i)                          \
-    BOOST_PYTHON_APPLY(                                        \
-        BOOST_PP_TUPLE_ELEM(4, i, BOOST_PYTHON_CV_QUALIFIER_I) \
-    )
-
-# define BOOST_PYTHON_CV_QUALIFIER_I      \
-    (                                     \
-        BOOST_PYTHON_NIL,                 \
-        BOOST_PYTHON_ITEM(const),         \
-        BOOST_PYTHON_ITEM(volatile),      \
-        BOOST_PYTHON_ITEM(const volatile) \
-    )
-
-// enumerators
-# define BOOST_PYTHON_UNARY_ENUM(c, text) BOOST_PP_REPEAT(c, BOOST_PYTHON_UNARY_ENUM_I, text)
-# define BOOST_PYTHON_UNARY_ENUM_I(z, n, text) BOOST_PP_COMMA_IF(n) text ## n
-
-# define BOOST_PYTHON_BINARY_ENUM(c, a, b) BOOST_PP_REPEAT(c, BOOST_PYTHON_BINARY_ENUM_I, (a, b))
-# define BOOST_PYTHON_BINARY_ENUM_I(z, n, _) BOOST_PP_COMMA_IF(n) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 0, _), n) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 1, _), n)
-
-# define BOOST_PYTHON_ENUM_WITH_DEFAULT(c, text, def) BOOST_PP_REPEAT(c, BOOST_PYTHON_ENUM_WITH_DEFAULT_I, (text, def))
-# define BOOST_PYTHON_ENUM_WITH_DEFAULT_I(z, n, _) BOOST_PP_COMMA_IF(n) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 0, _), n) = BOOST_PP_TUPLE_ELEM(2, 1, _)
-
-// fixed text (no commas)
-# define BOOST_PYTHON_FIXED(z, n, text) text
-
-// flags
-# define BOOST_PYTHON_FUNCTION_POINTER 0x0001
-# define BOOST_PYTHON_POINTER_TO_MEMBER 0x0002
-
-#endif // PREPROCESSOR_DWA200247_HPP
diff --git a/include/boost/python/detail/python22_fixed.h b/include/boost/python/detail/python22_fixed.h
deleted file mode 100644
index 74ba44e4..00000000
--- a/include/boost/python/detail/python22_fixed.h
+++ /dev/null
@@ -1,150 +0,0 @@
-// This file is a modified version of Python 2.2/2.2.1 Python.h. As
-// such it is:
-//
-//    Copyright (c) 2001, 2002 Python Software Foundation; All Rights
-//    Reserved
-//
-// Changes from the original:
-//  1. #includes <unistd.h> for Python 2.2.1
-//  2. Provides missing extern "C" wrapper for  "iterobject.h" and  "descrobject.h".
-//
-
-// Changes marked with "Boost.Python modification"
-#ifndef Py_PYTHON_H
-#define Py_PYTHON_H
-/* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
-
-
-/* Enable compiler features; switching on C lib defines doesn't work
-   here, because the symbols haven't necessarily been defined yet. */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
-/* Forcing SUSv2 compatibility still produces problems on some
-   platforms, True64 and SGI IRIX begin two of them, so for now the
-   define is switched off. */
-#if 0
-#ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE	500
-#endif
-#endif
-
-/* Include nearly all Python header files */
-
-#include "patchlevel.h"
-#include "pyconfig.h"
-
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
-
-/* pyconfig.h may or may not define DL_IMPORT */
-#ifndef DL_IMPORT	/* declarations for DLL import/export */
-#define DL_IMPORT(RTYPE) RTYPE
-#endif
-#ifndef DL_EXPORT	/* declarations for DLL import/export */
-#define DL_EXPORT(RTYPE) RTYPE
-#endif
-
-#if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE)
-#define _SGI_MP_SOURCE
-#endif
-
-#include <stdio.h>
-#ifndef NULL
-#   error "Python.h requires that stdio.h define NULL."
-#endif
-
-#include <string.h>
-#include <errno.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#if PY_MICRO_VERSION == 1 // Boost.Python modification: emulate Python 2.2
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#endif // Boost.Python modification: emulate Python 2.2
-
-/* CAUTION:  Build setups should ensure that NDEBUG is defined on the
- * compiler command line when building Python in release mode; else
- * assert() calls won't be removed.
- */
-#include <assert.h>
-
-#include "pyport.h"
-
-#include "pymem.h"
-
-#include "object.h"
-#include "objimpl.h"
-
-#include "pydebug.h"
-
-#include "unicodeobject.h"
-#include "intobject.h"
-#include "longobject.h"
-#include "floatobject.h"
-#ifndef WITHOUT_COMPLEX
-#include "complexobject.h"
-#endif
-#include "rangeobject.h"
-#include "stringobject.h"
-#include "bufferobject.h"
-#include "tupleobject.h"
-#include "listobject.h"
-#include "dictobject.h"
-#include "methodobject.h"
-#include "moduleobject.h"
-#include "funcobject.h"
-#include "classobject.h"
-#include "fileobject.h"
-#include "cobject.h"
-#include "traceback.h"
-#include "sliceobject.h"
-#include "cellobject.h"
-extern "C" { // Boost.Python modification: provide missing extern "C"
-#include "iterobject.h"
-#include "descrobject.h"
-} // Boost.Python modification: provide missing extern "C"
-#include "weakrefobject.h"
-
-#include "codecs.h"
-#include "pyerrors.h"
-
-#include "pystate.h"
-
-#include "modsupport.h"
-#include "pythonrun.h"
-#include "ceval.h"
-#include "sysmodule.h"
-#include "intrcheck.h"
-#include "import.h"
-
-#include "abstract.h"
-
-#define PyArg_GetInt(v, a)	PyArg_Parse((v), "i", (a))
-#define PyArg_NoArgs(v)		PyArg_Parse(v, "")
-
-/* Convert a possibly signed character to a nonnegative int */
-/* XXX This assumes characters are 8 bits wide */
-#ifdef __CHAR_UNSIGNED__
-#define Py_CHARMASK(c)		(c)
-#else
-#define Py_CHARMASK(c)		((c) & 0xff)
-#endif
-
-#include "pyfpe.h"
-
-/* These definitions must match corresponding definitions in graminit.h.
-   There's code in compile.c that checks that they are the same. */
-#define Py_single_input 256
-#define Py_file_input 257
-#define Py_eval_input 258
-
-#ifdef HAVE_PTH
-/* GNU pth user-space thread support */
-#include <pth.h>
-#endif
-#endif /* !Py_PYTHON_H */
diff --git a/include/boost/python/detail/raw_pyobject.hpp b/include/boost/python/detail/raw_pyobject.hpp
deleted file mode 100644
index e9d36901..00000000
--- a/include/boost/python/detail/raw_pyobject.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef RAW_PYOBJECT_DWA2002628_HPP
-# define RAW_PYOBJECT_DWA2002628_HPP
-
-namespace boost { namespace python { namespace detail { 
-
-//
-// Define some types which we can use to get around the vagaries of
-// PyObject*. We will use these to initialize object instances, and
-// keep them in namespace detail to make sure they stay out of the
-// hands of users. That is much simpler than trying to grant
-// friendship to all the appropriate parties.
-//
-
-// New references are normally checked for null
-struct new_reference_t;
-typedef new_reference_t* new_reference;
-
-// Borrowed references are assumed to be non-null
-struct borrowed_reference_t;
-typedef borrowed_reference_t* borrowed_reference;
-
-// New references which aren't checked for null
-struct new_non_null_reference_t;
-typedef new_non_null_reference_t* new_non_null_reference;
-
-}}} // namespace boost::python::detail
-
-#endif // RAW_PYOBJECT_DWA2002628_HPP
diff --git a/include/boost/python/detail/referent_storage.hpp b/include/boost/python/detail/referent_storage.hpp
deleted file mode 100644
index 3d9540ee..00000000
--- a/include/boost/python/detail/referent_storage.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef REFERENT_STORAGE_DWA200278_HPP
-# define REFERENT_STORAGE_DWA200278_HPP
-# include <boost/mpl/if.hpp>
-# include <cstddef>
-
-namespace boost { namespace python { namespace detail {
-
-struct alignment_dummy;
-typedef void (*function_ptr)();
-typedef int (alignment_dummy::*member_ptr);
-typedef int (alignment_dummy::*member_function_ptr)();
-
-# define BOOST_PYTHON_ALIGNER(T, n)                     \
-        typename mpl::if_c<                             \
-           sizeof(T) <= size, T, char>::type t##n
-
-// Storage for size bytes, aligned to all fundamental types no larger than size
-template <std::size_t size>
-union aligned_storage
-{
-    BOOST_PYTHON_ALIGNER(char, 0);
-    BOOST_PYTHON_ALIGNER(short, 1);
-    BOOST_PYTHON_ALIGNER(int, 2);
-    BOOST_PYTHON_ALIGNER(long, 3);
-    BOOST_PYTHON_ALIGNER(float, 4);
-    BOOST_PYTHON_ALIGNER(double, 5);
-    BOOST_PYTHON_ALIGNER(long double, 6);
-    BOOST_PYTHON_ALIGNER(void*, 7);
-    BOOST_PYTHON_ALIGNER(function_ptr, 8);
-    BOOST_PYTHON_ALIGNER(member_ptr, 9);
-    BOOST_PYTHON_ALIGNER(member_function_ptr, 10);
-    char bytes[size];
-};
-
-# undef BOOST_PYTHON_ALIGNER
-
-  // Compute the size of T's referent. We wouldn't need this at all,
-  // but sizeof() is broken in CodeWarriors <= 8.0
-  template <class T> struct referent_size;
-  
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-  
-  template <class T>
-  struct referent_size<T&>
-  {
-      BOOST_STATIC_CONSTANT(
-          std::size_t, value = sizeof(T));
-  };
-
-# else
-
-  template <class T> struct referent_size
-  {
-      static T f();
-      BOOST_STATIC_CONSTANT(std::size_t, value = sizeof(f()));
-  };
-  
-# endif
-
-// A metafunction returning a POD type which can store U, where T ==
-// U&. If T is not a reference type, returns a POD which can store T.
-template <class T>
-struct referent_storage
-{
-    typedef aligned_storage<
-        ::boost::python::detail::referent_size<T>::value
-    > type;
-};
-
-}}} // namespace boost::python::detail
-
-#endif // REFERENT_STORAGE_DWA200278_HPP
diff --git a/include/boost/python/detail/result.hpp b/include/boost/python/detail/result.hpp
deleted file mode 100755
index bb66f13a..00000000
--- a/include/boost/python/detail/result.hpp
+++ /dev/null
@@ -1,126 +0,0 @@
-#if !defined(BOOST_PP_IS_ITERATING)
-
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# ifndef RESULT_DWA2002521_HPP
-#  define RESULT_DWA2002521_HPP
-
-#  include <boost/type.hpp>
-
-#  include <boost/python/detail/preprocessor.hpp>
-
-#  include <boost/type_traits/object_traits.hpp>
-#  include <boost/mpl/if.hpp>
-
-#  include <boost/preprocessor/comma_if.hpp>
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/debug/line.hpp>
-#  include <boost/preprocessor/enum_params.hpp>
-#  include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-// Defines a family of overloaded function which, given x, a function
-// pointer, member [function] pointer, or an AdaptableFunction object,
-// returns a pointer to type<R>*, where R is the result type of
-// invoking the result of bind(x).
-//
-// In order to work around bugs in deficient compilers, if x might be
-// an AdaptableFunction object, you must pass OL as a second argument
-// to get this to work portably.
-
-#  define BOOST_PP_ITERATION_PARAMS_1                                                                   \
-    (4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/result.hpp>, BOOST_PYTHON_FUNCTION_POINTER))
-#  include BOOST_PP_ITERATE()
-
-#  define BOOST_PP_ITERATION_PARAMS_1                                                                     \
-    (4, (0, BOOST_PYTHON_CV_COUNT - 1, <boost/python/detail/result.hpp>, BOOST_PYTHON_POINTER_TO_MEMBER))
-#  include BOOST_PP_ITERATE()
-
-template <class R, class T>
-boost::type<R>* result(R (T::*), int = 0) { return 0; }
-
-#  if (defined(BOOST_MSVC) && _MSC_FULL_VER <= 13102140)  \
-   || (defined(__GNUC__) && __GNUC__ < 3)                 \
-   || (defined(__MWERKS__) && __MWERKS__ < 0x3000)
-// This code actually works on all implementations, but why use it when we don't have to?
-template <class T>
-struct get_result_type
-{
-    typedef boost::type<typename T::result_type> type;
-};
-
-struct void_type
-{
-    typedef void type;
-};
-
-template <class T>
-struct result_result
-{
-    typedef typename mpl::if_c<
-        is_class<T>::value
-        , get_result_type<T>
-        , void_type
-        >::type t1;
-
-    typedef typename t1::type* type;
-};
-
-template <class X>
-typename result_result<X>::type
-result(X const&, short) { return 0; }
-
-#  else // Simpler code for more-capable compilers
-template <class X>
-boost::type<typename X::result_type>*
-result(X const&, short = 0) { return 0; }
-
-#  endif
-
-}}} // namespace boost::python::detail
-
-# endif // RESULT_DWA2002521_HPP
-
-/* --------------- function pointers --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
-# line BOOST_PP_LINE(__LINE__, result.hpp(function pointers))
-
-# define N BOOST_PP_ITERATION()
-
-template <class R BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class A)>
-boost::type<R>* result(R (*pf)(BOOST_PP_ENUM_PARAMS_Z(1, N, A)), int = 0)
-{
-    return 0;
-}
-
-# undef N
-
-/* --------------- pointers-to-members --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER
-// Outer over cv-qualifiers
-
-# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/result.hpp>))
-# include BOOST_PP_ITERATE()
-
-#elif BOOST_PP_ITERATION_DEPTH() == 2
-# line BOOST_PP_LINE(__LINE__, result.hpp(pointers-to-members))
-// Inner over arities
-
-# define N BOOST_PP_ITERATION()
-# define Q BOOST_PYTHON_CV_QUALIFIER(BOOST_PP_RELATIVE_ITERATION(1))
-
-template <class R, class T BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class A)>
-boost::type<R>* result(R (T::*pmf)(BOOST_PP_ENUM_PARAMS_Z(1, N, A)) Q, int = 0)
-{
-    return 0;
-}
-
-# undef N
-# undef Q
-
-#endif
diff --git a/include/boost/python/detail/scope.hpp b/include/boost/python/detail/scope.hpp
deleted file mode 100644
index 94528fa1..00000000
--- a/include/boost/python/detail/scope.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef SCOPE_DWA2002927_HPP
-# define SCOPE_DWA2002927_HPP
-
-# include <boost/python/detail/config.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-void BOOST_PYTHON_DECL scope_setattr_doc(char const* name, object const& obj, char const* doc);
-
-}}} // namespace boost::python::detail
-
-#endif // SCOPE_DWA2002927_HPP
diff --git a/include/boost/python/detail/signature.hpp b/include/boost/python/detail/signature.hpp
deleted file mode 100644
index 581ed767..00000000
--- a/include/boost/python/detail/signature.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-#if !defined(BOOST_PP_IS_ITERATING)
-
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# ifndef SIGNATURE_DWA20021121_HPP
-#  define SIGNATURE_DWA20021121_HPP
-
-#  include <boost/python/type_id.hpp>
-
-#  include <boost/python/detail/preprocessor.hpp>
-#  include <boost/python/detail/indirect_traits.hpp>
-
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/iteration/local.hpp>
-
-#  include <boost/mpl/at.hpp>
-#  include <boost/mpl/size.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-struct signature_element
-{
-    char const* basename;
-    bool lvalue;
-};
-
-template <unsigned> struct signature_arity;
-
-#  define BOOST_PP_ITERATION_PARAMS_1                                            \
-        (3, (0, BOOST_PYTHON_MAX_ARITY + 1, <boost/python/detail/signature.hpp>))
-#  include BOOST_PP_ITERATE()
-
-// A metafunction returning the base class used for
-//
-//   signature<class F, class CallPolicies, class Sig>.
-//
-template <class Sig>
-struct signature_base_select
-{
-    enum { arity = mpl::size<Sig>::value - 1 };
-    typedef typename signature_arity<arity>::template impl<Sig> type;
-};
-
-template <class Sig>
-struct signature
-    : signature_base_select<Sig>::type
-{
-};
-
-}}} // namespace boost::python::detail
-
-# endif // SIGNATURE_DWA20021121_HPP
-
-#else
-
-# define N BOOST_PP_ITERATION()
-
-template <>
-struct signature_arity<N>
-{
-    template <class Sig>
-    struct impl
-    {
-        static signature_element const* elements()
-        {
-            static signature_element const result[N+2] = {
-                
-# define BOOST_PP_LOCAL_MACRO(i)                                                            \
-     {                                                                                      \
-         type_id<BOOST_DEDUCED_TYPENAME mpl::at_c<Sig,i>::type>().name()                    \
-       , is_reference_to_non_const<BOOST_DEDUCED_TYPENAME mpl::at_c<Sig,i>::type>::value    \
-     },
-                
-# define BOOST_PP_LOCAL_LIMITS (0, N)
-# include BOOST_PP_LOCAL_ITERATE()
-                {0,0}
-            };
-            return result;
-        }
-    };
-};
-
-#endif // BOOST_PP_IS_ITERATING 
-
-
diff --git a/include/boost/python/detail/string_literal.hpp b/include/boost/python/detail/string_literal.hpp
deleted file mode 100644
index ee8cc0b6..00000000
--- a/include/boost/python/detail/string_literal.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef STRING_LITERAL_DWA2002629_HPP
-# define STRING_LITERAL_DWA2002629_HPP
-
-# include <cstddef>
-# include <boost/type.hpp>
-# include <boost/type_traits/array_traits.hpp>
-# include <boost/type_traits/same_traits.hpp>
-# include <boost/mpl/bool.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-template <class T>
-struct is_string_literal : mpl::false_
-{
-};
-
-#  if !defined(__MWERKS__) || __MWERKS__ > 0x2407
-template <std::size_t n>
-struct is_string_literal<char const[n]> : mpl::true_
-{
-};
-
-#   if (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031) \
-  || (defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
-// This compiler mistakenly gets the type of string literals as char*
-// instead of char[NN].
-template <>
-struct is_string_literal<char* const> : mpl::true_
-{
-};
-#   endif
-
-#  else
-
-// CWPro7 has trouble with the array type deduction above
-template <class T, std::size_t n>
-struct is_string_literal<T[n]>
-    : is_same<T, char const>
-{
-};
-#  endif 
-# else
-template <bool is_array = true>
-struct string_literal_helper
-{
-    typedef char (&yes_string_literal)[1];
-    typedef char (&no_string_literal)[2];
-
-    template <class T>
-    struct apply
-    {
-        typedef apply<T> self;
-        static T x;
-        static yes_string_literal check(char const*);
-        static no_string_literal check(char*);
-        static no_string_literal check(void const volatile*);
-        
-        BOOST_STATIC_CONSTANT(
-            bool, value = sizeof(self::check(x)) == sizeof(yes_string_literal));
-        typedef mpl::bool_<value> type;
-    };
-};
-
-template <>
-struct string_literal_helper<false>
-{
-    template <class T>
-    struct apply : mpl::false_
-    {
-    };
-};
-
-template <class T>
-struct is_string_literal
-    : string_literal_helper<is_array<T>::value>::apply<T>
-{
-};
-# endif
-
-}}} // namespace boost::python::detail
-
-#endif // STRING_LITERAL_DWA2002629_HPP
diff --git a/include/boost/python/detail/target.hpp b/include/boost/python/detail/target.hpp
deleted file mode 100644
index 5a3d490d..00000000
--- a/include/boost/python/detail/target.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#if !defined(BOOST_PP_IS_ITERATING)
-
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# ifndef TARGET_DWA2002521_HPP
-#  define TARGET_DWA2002521_HPP
-
-#  include <boost/python/detail/preprocessor.hpp>
-
-#  include <boost/type.hpp>
-
-#  include <boost/preprocessor/comma_if.hpp>
-#  include <boost/preprocessor/if.hpp>
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/debug/line.hpp>
-#  include <boost/preprocessor/enum_params.hpp>
-#  include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-#  define BOOST_PP_ITERATION_PARAMS_1                                                                   \
-    (4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/target.hpp>, BOOST_PYTHON_FUNCTION_POINTER))
-#  include BOOST_PP_ITERATE()
-
-#  define BOOST_PP_ITERATION_PARAMS_1                                                                    \
-    (4, (0, BOOST_PYTHON_CV_COUNT - 1, <boost/python/detail/target.hpp>, BOOST_PYTHON_POINTER_TO_MEMBER))
-#  include BOOST_PP_ITERATE()
-
-template <class R, class T>
-T& (* target(R (T::*)) )() { return 0; }
-
-}}} // namespace boost::python::detail
-
-# endif // TARGET_DWA2002521_HPP
-
-/* --------------- function pointers --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_FUNCTION_POINTER
-# line BOOST_PP_LINE(__LINE__, target.hpp(function_pointers))
-
-# define N BOOST_PP_ITERATION()
-
-template <class R BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class A)>
-BOOST_PP_IF(N, A0, void)(* target(R (*)(BOOST_PP_ENUM_PARAMS_Z(1, N, A))) )()
-{
-    return 0;
-}
-
-# undef N
-
-/* --------------- pointers-to-members --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == BOOST_PYTHON_POINTER_TO_MEMBER
-// Outer over cv-qualifiers
-
-# define BOOST_PP_ITERATION_PARAMS_2 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/target.hpp>))
-# include BOOST_PP_ITERATE()
-
-#elif BOOST_PP_ITERATION_DEPTH() == 2
-# line BOOST_PP_LINE(__LINE__, target.hpp(pointers-to-members))
-// Inner over arities
-
-# define N BOOST_PP_ITERATION()
-# define Q BOOST_PYTHON_CV_QUALIFIER(BOOST_PP_RELATIVE_ITERATION(1))
-
-template <class R, class T BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class A)>
-T& (* target(R (T::*)(BOOST_PP_ENUM_PARAMS_Z(1, N, A)) Q) )()
-{
-    return 0;
-}
-
-# undef N
-# undef Q
-
-#endif
diff --git a/include/boost/python/detail/translate_exception.hpp b/include/boost/python/detail/translate_exception.hpp
deleted file mode 100644
index 62f931a5..00000000
--- a/include/boost/python/detail/translate_exception.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef TRANSLATE_EXCEPTION_DWA2002810_HPP
-# define TRANSLATE_EXCEPTION_DWA2002810_HPP
-
-# include <boost/python/detail/exception_handler.hpp>
-
-# include <boost/call_traits.hpp>
-# include <boost/type_traits/add_const.hpp>
-
-# include <boost/function/function0.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-// A ternary function object used to translate C++ exceptions of type
-// ExceptionType into Python exceptions by invoking an object of type
-// Translate. Typically the translate function will be curried with
-// boost::bind().
-template <class ExceptionType, class Translate>
-struct translate_exception
-{
-    typedef typename add_reference<
-        typename add_const<ExceptionType>::type
-    >::type exception_cref;
-    
-    inline bool operator()(
-        exception_handler const& handler
-      , function0<void> const& f
-      , typename call_traits<Translate>::param_type translate) const
-    {
-        try
-        {
-            return handler(f);
-        }
-        catch(exception_cref e)
-        {
-            translate(e);
-            return true;
-        }
-    }
-};
-
-}}} // namespace boost::python::detail
-
-#endif // TRANSLATE_EXCEPTION_DWA2002810_HPP
diff --git a/include/boost/python/detail/type_list.hpp b/include/boost/python/detail/type_list.hpp
deleted file mode 100644
index 2e2def2f..00000000
--- a/include/boost/python/detail/type_list.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef TYPE_LIST_DWA2002913_HPP
-# define TYPE_LIST_DWA2002913_HPP
-
-# include <boost/config.hpp>
-# include <boost/python/detail/preprocessor.hpp>
-# include <boost/preprocessor/arithmetic/inc.hpp>
-
-# if BOOST_PYTHON_MAX_ARITY + 2 > BOOST_PYTHON_MAX_BASES
-#  define BOOST_PYTHON_LIST_SIZE BOOST_PP_INC(BOOST_PP_INC(BOOST_PYTHON_MAX_ARITY))
-# else
-#  define BOOST_PYTHON_LIST_SIZE BOOST_PYTHON_MAX_BASES
-# endif
-
-// Compute the MPL vector header to use for lists up to BOOST_PYTHON_LIST_SIZE in length
-# if BOOST_PYTHON_LIST_SIZE > 48
-#  error Arities above 48 not supported by Boost.Python due to MPL internal limit
-# elif BOOST_PYTHON_LIST_SIZE > 38
-#  include <boost/mpl/vector/vector50.hpp>
-# elif BOOST_PYTHON_LIST_SIZE > 28
-#  include <boost/mpl/vector/vector40.hpp>
-# elif BOOST_PYTHON_LIST_SIZE > 18
-#  include <boost/mpl/vector/vector30.hpp>
-# elif BOOST_PYTHON_LIST_SIZE > 8
-#  include <boost/mpl/vector/vector20.hpp>
-# else
-#  include <boost/mpl/vector/vector10.hpp>
-# endif
-
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#  include <boost/python/detail/type_list_impl.hpp>
-# else
-#  include <boost/python/detail/type_list_impl_no_pts.hpp>
-# endif
-
-#endif // TYPE_LIST_DWA2002913_HPP
diff --git a/include/boost/python/detail/type_list_impl.hpp b/include/boost/python/detail/type_list_impl.hpp
deleted file mode 100644
index 545664f9..00000000
--- a/include/boost/python/detail/type_list_impl.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef BOOST_PP_IS_ITERATING
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-# ifndef TYPE_LIST_IMPL_DWA2002913_HPP
-#  define TYPE_LIST_IMPL_DWA2002913_HPP
-
-#  include <boost/python/detail/type_list.hpp>
-
-#  include <boost/preprocessor/enum_params.hpp>
-#  include <boost/preprocessor/enum_params_with_a_default.hpp>
-#  include <boost/preprocessor/repetition/enum.hpp>
-#  include <boost/preprocessor/comma_if.hpp>
-#  include <boost/preprocessor/arithmetic/sub.hpp>
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/repetition/enum_trailing.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-template <BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(BOOST_PYTHON_LIST_SIZE, class T, mpl::void_)>
-struct type_list
-    : BOOST_PP_CAT(mpl::vector,BOOST_PYTHON_LIST_SIZE)<BOOST_PP_ENUM_PARAMS_Z(1, BOOST_PYTHON_LIST_SIZE, T)>
-{
-};
-
-#  define BOOST_PP_ITERATION_PARAMS_1                                                                   \
-        (3, (0, BOOST_PP_DEC(BOOST_PYTHON_LIST_SIZE), <boost/python/detail/type_list_impl.hpp>))
-#  include BOOST_PP_ITERATE()
-
-
-}}} // namespace boost::python::detail
-
-# endif // TYPE_LIST_IMPL_DWA2002913_HPP
-
-#else // BOOST_PP_IS_ITERATING
-
-# define N BOOST_PP_ITERATION()
-# define BOOST_PYTHON_VOID_ARGS BOOST_PP_SUB_D(1,BOOST_PYTHON_LIST_SIZE,N)
-
-template <
-    BOOST_PP_ENUM_PARAMS_Z(1, N, class T)
-    >
-struct type_list<
-    BOOST_PP_ENUM_PARAMS_Z(1, N, T)
-    BOOST_PP_COMMA_IF(N)
-    BOOST_PP_ENUM(
-        BOOST_PYTHON_VOID_ARGS, BOOST_PYTHON_FIXED, mpl::void_)
-    >
-   : BOOST_PP_CAT(mpl::vector,N)<BOOST_PP_ENUM_PARAMS_Z(1, N, T)>
-{
-};
-
-# undef BOOST_PYTHON_VOID_ARGS
-# undef N
-
-#endif // BOOST_PP_IS_ITERATING 
diff --git a/include/boost/python/detail/type_list_impl_no_pts.hpp b/include/boost/python/detail/type_list_impl_no_pts.hpp
deleted file mode 100644
index 280db11e..00000000
--- a/include/boost/python/detail/type_list_impl_no_pts.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef BOOST_PP_IS_ITERATING
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-# ifndef TYPE_LIST_IMPL_NO_PTS_DWA2002913_HPP
-#  define TYPE_LIST_IMPL_NO_PTS_DWA2002913_HPP
-
-#  include <boost/python/detail/type_list.hpp>
-
-#  include <boost/preprocessor/enum_params.hpp>
-#  include <boost/preprocessor/enum_params_with_a_default.hpp>
-#  include <boost/preprocessor/cat.hpp>
-#  include <boost/preprocessor/repeat.hpp>
-#  include <boost/preprocessor/empty.hpp>
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/mpl/void.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-template< typename T >
-struct is_list_arg
-{
-    enum { value = true };
-};
-
-template<>
-struct is_list_arg<mpl::void_>
-{
-    enum { value = false };
-};
-
-template<int> struct type_list_impl_chooser;
-
-#  define BOOST_PYTHON_LIST_ACTUAL_PARAMS BOOST_PP_ENUM_PARAMS_Z(1,BOOST_PYTHON_LIST_SIZE,T)
-#  define BOOST_PYTHON_LIST_FORMAL_PARAMS BOOST_PP_ENUM_PARAMS_Z(1,BOOST_PYTHON_LIST_SIZE,class T)
-
-#  define BOOST_PP_ITERATION_PARAMS_1                                                           \
-        (3, (0, BOOST_PYTHON_LIST_SIZE, <boost/python/detail/type_list_impl_no_pts.hpp>))
-#  include BOOST_PP_ITERATE()
-
-#  define BOOST_PYTHON_PLUS() +
-#  define BOOST_PYTHON_IS_LIST_ARG(z, n, data)          \
-    BOOST_PP_IF(n, BOOST_PYTHON_PLUS, BOOST_PP_EMPTY)() \
-    is_list_arg< BOOST_PP_CAT(T,n) >::value
-    
-template<
-    BOOST_PYTHON_LIST_FORMAL_PARAMS
-    >
-struct type_list_count_args
-{
-    enum { value =
-           BOOST_PP_REPEAT_1(BOOST_PYTHON_LIST_SIZE, BOOST_PYTHON_IS_LIST_ARG, _)
-    };
-};
-
-template<
-    BOOST_PYTHON_LIST_FORMAL_PARAMS
-    >
-struct type_list_impl
-{
-    typedef type_list_count_args< BOOST_PYTHON_LIST_ACTUAL_PARAMS > arg_num_;
-    typedef typename detail::type_list_impl_chooser< arg_num_::value >
-    ::template result_< BOOST_PYTHON_LIST_ACTUAL_PARAMS >::type type;
-};
-
-template<
-    BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(BOOST_PYTHON_LIST_SIZE, class T, mpl::void_)
-    >
-struct type_list
-    : detail::type_list_impl< BOOST_PYTHON_LIST_ACTUAL_PARAMS >::type
-{
-    typedef typename detail::type_list_impl<
-        BOOST_PYTHON_LIST_ACTUAL_PARAMS
-        >::type type;
-};
-
-#  undef BOOST_PYTHON_IS_LIST_ARG
-#  undef BOOST_PYTHON_PLUS
-#  undef BOOST_PYTHON_LIST_FORMAL_PARAMS
-#  undef BOOST_PYTHON_LIST_ACTUAL_PARAMS
-
-}}} // namespace boost::python::detail
-
-# endif // TYPE_LIST_IMPL_NO_PTS_DWA2002913_HPP
-
-#else // BOOST_PP_IS_ITERATING
-
-# define N BOOST_PP_ITERATION()
-
-template<>
-struct type_list_impl_chooser<N>
-{
-    template<
-        BOOST_PYTHON_LIST_FORMAL_PARAMS
-        >
-    struct result_
-    {
-        typedef typename BOOST_PP_CAT(mpl::vector,N)<
-            BOOST_PP_ENUM_PARAMS(N, T)
-            >::type type;
-    };
-};
-
-# undef N
-
-#endif // BOOST_PP_IS_ITERATING 
diff --git a/include/boost/python/detail/unwind_type.hpp b/include/boost/python/detail/unwind_type.hpp
deleted file mode 100644
index 878b6cc1..00000000
--- a/include/boost/python/detail/unwind_type.hpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef UNWIND_TYPE_DWA200222_HPP
-# define UNWIND_TYPE_DWA200222_HPP
-
-# include <boost/python/detail/cv_category.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/type_traits/object_traits.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-template <class Generator, class U>
-inline typename Generator::result_type
-unwind_type_cv(U* p, cv_unqualified, Generator* = 0)
-{
-    return Generator::execute(p);
-}
-    
-template <class Generator, class U>
-inline typename Generator::result_type
-unwind_type_cv(U const* p, const_, Generator* = 0)
-{
-    return unwind_type(const_cast<U*>(p), (Generator*)0);
-}
-    
-template <class Generator, class U>
-inline typename Generator::result_type
-unwind_type_cv(U volatile* p, volatile_, Generator* = 0)
-{
-    return unwind_type(const_cast<U*>(p), (Generator*)0);
-}
-    
-template <class Generator, class U>
-inline typename Generator::result_type
-unwind_type_cv(U const volatile* p, const_volatile_, Generator* = 0)
-{
-    return unwind_type(const_cast<U*>(p), (Generator*)0);
-}
-    
-template <class Generator, class U>
-inline typename Generator::result_type
-unwind_ptr_type(U* p, Generator* = 0)
-{
-    typedef typename cv_category<U>::type tag;
-    return unwind_type_cv<Generator>(p, tag());
-}
-
-template <bool is_ptr>
-struct unwind_helper
-{
-    template <class Generator, class U>
-    static typename Generator::result_type
-    execute(U p, Generator* = 0)
-    {
-        return unwind_ptr_type(p, (Generator*)0);
-    }
-};
-
-template <>
-struct unwind_helper<false>
-{
-    template <class Generator, class U>
-    static typename Generator::result_type
-    execute(U& p, Generator* = 0)
-    {
-        return unwind_ptr_type(&p, (Generator*)0);
-    }
-};
-
-template <class Generator, class U>
-inline typename Generator::result_type
-unwind_type(U const& p, Generator* = 0)
-{
-    return unwind_helper<is_pointer<U>::value>::execute(p, (Generator*)0);
-}
-
-enum { direct_ = 0, pointer_ = 1, reference_ = 2, reference_to_pointer_ = 3 };
-template <int indirection> struct unwind_helper2;
-
-template <>
-struct unwind_helper2<direct_>
-{
-    template <class Generator, class U>
-    static typename Generator::result_type
-    execute(U(*)(), Generator* = 0)
-    {
-        return unwind_ptr_type((U*)0, (Generator*)0);
-    }
-};
-
-template <>
-struct unwind_helper2<pointer_>
-{
-    template <class Generator, class U>
-    static typename Generator::result_type
-    execute(U*(*)(), Generator* = 0)
-    {
-        return unwind_ptr_type((U*)0, (Generator*)0);
-    }
-};
-
-template <>
-struct unwind_helper2<reference_>
-{
-    template <class Generator, class U>
-    static typename Generator::result_type
-    execute(U&(*)(), Generator* = 0)
-    {
-        return unwind_ptr_type((U*)0, (Generator*)0);
-    }
-};
-
-template <>
-struct unwind_helper2<reference_to_pointer_>
-{
-    template <class Generator, class U>
-    static typename Generator::result_type
-    execute(U&(*)(), Generator* = 0)
-    {
-        return unwind_ptr_type(U(0), (Generator*)0);
-    }
-};
-
-// Call this one with both template parameters explicitly specified
-// and no function arguments:
-//
-//      return unwind_type<my_generator,T>();
-//
-// Doesn't work if T is an array type; we could handle that case, but
-// why bother?
-template <class Generator, class U>
-inline typename Generator::result_type
-unwind_type(boost::type<U>*p = 0, Generator* = 0)
-{
-    BOOST_STATIC_CONSTANT(int, indirection
-                          = (is_pointer<U>::value ? pointer_ : 0)
-                          + (is_reference_to_pointer<U>::value
-                             ? reference_to_pointer_
-                             : is_reference<U>::value
-                             ? reference_
-                             : 0));
-        
-    return unwind_helper2<indirection>::execute((U(*)())0,(Generator*)0);
-}
-
-}}} // namespace boost::python::detail
-
-#endif // UNWIND_TYPE_DWA200222_HPP
diff --git a/include/boost/python/detail/value_is_shared_ptr.hpp b/include/boost/python/detail/value_is_shared_ptr.hpp
deleted file mode 100644
index 5d2c8abe..00000000
--- a/include/boost/python/detail/value_is_shared_ptr.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef VALUE_IS_SHARED_PTR_DWA2003224_HPP
-# define VALUE_IS_SHARED_PTR_DWA2003224_HPP
-
-# include <boost/python/detail/value_is_xxx.hpp>
-# include <boost/shared_ptr.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-BOOST_PYTHON_VALUE_IS_XXX_DEF(shared_ptr, shared_ptr, 1)
-    
-}}} // namespace boost::python::detail
-
-#endif // VALUE_IS_SHARED_PTR_DWA2003224_HPP
diff --git a/include/boost/python/detail/value_is_xxx.hpp b/include/boost/python/detail/value_is_xxx.hpp
deleted file mode 100644
index f0a9a11c..00000000
--- a/include/boost/python/detail/value_is_xxx.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef VALUE_IS_XXX_DWA2003224_HPP
-# define VALUE_IS_XXX_DWA2003224_HPP
-
-# include <boost/config.hpp>
-# include <boost/mpl/bool.hpp>
-# include <boost/preprocessor/enum_params.hpp>
-
-# if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-# include <boost/type_traits/is_reference.hpp>
-# include <boost/type_traits/add_reference.hpp>
-
-#  define BOOST_PYTHON_VALUE_IS_XXX_DEF(name, qualified_name, nargs)    \
-template <class X_>                                                     \
-struct value_is_##name                                                  \
-{                                                                       \
-    typedef char yes;                                                   \
-    typedef char (&no)[2];                                              \
-                                                                        \
-    static typename add_reference<X_>::type dummy;                      \
-                                                                        \
-    template < BOOST_PP_ENUM_PARAMS_Z(1, nargs, class U) >              \
-    static yes test(                                                    \
-       qualified_name< BOOST_PP_ENUM_PARAMS_Z(1, nargs, U) > const&, int \
-    );                                                                  \
-                                                                        \
-    template <class U>                                                  \
-    static no test(U&, ...);                                            \
-                                                                        \
-    BOOST_STATIC_CONSTANT(                                              \
-        bool, value                                                     \
-        = (sizeof(test(dummy, 0)) == sizeof(yes)));                     \
-                                                                        \
-    typedef mpl::bool_<value> type;                                    \
-};
-
-# else
-
-#  include <boost/type_traits/remove_reference.hpp>
-#  include <boost/type_traits/remove_cv.hpp>
-#  include <boost/python/detail/is_xxx.hpp>
-
-#  define BOOST_PYTHON_VALUE_IS_XXX_DEF(name, qualified_name, nargs)    \
-template <class X_>                                                     \
-struct value_is_##name                                                  \
-{                                                                       \
-    BOOST_PYTHON_IS_XXX_DEF(name,qualified_name,nargs)                  \
-    BOOST_STATIC_CONSTANT(bool, value = is_##name<                      \
-                               typename remove_cv<                      \
-                                  typename remove_reference<X_>::type   \
-                               >::type                                  \
-                           >::value);                                   \
-    typedef mpl::bool_<value> type;                                    \
-                                                                        \
-};                                                              
-
-# endif
-
-#endif // VALUE_IS_XXX_DWA2003224_HPP
diff --git a/include/boost/python/detail/void_ptr.hpp b/include/boost/python/detail/void_ptr.hpp
deleted file mode 100644
index 07c5d3a5..00000000
--- a/include/boost/python/detail/void_ptr.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef VOID_PTR_DWA200239_HPP
-# define VOID_PTR_DWA200239_HPP
-
-# include <boost/type_traits/remove_cv.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-template <class U>
-inline U& void_ptr_to_reference(void const volatile* p, U&(*)())
-{
-    return *(U*)p;
-}
-
-template <class T>
-inline void write_void_ptr(void const volatile* storage, void* ptr, T*)
-{
-    *(T**)storage = (T*)ptr;
-}
-
-// writes U(ptr) into the storage
-template <class U>
-inline void write_void_ptr_reference(void const volatile* storage, void* ptr, U&(*)())
-{
-    // stripping CV qualification suppresses warnings on older EDGs
-    typedef typename remove_cv<U>::type u_stripped; 
-    write_void_ptr(storage, ptr, u_stripped(0));
-}
-
-}}} // namespace boost::python::detail
-
-#endif // VOID_PTR_DWA200239_HPP
diff --git a/include/boost/python/detail/void_return.hpp b/include/boost/python/detail/void_return.hpp
deleted file mode 100644
index 512aa636..00000000
--- a/include/boost/python/detail/void_return.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef VOID_RETURN_DWA200274_HPP
-# define VOID_RETURN_DWA200274_HPP
-
-# include <boost/config.hpp>
-
-namespace boost { namespace python { namespace detail { 
-
-struct void_return
-{
-    void_return() {}
- private: 
-    void operator=(void_return const&);
-};
-
-template <class T>
-struct returnable
-{
-    typedef T type;
-};
-
-# ifdef BOOST_NO_VOID_RETURNS
-template <>
-struct returnable<void>
-{
-    typedef void_return type;
-};
-
-#  ifndef BOOST_NO_CV_VOID_SPECIALIZATIONS
-template <> struct returnable<const void> : returnable<void> {};
-template <> struct returnable<volatile void> : returnable<void> {};
-template <> struct returnable<const volatile void> : returnable<void> {};
-#  endif
-
-# endif // BOOST_NO_VOID_RETURNS
-
-}}} // namespace boost::python::detail
-
-#endif // VOID_RETURN_DWA200274_HPP
diff --git a/include/boost/python/detail/wrap_python.hpp b/include/boost/python/detail/wrap_python.hpp
deleted file mode 100644
index ecd77810..00000000
--- a/include/boost/python/detail/wrap_python.hpp
+++ /dev/null
@@ -1,167 +0,0 @@
-//  (C) Copyright David Abrahams 2000. Permission to copy, use, modify, sell and
-//  distribute this software is granted provided this copyright notice appears
-//  in all copies. This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-//  The author gratefully acknowleges the support of Dragon Systems, Inc., in
-//  producing this work.
-
-//  This file serves as a wrapper around <Python.h> which allows it to be
-//  compiled with GCC 2.95.2 under Win32 and which disables the default MSVC
-//  behavior so that a program may be compiled in debug mode without requiring a
-//  special debugging build of the Python library.
-
-
-//  To use the Python debugging library, #define BOOST_DEBUG_PYTHON on the
-//  compiler command-line.
-
-// Revision History:
-// 05 Mar 01  Suppress warnings under Cygwin with Python 2.0 (Dave Abrahams)
-// 04 Mar 01  Rolled in some changes from the Dragon fork (Dave Abrahams)
-// 01 Mar 01  define PyObject_INIT() for Python 1.x (Dave Abrahams)
-
-//
-// Python's LongObject.h helpfully #defines ULONGLONG_MAX for us,
-// which confuses Boost's config
-//
-#include <limits.h>
-#ifndef ULONG_MAX
-# define BOOST_PYTHON_ULONG_MAX_UNDEFINED
-#endif
-#ifndef LONGLONG_MAX
-# define BOOST_PYTHON_LONGLONG_MAX_UNDEFINED
-#endif
-#ifndef ULONGLONG_MAX
-# define BOOST_PYTHON_ULONGLONG_MAX_UNDEFINED
-#endif
-
-//
-// Get ahold of Python's version number
-//
-#include <patchlevel.h>
-
-#ifdef _DEBUG
-# ifndef BOOST_DEBUG_PYTHON
-#  undef _DEBUG // Don't let Python force the debug library just because we're debugging.
-#  define DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
-# endif
-#endif
-
-//
-// Some things we need in order to get Python.h to work with compilers other
-// than MSVC on Win32
-//
-#if defined(_WIN32) || defined(__CYGWIN__)
-# if defined(__GNUC__) && defined(__CYGWIN__)
-
-#  define SIZEOF_LONG 4
-
-#  if PY_MAJOR_VERSION < 2 || PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 2
-
-typedef int pid_t;
-
-#   define WORD_BIT 32
-#   define hypot _hypot
-#   include <stdio.h>
-
-#   if PY_MAJOR_VERSION < 2
-#    define HAVE_CLOCK
-#    define HAVE_STRFTIME
-#    define HAVE_STRERROR
-#   endif
-
-#   define NT_THREADS
-
-#   ifndef NETSCAPE_PI
-#    define USE_SOCKET
-#   endif
-
-#   ifdef USE_DL_IMPORT
-#    define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
-#   endif
-
-#   ifdef USE_DL_EXPORT
-#    define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE
-#    define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
-#   endif
-
-#   define HAVE_LONG_LONG 1
-#   define LONG_LONG long long
-#  endif 
-
-# elif defined(__MWERKS__)
-
-#  ifndef _MSC_VER
-#   define PY_MSC_VER_DEFINED_FROM_WRAP_PYTHON_H 1
-#   define _MSC_VER 900
-#  endif
-
-#  if PY_MAJOR_VERSION < 2 || PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 2
-#   include <config.h>
-#  else
-#   include <pyconfig.h>
-#  endif
-#  undef hypot // undo the evil #define left by Python.
-
-# elif defined(__BORLANDC__)
-#  if PY_MAJOR_VERSION < 2 || PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 2
-#   include <config.h>
-#  else
-#   include <pyconfig.h>
-#  endif
-#  undef HAVE_HYPOT
-#  define HAVE_HYPOT 1
-# endif
-
-#endif // _WIN32
-
-#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 2 && PY_MICRO_VERSION < 2
-# include <boost/python/detail/python22_fixed.h>
-#else
-# include <Python.h>
-#endif
-
-#ifdef BOOST_PYTHON_ULONG_MAX_UNDEFINED
-# undef ULONG_MAX
-# undef BOOST_PYTHON_ULONG_MAX_UNDEFINED
-#endif
-
-#ifdef BOOST_PYTHON_LONGLONG_MAX_UNDEFINED
-# undef LONGLONG_MAX
-# undef BOOST_PYTHON_LONGLONG_MAX_UNDEFINED
-#endif
-
-#ifdef BOOST_PYTHON_ULONGLONG_MAX_UNDEFINED
-# undef ULONGLONG_MAX
-# undef BOOST_PYTHON_ULONGLONG_MAX_UNDEFINED
-#endif
-
-#ifdef PY_MSC_VER_DEFINED_FROM_WRAP_PYTHON_H
-# undef _MSC_VER
-#endif
-
-#ifdef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
-# undef DEBUG_UNDEFINED_FROM_WRAP_PYTHON_H
-# define _DEBUG
-#endif
-
-#if !defined(PY_MAJOR_VERSION) || PY_MAJOR_VERSION < 2
-# define PyObject_INIT(op, typeobj) \
-        ( (op)->ob_type = (typeobj), _Py_NewReference((PyObject *)(op)), (op) )
-#endif
-
-#ifdef __MWERKS__
-# pragma warn_possunwant off
-#elif _MSC_VER
-# pragma warning(disable:4786)
-#endif
-
-#if defined(HAVE_LONG_LONG)
-# if defined(PY_LONG_LONG)
-#  define BOOST_PYTHON_LONG_LONG PY_LONG_LONG
-# elif defined(LONG_LONG)
-#  define BOOST_PYTHON_LONG_LONG LONG_LONG
-# else
-#  error "HAVE_LONG_LONG defined but not PY_LONG_LONG or LONG_LONG"
-# endif
-#endif
diff --git a/include/boost/python/dict.hpp b/include/boost/python/dict.hpp
deleted file mode 100644
index 63a672af..00000000
--- a/include/boost/python/dict.hpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef DICT_20020706_HPP
-#define DICT_20020706_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-#include <boost/python/object.hpp>
-#include <boost/python/list.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/converter/pytype_object_mgr_traits.hpp>
-
-namespace boost { namespace python {
-
-class dict;
-
-namespace detail
-{
-  struct BOOST_PYTHON_DECL dict_base : object
-  {
-      // D.clear() -> None.  Remove all items from D.
-      void clear();
-
-      // D.copy() -> a shallow copy of D
-      dict copy();
-
-      // D.get(k[,d]) -> D[k] if D.has_key(k), else d.  d defaults to None.
-      object get(object_cref k) const;
-    
-      object get(object_cref k, object_cref d) const;
-
-      // D.has_key(k) -> 1 if D has a key k, else 0
-      bool has_key(object_cref k) const;
-
-      // D.items() -> list of D's (key, value) pairs, as 2-tuples
-      list items() const;
- 
-      // D.iteritems() -> an iterator over the (key, value) items of D
-      object iteritems() const;
-
-      // D.iterkeys() -> an iterator over the keys of D
-      object iterkeys() const;
-
-      // D.itervalues() -> an iterator over the values of D
-      object itervalues() const;
- 
-      // D.keys() -> list of D's keys
-      list keys() const;
- 
-      // D.popitem() -> (k, v), remove and return some (key, value) pair as a
-      // 2-tuple; but raise KeyError if D is empty
-      tuple popitem();
-
-      // D.setdefault(k[,d]) -> D.get(k,d), also set D[k]=d if not D.has_key(k)
-      object setdefault(object_cref k);
-
-      object setdefault(object_cref k, object_cref d);
-
-      // D.update(E) -> None.  Update D from E: for k in E.keys(): D[k] = E[k]
-      void update(object_cref E);
-
-      // D.values() -> list of D's values
-      list values() const;
-
-   protected:
-      // dict() -> new empty dictionary.
-      // dict(mapping) -> new dictionary initialized from a mapping object's
-      //     (key, value) pairs.
-      // dict(seq) -> new dictionary initialized as if via:
-      dict_base();   // new dict
-      explicit dict_base(object_cref data);
-
-      BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(dict_base, object)
-   private:
-      static detail::new_reference call(object const&);
-  };
-}
-
-class dict : public detail::dict_base
-{
-    typedef detail::dict_base base;
- public:
-    // dict() -> new empty dictionary.
-    // dict(mapping) -> new dictionary initialized from a mapping object's
-    //     (key, value) pairs.
-    // dict(seq) -> new dictionary initialized as if via:
-    dict() {}   // new dict
-
-    template <class T>
-    explicit dict(T const& data)
-        : base(object(data))
-    {
-    }
-
-    template<class T>
-    object get(T const& k) const 
-    {
-        return base::get(object(k));
-    }
-    
-    template<class T1, class T2>
-    object get(T1 const& k, T2 const& d) const 
-    {
-        return base::get(object(k),object(d));
-    }
-    
-    template<class T>
-    bool has_key(T const& k) const
-    {
-        return base::has_key(object(k));
-    }
-    
-    template<class T>
-    object setdefault(T const& k)
-    {
-        return base::setdefault(object(k));
-    }
-    
-    template<class T1, class T2>
-    object setdefault(T1 const& k, T2 const& d)
-    {
-        return base::setdefault(object(k),object(d));
-    }
-
-    template<class T>
-    void update(T const& E)
-    {
-        base::update(object(E));
-    }
-
- public: // implementation detail -- for internal use only
-    BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(dict, base)
-};
-
-//
-// Converter Specializations
-//
-namespace converter
-{
-  template <>
-  struct object_manager_traits<dict>
-      : pytype_object_manager_traits<&PyDict_Type,dict>
-  {
-  };
-}
-
-}}   // namespace boost::python
-
-#endif
-
diff --git a/include/boost/python/enum.hpp b/include/boost/python/enum.hpp
deleted file mode 100644
index 10ea1711..00000000
--- a/include/boost/python/enum.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ENUM_DWA200298_HPP
-# define ENUM_DWA200298_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/object/enum_base.hpp>
-# include <boost/python/converter/rvalue_from_python_data.hpp>
-# include <boost/python/converter/registered.hpp>
-
-namespace boost { namespace python { 
-
-template <class T>
-struct enum_ : public objects::enum_base
-{
-    typedef objects::enum_base base;
-
-    // Declare a new enumeration type in the current scope()
-    enum_(char const* name);
-
-    // Add a new enumeration value with the given name and value.
-    inline enum_<T>& value(char const* name, T);
-
-    // Add all of the defined enumeration values to the current scope with the
-    // same names used here.
-    inline enum_<T>& export_values();
- private:
-    static PyObject* to_python(void const* x);
-    static void* convertible_from_python(PyObject* obj);
-    static void construct(PyObject* obj, converter::rvalue_from_python_stage1_data* data);
-};
-
-template <class T>
-inline enum_<T>::enum_(char const* name)
-    : base(
-        name
-        , &enum_<T>::to_python
-        , &enum_<T>::convertible_from_python
-        , &enum_<T>::construct
-        , type_id<T>())
-{
-}
-
-// This is the conversion function that gets registered for converting
-// these enums to Python.
-template <class T>
-PyObject* enum_<T>::to_python(void const* x)
-{
-    return base::to_python(
-        converter::registered<T>::converters.m_class_object
-        , static_cast<long>(*(T const*)x));
-}
-
-//
-// The following two static functions serve as the elements of an
-// rvalue from_python converter for the enumeration type.
-//
-
-// This checks that a given Python object can be converted to the
-// enumeration type.
-template <class T>
-void* enum_<T>::convertible_from_python(PyObject* obj)
-{
-    return PyObject_IsInstance(
-        obj
-        , upcast<PyObject>(
-            converter::registered<T>::converters.m_class_object))
-        
-        ? obj : 0;
-}
-
-// Constructs an instance of the enumeration type in the from_python
-// data.
-template <class T>
-void enum_<T>::construct(PyObject* obj, converter::rvalue_from_python_stage1_data* data)
-{
-    T x = static_cast<T>(PyInt_AS_LONG(obj));
-    void* const storage = ((converter::rvalue_from_python_storage<T>*)data)->storage.bytes;
-    new (storage) T(x);
-    data->convertible = storage;
-}
-
-template <class T>
-inline enum_<T>& enum_<T>::value(char const* name, T x)
-{
-    this->add_value(name, static_cast<long>(x));
-    return *this;
-}
-
-template <class T>
-inline enum_<T>& enum_<T>::export_values()
-{
-    this->base::export_values();
-    return *this;
-}
-
-}} // namespace boost::python
-
-#endif // ENUM_DWA200298_HPP
diff --git a/include/boost/python/errors.hpp b/include/boost/python/errors.hpp
deleted file mode 100644
index 424baf71..00000000
--- a/include/boost/python/errors.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//  (C) Copyright David Abrahams 2000. Permission to copy, use, modify, sell and
-//  distribute this software is granted provided this copyright notice appears
-//  in all copies. This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-//  The author gratefully acknowleges the support of Dragon Systems, Inc., in
-//  producing this work.
-
-#ifndef ERRORS_DWA052500_H_
-# define ERRORS_DWA052500_H_
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/function/function0.hpp>
-
-namespace boost { namespace python {
-
-struct BOOST_PYTHON_DECL error_already_set
-{
-    virtual ~error_already_set();
-};
-
-// Handles exceptions caught just before returning to Python code.
-// Returns true iff an exception was caught.
-BOOST_PYTHON_DECL bool handle_exception_impl(function0<void>);
-
-template <class T>
-bool handle_exception(T f)
-{
-    return handle_exception_impl(function0<void>(boost::ref(f)));
-}
-
-namespace detail { inline void rethrow() { throw; } }
-
-inline void handle_exception()
-{
-    handle_exception(detail::rethrow);
-}
-
-BOOST_PYTHON_DECL void throw_error_already_set();
-
-template <class T>
-inline T* expect_non_null(T* x)
-{
-    if (x == 0)
-        throw_error_already_set();
-    return x;
-}
-
-// Return source if it is an instance of pytype; throw an appropriate
-// exception otherwise.
-BOOST_PYTHON_DECL PyObject* pytype_check(PyTypeObject* pytype, PyObject* source);
-
-}} // namespace boost::python
-
-#endif // ERRORS_DWA052500_H_
diff --git a/include/boost/python/exception_translator.hpp b/include/boost/python/exception_translator.hpp
deleted file mode 100644
index d6eff8a6..00000000
--- a/include/boost/python/exception_translator.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef EXCEPTION_TRANSLATOR_DWA2002810_HPP
-# define EXCEPTION_TRANSLATOR_DWA2002810_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/bind.hpp>
-# include <boost/type.hpp>
-# include <boost/python/detail/translate_exception.hpp>
-# include <boost/python/detail/exception_handler.hpp>
-
-namespace boost { namespace python { 
-
-template <class ExceptionType, class Translate>
-void register_exception_translator(Translate const& translate, boost::type<ExceptionType>* = 0)
-{
-    detail::register_exception_handler(
-        bind<bool>(detail::translate_exception<ExceptionType,Translate>(), _1, _2, translate)
-        );
-}
-
-}} // namespace boost::python
-
-#endif // EXCEPTION_TRANSLATOR_DWA2002810_HPP
diff --git a/include/boost/python/extract.hpp b/include/boost/python/extract.hpp
deleted file mode 100644
index bcc83aa9..00000000
--- a/include/boost/python/extract.hpp
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef EXTRACT_DWA200265_HPP
-# define EXTRACT_DWA200265_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/converter/object_manager.hpp>
-# include <boost/python/converter/from_python.hpp>
-# include <boost/python/converter/rvalue_from_python_data.hpp>
-# include <boost/python/converter/registered.hpp>
-# include <boost/python/converter/registered_pointee.hpp>
-# include <boost/call_traits.hpp>
-# include <boost/python/object_core.hpp>
-# include <boost/python/refcount.hpp>
-# include <boost/utility.hpp>
-# include <boost/python/detail/copy_ctor_mutates_rhs.hpp>
-# include <boost/python/detail/void_ptr.hpp>
-# include <boost/python/detail/void_return.hpp>
-
-namespace boost { namespace python {
-
-namespace converter
-{
-  template <class Ptr>
-  struct extract_pointer
-  {
-      typedef Ptr result_type;
-      extract_pointer(PyObject*);
-      
-      bool check() const;
-      Ptr operator()() const;
-      
-   private:
-      PyObject* m_source;
-      void* m_result;
-  };
-  
-  template <class Ref>
-  struct extract_reference
-  {
-      typedef Ref result_type;
-      extract_reference(PyObject*);
-      
-      bool check() const;
-      Ref operator()() const;
-      
-   private:
-      PyObject* m_source;
-      void* m_result;
-  };
-  
-  template <class T>
-  struct extract_rvalue : private noncopyable
-  {
-      typedef typename mpl::if_<
-          python::detail::copy_ctor_mutates_rhs<T>
-        , T&
-        , typename call_traits<T>::param_type
-      >::type result_type;
-
-      extract_rvalue(PyObject*);
-
-      bool check() const;
-      result_type operator()() const;
-   private:
-      PyObject* m_source;
-      mutable rvalue_from_python_data<T> m_data;
-  };
-  
-  template <class T>
-  struct extract_object_manager
-  {
-      typedef T result_type;
-      extract_object_manager(PyObject*);
-
-      bool check() const;
-      result_type operator()() const;
-   private:
-      PyObject* m_source;
-  };
-  
-  template <class T>
-  struct select_extract
-  {
-      BOOST_STATIC_CONSTANT(
-          bool, obj_mgr = is_object_manager<T>::value);
-
-      BOOST_STATIC_CONSTANT(
-          bool, ptr = is_pointer<T>::value);
-    
-      BOOST_STATIC_CONSTANT(
-          bool, ref = is_reference<T>::value);
-
-      typedef typename mpl::if_c<
-          obj_mgr
-          , extract_object_manager<T>
-          , typename mpl::if_c<
-              ptr
-              , extract_pointer<T>
-              , typename mpl::if_c<
-                  ref
-                  , extract_reference<T>
-                  , extract_rvalue<T>
-                >::type
-            >::type
-         >::type type;
-  };
-}
-
-template <class T>
-struct extract
-    : converter::select_extract<T>::type
-{
- private:
-    typedef typename converter::select_extract<T>::type base;
- public:
-    typedef typename base::result_type result_type;
-    
-    operator result_type() const
-    {
-        return (*this)();
-    }
-    
-    extract(PyObject*);
-    extract(object const&);
-};
-
-//
-// Implementations
-//
-template <class T>
-inline extract<T>::extract(PyObject* o)
-    : base(o)
-{
-}
-
-template <class T>
-inline extract<T>::extract(object const& o)
-    : base(o.ptr())
-{
-}
-
-namespace converter
-{
-  template <class T>
-  inline extract_rvalue<T>::extract_rvalue(PyObject* x)
-      : m_source(x)
-      , m_data(
-          (rvalue_from_python_stage1)(x, registered<T>::converters)
-          )
-  {
-  }
-  
-  template <class T>
-  inline bool
-  extract_rvalue<T>::check() const
-  {
-      return m_data.stage1.convertible;
-  }
-
-  template <class T>
-  inline typename extract_rvalue<T>::result_type
-  extract_rvalue<T>::operator()() const
-  {
-      return *(T*)(
-          // Only do the stage2 conversion once
-          m_data.stage1.convertible ==  m_data.storage.bytes
-             ? m_data.storage.bytes
-             : (rvalue_from_python_stage2)(m_source, m_data.stage1, registered<T>::converters)
-          );
-  }
-
-  template <class Ref>
-  inline extract_reference<Ref>::extract_reference(PyObject* obj)
-      : m_source(obj)
-      , m_result(
-          (get_lvalue_from_python)(obj, registered<Ref>::converters)
-          )
-  {
-  }
-
-  template <class Ref>
-  inline bool extract_reference<Ref>::check() const
-  {
-      return m_result != 0;
-  }
-
-  template <class Ref>
-  inline Ref extract_reference<Ref>::operator()() const
-  {
-      if (m_result == 0)
-          (throw_no_reference_from_python)(m_source, registered<Ref>::converters);
-      
-      return python::detail::void_ptr_to_reference(m_result, (Ref(*)())0);
-  }
-
-  template <class Ptr>
-  inline extract_pointer<Ptr>::extract_pointer(PyObject* obj)
-      : m_source(obj)
-      , m_result(
-          obj == Py_None ? 0 : (get_lvalue_from_python)(obj, registered_pointee<Ptr>::converters)
-          )
-  {
-  }
-
-  template <class Ptr>
-  inline bool extract_pointer<Ptr>::check() const
-  {
-      return m_source == Py_None || m_result != 0;
-  }
-
-  template <class Ptr>
-  inline Ptr extract_pointer<Ptr>::operator()() const
-  {
-      if (m_result == 0 && m_source != Py_None)
-          (throw_no_pointer_from_python)(m_source, registered_pointee<Ptr>::converters);
-      
-      return Ptr(m_result);
-  }
-
-  template <class T>
-  inline extract_object_manager<T>::extract_object_manager(PyObject* obj)
-      : m_source(obj)
-  {
-  }
-
-  template <class T>
-  inline bool extract_object_manager<T>::check() const
-  {
-      return object_manager_traits<T>::check(m_source);
-  }
-
-  template <class T>
-  inline T extract_object_manager<T>::operator()() const
-  {
-      return T(
-          object_manager_traits<T>::adopt(python::incref(m_source))
-          );
-  }
-}
-  
-}} // namespace boost::python::converter
-
-#endif // EXTRACT_DWA200265_HPP
diff --git a/include/boost/python/handle.hpp b/include/boost/python/handle.hpp
deleted file mode 100755
index fee589bf..00000000
--- a/include/boost/python/handle.hpp
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef HANDLE_DWA200269_HPP
-# define HANDLE_DWA200269_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/cast.hpp>
-# include <boost/python/errors.hpp>
-# include <boost/python/borrowed.hpp>
-# include <boost/python/handle_fwd.hpp>
-# include <boost/python/refcount.hpp>
-# include <boost/python/tag.hpp>
-# include <boost/python/detail/raw_pyobject.hpp>
-
-namespace boost { namespace python { 
-
-template <class T> struct null_ok;
-
-template <class T>
-inline null_ok<T>* allow_null(T* p)
-{
-    return (null_ok<T>*)p;
-}
-
-namespace detail
-{
-  template <class T>
-  inline T* manage_ptr(detail::borrowed<null_ok<T> >* p, int)
-  {
-      return python::xincref((T*)p);
-  }
-  
-  template <class T>
-  inline T* manage_ptr(null_ok<detail::borrowed<T> >* p, int)
-  {
-      return python::xincref((T*)p);
-  }
-  
-  template <class T>
-  inline T* manage_ptr(detail::borrowed<T>* p, long)
-  {
-      return python::incref(expect_non_null((T*)p));
-  }
-  
-  template <class T>
-  inline T* manage_ptr(null_ok<T>* p, long)
-  {
-      return (T*)p;
-  }
-  
-  template <class T>
-  inline T* manage_ptr(T* p, ...)
-  {
-      return expect_non_null(p);
-  }
-}
-
-template <class T>
-class handle
-{
-    typedef T* (handle::* bool_type )() const;
-
- public: // types
-    typedef T element_type;
-    
- public: // member functions
-    handle();
-    ~handle();
-
-    template <class Y>
-    explicit handle(Y* p)
-        : m_p(
-            python::upcast<T>(
-                detail::manage_ptr(p, 0)
-                )
-            )
-    {
-    }
-
-    handle& operator=(handle const& r)
-    {
-        python::xdecref(m_p);
-        m_p = python::xincref(r.m_p);
-        return *this;
-    }
-
-#if !defined(BOOST_MSVC) || (BOOST_MSVC > 1200)
-
-    template<typename Y>
-    handle& operator=(handle<Y> const & r) // never throws
-    {
-        python::xdecref(m_p);
-        m_p = python::xincref(python::upcast<T>(r.get()));
-        return *this;
-    }
-
-#endif
-
-    template <typename Y>
-    handle(handle<Y> const& r)
-        : m_p(python::xincref(python::upcast<T>(r.get())))
-    {
-    }
-    
-    handle(handle const& r)
-        : m_p(python::xincref(r.m_p))
-    {
-    }
-    
-    T* operator-> () const;
-    T& operator* () const;
-    T* get() const;
-    T* release();
-    void reset();
-    
-    operator bool_type() const // never throws
-    {
-        return m_p ? &handle<T>::get : 0;
-    }
-    bool operator! () const; // never throws
-
- public: // implementation details -- do not touch
-    // Defining this in the class body suppresses a VC7 link failure
-    inline handle(detail::borrowed_reference x)
-        : m_p(
-            python::incref(
-                downcast<T>((PyObject*)x)
-                ))
-    {
-    }
-    
- private: // data members
-    T* m_p;
-};
-
-typedef handle<PyTypeObject> type_handle;
-
-//
-// Compile-time introspection
-//
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-template<typename T>
-class is_handle
-{
- public:
-    BOOST_STATIC_CONSTANT(bool, value = false); 
-};
-
-template<typename T>
-class is_handle<handle<T> >
-{
- public:
-    BOOST_STATIC_CONSTANT(bool, value = true);
-};
-# else
-namespace detail
-{
-  typedef char (&yes_handle_t)[1];
-  typedef char (&no_handle_t)[2];
-      
-  no_handle_t is_handle_test(...);
-
-  template<typename T>
-  yes_handle_t is_handle_test(boost::type< handle<T> >);
-}
-
-template<typename T>
-class is_handle
-{
- public:
-    BOOST_STATIC_CONSTANT(
-        bool, value = (
-            sizeof(detail::is_handle_test(boost::type<T>()))
-            == sizeof(detail::yes_handle_t)));
-};
-# endif
-
-//
-// implementations
-//
-template <class T>
-inline handle<T>::handle()
-    : m_p(0)
-{
-}
-
-template <class T>
-inline handle<T>::~handle()
-{
-    python::xdecref(m_p);
-}
-
-template <class T>
-inline T* handle<T>::operator->() const
-{
-    return m_p;
-}
-
-template <class T>
-inline T& handle<T>::operator*() const
-{
-    return *m_p;
-}
-
-template <class T>
-inline T* handle<T>::get() const
-{
-    return m_p;
-}
-    
-template <class T>
-inline bool handle<T>::operator!() const
-{
-    return m_p == 0;
-}
-
-template <class T>
-inline T* handle<T>::release()
-{
-    T* result = m_p;
-    m_p = 0;
-    return result;
-}
-
-template <class T>
-inline void handle<T>::reset()
-{
-    python::xdecref(m_p);
-    m_p = 0;
-}
-
-// Because get_managed_object must return a non-null PyObject*, we
-// return Py_None if the handle is null.
-template <class T>
-inline PyObject* get_managed_object(handle<T> const& h, tag_t)
-{
-    return h.get() ? python::upcast<PyObject>(h.get()) : Py_None;
-}
-
-}} // namespace boost::python
-
-
-#endif // HANDLE_DWA200269_HPP
diff --git a/include/boost/python/handle_fwd.hpp b/include/boost/python/handle_fwd.hpp
deleted file mode 100755
index 621c91e6..00000000
--- a/include/boost/python/handle_fwd.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef HANDLE_FWD_DWA2002615_HPP
-# define HANDLE_FWD_DWA2002615_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-namespace boost { namespace python { 
-
-template <class T = PyObject> class handle;
-
-}} // namespace boost::python
-
-#endif // HANDLE_FWD_DWA2002615_HPP
diff --git a/include/boost/python/has_back_reference.hpp b/include/boost/python/has_back_reference.hpp
deleted file mode 100644
index 7d8a6500..00000000
--- a/include/boost/python/has_back_reference.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef HAS_BACK_REFERENCE_DWA2002323_HPP
-# define HAS_BACK_REFERENCE_DWA2002323_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/mpl/bool.hpp>
-
-namespace boost { namespace python { 
-
-// traits class which users can specialize to indicate that a class
-// contains a back-reference to its owning PyObject*
-template <class T>
-struct has_back_reference
-  : mpl::false_
-{
-};
-
-
-}} // namespace boost::python
-
-#endif // HAS_BACK_REFERENCE_DWA2002323_HPP
diff --git a/include/boost/python/implicit.hpp b/include/boost/python/implicit.hpp
deleted file mode 100644
index 668f6aba..00000000
--- a/include/boost/python/implicit.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef IMPLICIT_DWA2002325_HPP
-# define IMPLICIT_DWA2002325_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/type.hpp>
-# include <boost/python/converter/implicit.hpp>
-# include <boost/python/converter/registry.hpp>
-# include <boost/python/type_id.hpp>
-
-namespace boost { namespace python { 
-
-template <class Source, class Target>
-void implicitly_convertible(boost::type<Source>* = 0, boost::type<Target>* = 0)
-{
-    typedef converter::implicit<Source,Target> functions;
-    
-    converter::registry::push_back(
-          &functions::convertible
-        , &functions::construct
-        , type_id<Target>());
-}
-
-}} // namespace boost::python
-
-#endif // IMPLICIT_DWA2002325_HPP
diff --git a/include/boost/python/init.hpp b/include/boost/python/init.hpp
deleted file mode 100644
index 04d8a667..00000000
--- a/include/boost/python/init.hpp
+++ /dev/null
@@ -1,424 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// Copyright David Abrahams 2002, Joel de Guzman, 2002. Permission to copy,
-// use, modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
-//
-///////////////////////////////////////////////////////////////////////////////
-#ifndef INIT_JDG20020820_HPP
-#define INIT_JDG20020820_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-#include <boost/python/detail/type_list.hpp>
-#include <boost/python/args_fwd.hpp>
-#include <boost/python/detail/make_keyword_range_fn.hpp>
-#include <boost/python/def_visitor.hpp>
-
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/apply_if.hpp>
-#include <boost/mpl/size.hpp>
-#include <boost/mpl/iterator_range.hpp>
-#include <boost/mpl/empty.hpp>
-#include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/bool.hpp>
-#include <boost/mpl/prior.hpp>
-#include <boost/mpl/joint_view.hpp>
-#include <boost/mpl/back.hpp>
-
-#include <boost/type_traits/is_same.hpp>
-
-#include <boost/preprocessor/enum_params_with_a_default.hpp>
-#include <boost/preprocessor/enum_params.hpp>
-
-#include <utility>
-
-///////////////////////////////////////////////////////////////////////////////
-#define BOOST_PYTHON_OVERLOAD_TYPES_WITH_DEFAULT                                \
-    BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(                                        \
-        BOOST_PYTHON_MAX_ARITY,                                                 \
-        class T,                                                                \
-        mpl::void_)                                                             \
-
-#define BOOST_PYTHON_OVERLOAD_TYPES                                             \
-    BOOST_PP_ENUM_PARAMS_Z(1,                                                   \
-        BOOST_PYTHON_MAX_ARITY,                                                 \
-        class T)                                                                \
-
-#define BOOST_PYTHON_OVERLOAD_ARGS                                              \
-    BOOST_PP_ENUM_PARAMS_Z(1,                                                   \
-        BOOST_PYTHON_MAX_ARITY,                                                 \
-        T)                                                                      \
-
-///////////////////////////////////////////////////////////////////////////////
-namespace boost { namespace python {
-
-template <BOOST_PYTHON_OVERLOAD_TYPES_WITH_DEFAULT>
-class init; // forward declaration
-
-
-template <BOOST_PYTHON_OVERLOAD_TYPES_WITH_DEFAULT>
-struct optional; // forward declaration
-
-namespace detail
-{
-  namespace error
-  {
-    template <int keywords, int init_args>
-    struct more_keywords_than_init_arguments
-    {
-        typedef char too_many_keywords[init_args - keywords >= 0 ? 1 : -1];
-    };
-  }
-
-  //  is_optional<T>::value
-  //
-  //      This metaprogram checks if T is an optional
-  //
-#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-
-    template <class T>
-    struct is_optional {
-
-    private:
-
-        template <BOOST_PYTHON_OVERLOAD_TYPES>
-        static boost::type_traits::yes_type f(optional<BOOST_PYTHON_OVERLOAD_ARGS>);
-        static boost::type_traits::no_type f(...);
-        static T t();
-
-    public:
-
-        BOOST_STATIC_CONSTANT(
-            bool, value =
-                sizeof(f(t())) == sizeof(::boost::type_traits::yes_type));
-        typedef mpl::bool_<value> type;
-    };
-
-#else
-
-    template <class T>
-    struct is_optional
-      : mpl::false_
-    {};
-
-    template <BOOST_PYTHON_OVERLOAD_TYPES>
-    struct is_optional<optional<BOOST_PYTHON_OVERLOAD_ARGS> >
-      : mpl::true_
-    {};
-  
-#endif
-
-  template <int NDefaults>
-  struct define_class_init_helper;
-
-} // namespace detail
-
-template <class DerivedT>
-struct init_base : def_visitor<DerivedT>
-{
-    init_base(char const* doc_, detail::keyword_range const& keywords_)
-        : m_doc(doc_), m_keywords(keywords_)
-    {}
-        
-    init_base(char const* doc_)
-        : m_doc(doc_)
-    {}
-
-    DerivedT const& derived() const
-    {
-        return *static_cast<DerivedT const*>(this);
-    }
-    
-    char const* doc_string() const
-    {
-        return m_doc;
-    }
-
-    detail::keyword_range const& keywords() const
-    {
-        return m_keywords;
-    }
-
-    static default_call_policies call_policies()
-    {
-        return default_call_policies();
-    }
-
- private:
-    //  visit
-    //
-    //      Defines a set of n_defaults + 1 constructors for its
-    //      class_<...> argument. Each constructor after the first has
-    //      one less argument to its right. Example:
-    //
-    //          init<int, optional<char, long, double> >
-    //
-    //      Defines:
-    //
-    //          __init__(int, char, long, double)
-    //          __init__(int, char, long)
-    //          __init__(int, char)
-    //          __init__(int)
-    template <class classT>
-    void visit(classT& cl) const
-    {
-        typedef typename DerivedT::signature signature;
-        typedef typename DerivedT::n_arguments n_arguments;
-        typedef typename DerivedT::n_defaults n_defaults;
-    
-        detail::define_class_init_helper<n_defaults::value>::apply(
-            cl
-          , derived().call_policies()
-          , signature()
-          , n_arguments()
-          , derived().doc_string()
-          , derived().keywords());
-    }
-    
-    friend class python::def_visitor_access;
-    
- private: // data members
-    char const* m_doc;
-    detail::keyword_range m_keywords;
-};
-
-template <class CallPoliciesT, class InitT>
-class init_with_call_policies
-    : public init_base<init_with_call_policies<CallPoliciesT, InitT> >
-{
-    typedef init_base<init_with_call_policies<CallPoliciesT, InitT> > base;
- public:
-    typedef typename InitT::n_arguments n_arguments;
-    typedef typename InitT::n_defaults n_defaults;
-    typedef typename InitT::signature signature;
-
-    init_with_call_policies(
-        CallPoliciesT const& policies_
-        , char const* doc_
-        , detail::keyword_range const& keywords
-        )
-        : base(doc_, keywords)
-        , m_policies(policies_)
-    {}
-
-    CallPoliciesT const& call_policies() const
-    {
-        return this->m_policies;
-    }
-    
- private: // data members
-    CallPoliciesT m_policies;
-};
-
-//
-// drop1<S> is the initial length(S) elements of S
-//
-namespace detail
-{
-  template <class S>
-  struct drop1
-    : mpl::iterator_range<
-          typename mpl::begin<S>::type
-        , typename mpl::prior<
-              typename mpl::end<S>::type
-          >::type
-      >
-  {};
-}
-
-template <BOOST_PYTHON_OVERLOAD_TYPES>
-class init : public init_base<init<BOOST_PYTHON_OVERLOAD_ARGS> >
-{
-    typedef init_base<init<BOOST_PYTHON_OVERLOAD_ARGS> > base;
- public:
-    typedef init<BOOST_PYTHON_OVERLOAD_ARGS> self_t;
-
-    init(char const* doc_ = 0)
-        : base(doc_)
-    {
-    }
-
-    template <std::size_t N>
-    init(char const* doc_, detail::keywords<N> const& kw)
-        : base(doc_, kw.range())
-    {
-        typedef typename detail::error::more_keywords_than_init_arguments<
-            N, n_arguments::value
-            >::too_many_keywords assertion;
-    }
-
-    template <std::size_t N>
-    init(detail::keywords<N> const& kw, char const* doc_ = 0)
-        : base(doc_, kw.range())
-    {
-        typedef typename detail::error::more_keywords_than_init_arguments<
-            N, n_arguments::value
-            >::too_many_keywords assertion;
-    }
-
-    template <class CallPoliciesT>
-    init_with_call_policies<CallPoliciesT, self_t>
-    operator[](CallPoliciesT const& policies) const
-    {
-        return init_with_call_policies<CallPoliciesT, self_t>(
-            policies, this->doc_string(), this->keywords());
-    }
-
-    typedef detail::type_list<BOOST_PYTHON_OVERLOAD_ARGS> signature_;
-
-    typedef detail::is_optional<
-        typename mpl::apply_if<
-            mpl::empty<signature_>
-          , mpl::false_
-          , mpl::back<signature_>
-        >::type
-    > back_is_optional;
-    
-    typedef typename mpl::apply_if<
-        back_is_optional
-      , mpl::back<signature_>
-      , mpl::vector0<>
-    >::type optional_args;
-
-    typedef typename mpl::apply_if<
-        back_is_optional
-      , mpl::if_<
-            mpl::empty<optional_args>
-          , detail::drop1<signature_>
-          , mpl::joint_view<
-                detail::drop1<signature_>
-              , optional_args
-            >
-        >
-      , signature_
-    >::type signature;
-
-    // TODO: static assert to make sure there are no other optional elements
-
-    // Count the number of default args
-    typedef mpl::size<optional_args> n_defaults;
-    typedef mpl::size<signature> n_arguments;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-//
-//  optional
-//
-//      optional<T0...TN>::type returns a typelist.
-//
-///////////////////////////////////////////////////////////////////////////////
-template <BOOST_PYTHON_OVERLOAD_TYPES>
-struct optional
-    : detail::type_list<BOOST_PYTHON_OVERLOAD_ARGS>
-{
-};
-
-namespace detail
-{
-  template <class ClassT, class CallPoliciesT, class Signature, class NArgs>
-  inline void def_init_aux(
-      ClassT& cl
-      , Signature const&
-      , NArgs
-      , CallPoliciesT const& policies
-      , char const* doc
-      , detail::keyword_range const& keywords_
-      )
-  {
-      typedef typename ClassT::select_holder selector_t;
-
-      cl.def(
-            "__init__",
-            detail::make_keyword_range_constructor<Signature,NArgs>(
-                policies
-                , keywords_
-                , selector_t::get()
-                )
-            , doc
-            );
-  }
-
-  ///////////////////////////////////////////////////////////////////////////////
-  //
-  //  define_class_init_helper<N>::apply
-  //
-  //      General case
-  //
-  //      Accepts a class_ and an arguments list. Defines a constructor
-  //      for the class given the arguments and recursively calls
-  //      define_class_init_helper<N-1>::apply with one fewer argument (the
-  //      rightmost argument is shaved off)
-  //
-  ///////////////////////////////////////////////////////////////////////////////
-  template <int NDefaults>
-  struct define_class_init_helper
-  {
-
-      template <class ClassT, class CallPoliciesT, class Signature, class NArgs>
-      static void apply(
-          ClassT& cl
-          , CallPoliciesT const& policies
-          , Signature const& args
-          , NArgs
-          , char const* doc
-          , detail::keyword_range keywords)
-      {
-          detail::def_init_aux(cl, args, NArgs(), policies, doc, keywords);
-
-          if (keywords.second > keywords.first)
-              --keywords.second;
-
-          typedef typename mpl::prior<NArgs>::type next_nargs;
-          define_class_init_helper<NDefaults-1>::apply(
-              cl, policies, Signature(), next_nargs(), doc, keywords);
-      }
-  };
-
-  ///////////////////////////////////////////////////////////////////////////////
-  //
-  //  define_class_init_helper<0>::apply
-  //
-  //      Terminal case
-  //
-  //      Accepts a class_ and an arguments list. Defines a constructor
-  //      for the class given the arguments.
-  //
-  ///////////////////////////////////////////////////////////////////////////////
-  template <>
-  struct define_class_init_helper<0> {
-
-      template <class ClassT, class CallPoliciesT, class Signature, class NArgs>
-      static void apply(
-          ClassT& cl
-        , CallPoliciesT const& policies
-        , Signature const& args
-        , NArgs
-        , char const* doc
-        , detail::keyword_range const& keywords)
-      {
-          detail::def_init_aux(cl, args, NArgs(), policies, doc, keywords);
-      }
-  };
-}
-
-}} // namespace boost::python
-
-#undef BOOST_PYTHON_OVERLOAD_TYPES_WITH_DEFAULT
-#undef BOOST_PYTHON_OVERLOAD_TYPES
-#undef BOOST_PYTHON_OVERLOAD_ARGS
-#undef BOOST_PYTHON_IS_OPTIONAL_VALUE
-#undef BOOST_PYTHON_APPEND_TO_INIT
-
-///////////////////////////////////////////////////////////////////////////////
-#endif // INIT_JDG20020820_HPP
-
-
-
-
-
-
-
-
diff --git a/include/boost/python/instance_holder.hpp b/include/boost/python/instance_holder.hpp
deleted file mode 100755
index 0c5a60c2..00000000
--- a/include/boost/python/instance_holder.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef INSTANCE_HOLDER_DWA2002517_HPP
-# define INSTANCE_HOLDER_DWA2002517_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/utility.hpp>
-# include <boost/python/type_id.hpp>
-# include <cstddef>
-
-namespace boost { namespace python { 
-
-// Base class for all holders
-struct BOOST_PYTHON_DECL instance_holder : private noncopyable
-{
- public:
-    instance_holder();
-    virtual ~instance_holder();
-    
-    // return the next holder in a chain
-    instance_holder* next() const;
-
-    virtual void* holds(type_info) = 0;
-
-    void install(PyObject* inst) throw();
-
-    // These functions should probably be located elsewhere.
-    
-    // Allocate storage for an object of the given size at the given
-    // offset in the Python instance<> object if bytes are available
-    // there. Otherwise allocate size bytes of heap memory.
-    static void* allocate(PyObject*, std::size_t offset, std::size_t size);
-
-    // Deallocate storage from the heap if it was not carved out of
-    // the given Python object by allocate(), above.
-    static void deallocate(PyObject*, void* storage) throw();
- private:
-    instance_holder* m_next;
-};
-
-// This macro is needed for implementation of derived holders
-# define BOOST_PYTHON_UNFORWARD(N,ignored) (typename unforward<A##N>::type)(a##N)
-
-//
-// implementation
-//
-inline instance_holder* instance_holder::next() const
-{
-    return m_next;
-}
-
-}} // namespace boost::python
-
-#endif // INSTANCE_HOLDER_DWA2002517_HPP
diff --git a/include/boost/python/iterator.hpp b/include/boost/python/iterator.hpp
deleted file mode 100644
index 8c8d617d..00000000
--- a/include/boost/python/iterator.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ITERATOR_DWA2002512_HPP
-# define ITERATOR_DWA2002512_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/detail/target.hpp>
-# include <boost/python/object/iterator.hpp>
-# include <boost/python/object_core.hpp>
-
-# include <boost/type_traits/cv_traits.hpp>
-# include <boost/type_traits/transform_traits.hpp>
-
-# include <boost/bind.hpp>
-# include <boost/bind/protect.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  // Adds an additional layer of binding to
-  // objects::make_iterator(...), which allows us to pass member
-  // function and member data pointers.
-  template <class Target, class Accessor1, class Accessor2, class NextPolicies>
-  inline object make_iterator(
-      Accessor1 get_start
-    , Accessor2 get_finish
-    , NextPolicies next_policies
-    , Target&(*)()
-  )
-  {
-      return objects::make_iterator_function<Target>(
-          boost::protect(boost::bind(get_start, _1))
-        , boost::protect(boost::bind(get_finish, _1))
-        , next_policies
-      );
-  }
-
-  // Guts of template class iterators<>, below.
-  template <bool const_ = false>
-  struct iterators_impl
-  {
-      template <class T>
-      struct apply
-      {
-          typedef typename T::iterator iterator;
-          static iterator begin(T& x) { return x.begin(); }
-          static iterator end(T& x) { return x.end(); }
-      };
-  };
-
-  template <>
-  struct iterators_impl<true>
-  {
-      template <class T>
-      struct apply
-      {
-          typedef typename T::const_iterator iterator;
-          static iterator begin(T& x) { return x.begin(); }
-          static iterator end(T& x) { return x.end(); }
-      };
-  };
-}
-
-// An "ordinary function generator" which contains static begin(x) and
-// end(x) functions that invoke T::begin() and T::end(), respectively.
-template <class T>
-struct iterators
-    : detail::iterators_impl<
-        boost::is_const<T>::value
-      >::template apply<T>
-{
-};
-
-// Create an iterator-building function which uses the given
-// accessors. Deduce the Target type from the accessors. The iterator
-// returns copies of the inderlying elements.
-template <class Accessor1, class Accessor2>
-object range(Accessor1 start, Accessor2 finish)
-{
-    return detail::make_iterator(
-        start, finish
-      , objects::default_iterator_call_policies()
-      , detail::target(start)
-    );
-}
-
-// Create an iterator-building function which uses the given accessors
-// and next() policies. Deduce the Target type.
-template <class NextPolicies, class Accessor1, class Accessor2>
-object range(Accessor1 start, Accessor2 finish, NextPolicies* = 0)
-{
-    return detail::make_iterator(start, finish, NextPolicies(), detail::target(start));
-}
-
-// Create an iterator-building function which uses the given accessors
-// and next() policies, operating on the given Target type
-template <class NextPolicies, class Target, class Accessor1, class Accessor2>
-object range(Accessor1 start, Accessor2 finish, NextPolicies* = 0, boost::type<Target>* = 0)
-{
-    // typedef typename add_reference<Target>::type target;
-    return detail::make_iterator(start, finish, NextPolicies(), (Target&(*)())0);
-}
-
-// A Python callable object which produces an iterator traversing
-// [x.begin(), x.end()), where x is an instance of the Container
-// type. NextPolicies are used as the CallPolicies for the iterator's
-// next() function.
-template <class Container
-          , class NextPolicies = objects::default_iterator_call_policies>
-struct iterator : object
-{
-    iterator()
-        : object(
-            python::range<NextPolicies>(
-                &iterators<Container>::begin, &iterators<Container>::end
-                ))
-    {
-    }
-};
-
-}} // namespace boost::python
-
-#endif // ITERATOR_DWA2002512_HPP
diff --git a/include/boost/python/list.hpp b/include/boost/python/list.hpp
deleted file mode 100644
index eaeaa51e..00000000
--- a/include/boost/python/list.hpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef LIST_DWA2002627_HPP
-# define LIST_DWA2002627_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/object.hpp>
-# include <boost/python/converter/pytype_object_mgr_traits.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  struct BOOST_PYTHON_DECL list_base : object
-  {
-      void append(object_cref); // append object to end
-
-      long count(object_cref value) const; // return number of occurrences of value
-
-      void extend(object_cref sequence); // extend list by appending sequence elements
-    
-      long index(object_cref value) const; // return index of first occurrence of value
-
-      void insert(int index, object_cref); // insert object before index
-      void insert(object const& index, object_cref);
-
-      object pop(); // remove and return item at index (default last)
-      object pop(long index);
-      object pop(object const& index);
-
-      void remove(object_cref value); // remove first occurrence of value
-    
-      void reverse(); // reverse *IN PLACE*
-
-      void sort(); //  sort *IN PLACE*; if given, cmpfunc(x, y) -> -1, 0, 1
-      void sort(object_cref cmpfunc);
-
-
-   protected:
-      list_base(); // new list
-      explicit list_base(object_cref sequence); // new list initialized from sequence's items
-
-      BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(list_base, object)
-   private:    
-      static detail::new_non_null_reference call(object const&);
-  };
-}
-
-class list : public detail::list_base
-{
-    typedef detail::list_base base;
- public:
-    list() {} // new list
-
-    template <class T>
-    explicit list(T const& sequence)
-        : base(object(sequence))
-    {
-    }
-
-    template <class T>
-    void append(T const& x)
-    {
-        base::append(object(x));
-    }
-
-    template <class T>
-    long count(T const& value) const
-    {
-        return base::count(object(value));
-    }
-    
-    template <class T>
-    void extend(T const& x)
-    {
-        base::extend(object(x));
-    }
-
-    template <class T>
-    long index(T const& x) const
-    {
-        return base::index(object(x));
-    }
-    
-    template <class T>
-    void insert(int index, T const& x) // insert object before index
-    {
-        base::insert(index, object(x));
-    }
-    
-    template <class T>
-    void insert(object const& index, T const& x) // insert object before index
-    {
-        base::insert(index, object(x));
-    }
-
-    object pop() { return base::pop(); }
-    object pop(long index) { return base::pop(index); }
-    
-    template <class T>
-    object pop(T const& index)
-    {
-        return base::pop(object(index));
-    }
-
-    template <class T>
-    void remove(T const& value)
-    {
-        base::remove(object(value));
-    }
-
-    void sort() { base::sort(); }
-    
-    template <class T>
-    void sort(T const& value)
-    {
-        base::sort(object(value));
-    }
-    
- public: // implementation detail -- for internal use only
-    BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(list, base)
-};
-
-//
-// Converter Specializations
-//
-namespace converter
-{
-  template <>
-  struct object_manager_traits<list>
-      : pytype_object_manager_traits<&PyList_Type,list>
-  {
-  };
-}
-
-}} // namespace boost::python
-
-#endif // LIST_DWA2002627_HPP
diff --git a/include/boost/python/long.hpp b/include/boost/python/long.hpp
deleted file mode 100644
index fbf1dd85..00000000
--- a/include/boost/python/long.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef LONG_DWA2002627_HPP
-# define LONG_DWA2002627_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/object.hpp>
-# include <boost/python/converter/pytype_object_mgr_traits.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  struct BOOST_PYTHON_DECL long_base : object
-  {
-   protected:
-      long_base(); // new long_
-      explicit long_base(object_cref rhs);
-      explicit long_base(object_cref rhs, object_cref base);
-      
-      BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(long_base, object)
-          
-   private:
-      static detail::new_non_null_reference call(object const&);
-      static detail::new_non_null_reference call(object const&, object const&);
-  };
-}
-
-class long_ : public detail::long_base
-{
-    typedef detail::long_base base;
- public:
-    long_() {} // new long_
-
-    template <class T>
-    explicit long_(T const& rhs)
-        : base(object(rhs))
-    {
-    }
-
-    template <class T, class U>
-    explicit long_(T const& rhs, U const& base)
-        : base(object(rhs), object(base))
-    {
-    }
-    
- public: // implementation detail -- for internal use only
-    BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(long_, base)
-};
-
-//
-// Converter Specializations
-//
-namespace converter
-{
-  template <>
-  struct object_manager_traits<long_>
-      : pytype_object_manager_traits<&PyLong_Type,long_>
-  {
-  };
-}
-
-}} // namespace boost::python
-
-#endif // LONG_DWA2002627_HPP
diff --git a/include/boost/python/lvalue_from_pytype.hpp b/include/boost/python/lvalue_from_pytype.hpp
deleted file mode 100755
index 443f94c3..00000000
--- a/include/boost/python/lvalue_from_pytype.hpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef LVALUE_FROM_PYTYPE_DWA2002130_HPP
-# define LVALUE_FROM_PYTYPE_DWA2002130_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/type_id.hpp>
-# include <boost/python/converter/registry.hpp>
-# include <boost/python/detail/void_ptr.hpp>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  // Given a pointer-to-function of 1 parameter returning a reference
-  // type, return the type_id of the function's return type.
-  template <class T, class U>
-  inline type_info extractor_type_id(T&(*)(U))
-  {
-      return type_id<T>();
-  }
-
-  // A function generator whose static execute() function is an lvalue
-  // from_python converter using the given Extractor. U is expected to
-  // be the actual type of the PyObject instance from which the result
-  // is being extracted.
-  template <class Extractor, class U>
-  struct normalized_extractor
-  {
-      static inline void* execute(PyObject* op)
-      {
-          typedef typename boost::add_reference<U>::type param;
-          return &Extractor::execute(
-              boost::python::detail::void_ptr_to_reference(
-                  op, (param(*)())0 )
-              );
-      }
-  };
-
-  // Given an Extractor type and a pointer to its execute function,
-  // return a new object whose static execute function does the same
-  // job but is a conforming lvalue from_python conversion function.
-  //
-  // usage: normalize<Extractor>(&Extractor::execute)
-  template <class Extractor, class T, class U>
-  inline normalized_extractor<Extractor,U>
-  normalize(T(*)(U), Extractor* = 0)
-  {
-      return normalized_extractor<Extractor, U>();
-  }
-}
-
-// An Extractor which extracts the given member from a Python object
-// whose instances are stored as InstanceType.
-template <class InstanceType, class MemberType, MemberType (InstanceType::*member)>
-struct extract_member
-{
-    static MemberType& execute(InstanceType& c)
-    {
-        (void)c.ob_type; // static assertion
-        return c.*member;
-    }
-};
-
-// An Extractor which simply extracts the entire python object
-// instance of InstanceType.
-template <class InstanceType>
-struct extract_identity
-{
-    static InstanceType& execute(InstanceType& c)
-    {
-        (void)c.ob_type; // static assertion
-        return c;
-    }
-};
-
-// Registers a from_python conversion which extracts lvalues using
-// Extractor's static execute function from Python objects whose type
-// object is python_type.
-template <class Extractor, PyTypeObject const* python_type>
-struct lvalue_from_pytype
-{
-    lvalue_from_pytype()
-    {
-        converter::registry::insert(
-            &extract, detail::extractor_type_id(&Extractor::execute));
-    }
- private:
-    static void* extract(PyObject* op)
-    {
-        return PyObject_TypeCheck(op, const_cast<PyTypeObject*>(python_type))
-            ? const_cast<void*>(
-                static_cast<void const volatile*>(
-                    detail::normalize<Extractor>(&Extractor::execute).execute(op)))
-            : 0
-            ;
-    }
-};
-
-}} // namespace boost::python
-
-#endif // LVALUE_FROM_PYTYPE_DWA2002130_HPP
diff --git a/include/boost/python/make_constructor.hpp b/include/boost/python/make_constructor.hpp
deleted file mode 100755
index ceaf4b9e..00000000
--- a/include/boost/python/make_constructor.hpp
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MAKE_CONSTRUCTOR_DWA20011221_HPP
-# define MAKE_CONSTRUCTOR_DWA20011221_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/default_call_policies.hpp>
-# include <boost/python/args.hpp>
-# include <boost/python/object_fwd.hpp>
-
-# include <boost/python/object/function_object.hpp>
-# include <boost/python/object/make_holder.hpp>
-# include <boost/python/object/pointer_holder.hpp>
-# include <boost/python/converter/context_result_converter.hpp>
-
-# include <boost/python/detail/caller.hpp>
-# include <boost/python/detail/none.hpp>
-
-# include <boost/mpl/size.hpp>
-# include <boost/mpl/int.hpp>
-# include <boost/mpl/push_front.hpp>
-# include <boost/mpl/pop_front.hpp>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  template <class T>
-  struct install_holder : converter::context_result_converter
-  {
-      install_holder(PyObject* args_)
-        : m_self(PyTuple_GetItem(args_, 0)) {}
-
-      PyObject* operator()(T x) const
-      {
-          dispatch(x, is_pointer<T>());
-          return none();
-      }
-
-   private:
-      template <class U>
-      void dispatch(U* x, mpl::true_) const
-      {
-          std::auto_ptr<U> owner(x);
-          dispatch(owner, mpl::false_());
-      }
-      
-      template <class Ptr>
-      void dispatch(Ptr x, mpl::false_) const
-      {
-          typedef typename pointee<Ptr>::type value_type;
-          typedef objects::pointer_holder<Ptr,value_type> holder;
-          typedef objects::instance<holder> instance_t;
-
-          void* memory = holder::allocate(this->m_self, offsetof(instance_t, storage), sizeof(holder));
-          try {
-              (new (memory) holder(x))->install(this->m_self);
-          }
-          catch(...) {
-              holder::deallocate(this->m_self, memory);
-              throw;
-          }
-      }
-      
-      PyObject* m_self;
-  };
-  
-  struct constructor_result_converter
-  {
-      template <class T>
-      struct apply
-      {
-          typedef install_holder<T> type;
-      };
-  };
-
-  template <class BaseArgs, class Offset>
-  struct offset_args
-  {
-      offset_args(BaseArgs base_) : base(base_) {}
-      BaseArgs base;
-  };
-
-# if 0
-  template <class N, class BaseArgs, class Offset>
-  inline PyObject* get(N, offset_args<BaseArgs,Offset> const& args_)
-  {
-      return get(mpl::int_<(N::value+Offset::value)>(), args_.base);
-  }
-# else
-  template <unsigned N, class BaseArgs, class Offset>
-  inline PyObject* get(offset_args<BaseArgs,Offset> const& args_ BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(unsigned,N))
-  {
-      return get<(N + Offset::value)>(args_.base);
-  }
-# endif
-  
-  template <class BaseArgs, class Offset>
-  inline unsigned arity(offset_args<BaseArgs,Offset> const& args_)
-  {
-      return arity(args_.base) - Offset::value;
-  }
-
-  template <class BasePolicy_ = default_call_policies>
-  struct constructor_policy : BasePolicy_
-  {
-      constructor_policy(BasePolicy_ base) : BasePolicy_(base) {}
-      
-      // If the BasePolicy_ supplied a result converter it would be
-      // ignored; issue an error if it's not the default.
-      BOOST_STATIC_ASSERT((
-          is_same<
-              typename BasePolicy_::result_converter
-            , default_result_converter
-          >::value
-      ));
-      
-      typedef constructor_result_converter result_converter;
-      typedef offset_args<typename BasePolicy_::argument_package, mpl::int_<1> > argument_package;
-  };
-
-  template <class InnerSignature>
-  struct outer_constructor_signature
-  {
-      typedef typename mpl::pop_front<InnerSignature>::type inner_args;
-      typedef typename mpl::push_front<inner_args,object>::type outer_args;
-      typedef typename mpl::push_front<outer_args,void>::type type;
-  };
-
-  // ETI workaround
-  template <>
-  struct outer_constructor_signature<int>
-  {
-      typedef int type;
-  };
-  
-  //
-  // These helper functions for make_constructor (below) do the raw work
-  // of constructing a Python object from some invokable entity. See
-  // <boost/python/detail/caller.hpp> for more information about how
-  // the Sig arguments is used.
-  //
-  // @group make_constructor_aux {
-  template <class F, class CallPolicies, class Sig>
-  object make_constructor_aux(
-      F f                             // An object that can be invoked by detail::invoke()
-    , CallPolicies const& p           // CallPolicies to use in the invocation
-    , Sig const&                      // An MPL sequence of argument types expected by F
-  )
-  {
-      typedef typename outer_constructor_signature<Sig>::type outer_signature;
-
-      typedef constructor_policy<CallPolicies> inner_policy;
-      
-      return objects::function_object(
-          objects::py_function(
-              detail::caller<F,inner_policy,Sig>(f, inner_policy(p))
-            , outer_signature()
-          )
-      );
-  }
-  
-  // As above, except that it accepts argument keywords. NumKeywords
-  // is used only for a compile-time assertion to make sure the user
-  // doesn't pass more keywords than the function can accept. To
-  // disable all checking, pass mpl::int_<0> for NumKeywords.
-  template <class F, class CallPolicies, class Sig, class NumKeywords>
-  object make_constructor_aux(
-      F f
-      , CallPolicies const& p
-      , Sig const&
-      , detail::keyword_range const& kw // a [begin,end) pair of iterators over keyword names
-      , NumKeywords                     // An MPL integral type wrapper: the size of kw
-      )
-  {
-      enum { arity = mpl::size<Sig>::value - 1 };
-      
-      typedef typename detail::error::more_keywords_than_function_arguments<
-          NumKeywords::value, arity
-          >::too_many_keywords assertion;
-    
-      typedef typename outer_constructor_signature<Sig>::type outer_signature;
-
-      typedef constructor_policy<CallPolicies> inner_policy;
-      
-      return objects::function_object(
-          objects::py_function(
-              detail::caller<F,inner_policy,Sig>(f, inner_policy(p))
-            , outer_signature()
-          )
-      );
-  }
-  // }
-
-  //
-  //   These dispatch functions are used to discriminate between the
-  //   cases when the 3rd argument is keywords or when it is a
-  //   signature.
-  //
-  //   @group Helpers for make_constructor when called with 3 arguments. {
-  //
-  template <class F, class CallPolicies, class Keywords>
-  object make_constructor_dispatch(F f, CallPolicies const& policies, Keywords const& kw, mpl::true_)
-  {
-      return detail::make_constructor_aux(
-          f
-        , policies
-        , detail::get_signature(f)
-        , kw.range()
-        , mpl::int_<Keywords::size>()
-      );
-  }
-
-  template <class F, class CallPolicies, class Signature>
-  object make_constructor_dispatch(F f, CallPolicies const& policies, Signature const& sig, mpl::false_)
-  {
-      return detail::make_constructor_aux(
-          f
-        , policies
-        , sig
-      );
-  }
-  // }
-}
-
-//   These overloaded functions wrap a function or member function
-//   pointer as a Python object, using optional CallPolicies,
-//   Keywords, and/or Signature. @group {
-//
-template <class F>
-object make_constructor(F f)
-{
-    return detail::make_constructor_aux(
-        f,default_call_policies(), detail::get_signature(f));
-}
-
-template <class F, class CallPolicies>
-object make_constructor(F f, CallPolicies const& policies)
-{
-    return detail::make_constructor_aux(
-        f, policies, detail::get_signature(f));
-}
-
-template <class F, class CallPolicies, class KeywordsOrSignature>
-object make_constructor(
-    F f
-  , CallPolicies const& policies
-  , KeywordsOrSignature const& keywords_or_signature)
-{
-    typedef typename
-        detail::is_reference_to_keywords<KeywordsOrSignature&>::type
-        is_kw;
-    
-    return detail::make_constructor_dispatch(
-        f
-      , policies
-      , keywords_or_signature
-      , is_kw()
-    );
-}
-
-template <class F, class CallPolicies, class Keywords, class Signature>
-object make_constructor(
-    F f
-  , CallPolicies const& policies
-  , Keywords const& kw
-  , Signature const& sig
- )
-{
-    return detail::make_constructor_aux(
-          f
-        , policies
-        , sig
-        , kw.range()
-        , mpl::int_<Keywords::size>()
-      );
-}
-// }
-
-}} 
-
-
-#endif // MAKE_CONSTRUCTOR_DWA20011221_HPP
diff --git a/include/boost/python/make_function.hpp b/include/boost/python/make_function.hpp
deleted file mode 100644
index 6065e16c..00000000
--- a/include/boost/python/make_function.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MAKE_FUNCTION_DWA20011221_HPP
-# define MAKE_FUNCTION_DWA20011221_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/default_call_policies.hpp>
-# include <boost/python/args.hpp>
-# include <boost/python/detail/caller.hpp>
-
-# include <boost/python/object/function_object.hpp>
-
-# include <boost/mpl/size.hpp>
-# include <boost/mpl/int.hpp>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  // make_function_aux --
-  //
-  // These helper functions for make_function (below) do the raw work
-  // of constructing a Python object from some invokable entity. See
-  // <boost/python/detail/caller.hpp> for more information about how
-  // the Sig arguments is used.
-  template <class F, class CallPolicies, class Sig>
-  object make_function_aux(
-      F f                               // An object that can be invoked by detail::invoke()
-      , CallPolicies const& p           // CallPolicies to use in the invocation
-      , Sig const&                      // An MPL sequence of argument types expected by F
-      )
-  {
-      return objects::function_object(
-          detail::caller<F,CallPolicies,Sig>(f, p)
-      );
-  }
-
-  // As above, except that it accepts argument keywords. NumKeywords
-  // is used only for a compile-time assertion to make sure the user
-  // doesn't pass more keywords than the function can accept. To
-  // disable all checking, pass mpl::int_<0> for NumKeywords.
-  template <class F, class CallPolicies, class Sig, class NumKeywords>
-  object make_function_aux(
-      F f
-      , CallPolicies const& p
-      , Sig const&
-      , detail::keyword_range const& kw // a [begin,end) pair of iterators over keyword names
-      , NumKeywords                     // An MPL integral type wrapper: the size of kw
-      )
-  {
-      enum { arity = mpl::size<Sig>::value - 1 };
-      
-      typedef typename detail::error::more_keywords_than_function_arguments<
-          NumKeywords::value, arity
-          >::too_many_keywords assertion;
-    
-      return objects::function_object(
-          detail::caller<F,CallPolicies,Sig>(f, p)
-        , kw);
-  }
-
-  //   Helpers for make_function when called with 3 arguments.  These
-  //   dispatch functions are used to discriminate between the cases
-  //   when the 3rd argument is keywords or when it is a signature.
-  //
-  // @group {
-  template <class F, class CallPolicies, class Keywords>
-  object make_function_dispatch(F f, CallPolicies const& policies, Keywords const& kw, mpl::true_)
-  {
-      return detail::make_function_aux(
-          f
-        , policies
-        , detail::get_signature(f)
-        , kw.range()
-        , mpl::int_<Keywords::size>()
-      );
-  }
-
-  template <class F, class CallPolicies, class Signature>
-  object make_function_dispatch(F f, CallPolicies const& policies, Signature const& sig, mpl::false_)
-  {
-      return detail::make_function_aux(
-          f
-        , policies
-        , sig
-      );
-  }
-  // }
-  
- }
-
-//   These overloaded functions wrap a function or member function
-//   pointer as a Python object, using optional CallPolicies,
-//   Keywords, and/or Signature.
-//
-//   @group {
-template <class F>
-object make_function(F f)
-{
-    return detail::make_function_aux(
-        f,default_call_policies(), detail::get_signature(f));
-}
-
-template <class F, class CallPolicies>
-object make_function(F f, CallPolicies const& policies)
-{
-    return detail::make_function_aux(
-        f, policies, detail::get_signature(f));
-}
-
-template <class F, class CallPolicies, class KeywordsOrSignature>
-object make_function(
-    F f
-  , CallPolicies const& policies
-  , KeywordsOrSignature const& keywords_or_signature)
-{
-    typedef typename
-        detail::is_reference_to_keywords<KeywordsOrSignature&>::type
-        is_kw;
-    
-    return detail::make_function_dispatch(
-        f
-      , policies
-      , keywords_or_signature
-      , is_kw()
-    );
-}
-
-template <class F, class CallPolicies, class Keywords, class Signature>
-object make_function(
-    F f
-  , CallPolicies const& policies
-  , Keywords const& kw
-  , Signature const& sig
- )
-{
-    return detail::make_function_aux(
-          f
-        , policies
-        , sig
-        , kw.range()
-        , mpl::int_<Keywords::size>()
-      );
-}
-// }
-
-}} 
-
-
-#endif // MAKE_FUNCTION_DWA20011221_HPP
diff --git a/include/boost/python/manage_new_object.hpp b/include/boost/python/manage_new_object.hpp
deleted file mode 100644
index 97cd911a..00000000
--- a/include/boost/python/manage_new_object.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MANAGE_NEW_OBJECT_DWA200222_HPP
-# define MANAGE_NEW_OBJECT_DWA200222_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/python/to_python_indirect.hpp>
-# include <boost/type_traits/composite_traits.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  template <class R>
-  struct manage_new_object_requires_a_pointer_return_type
-# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
-  {}
-# endif
-  ;
-}
-
-struct manage_new_object
-{
-    template <class T>
-    struct apply
-    {
-        typedef typename mpl::if_c<
-            boost::is_pointer<T>::value
-            , to_python_indirect<T, detail::make_owning_holder>
-            , detail::manage_new_object_requires_a_pointer_return_type<T>
-        >::type type;
-    };
-};
-
-}} // namespace boost::python
-
-#endif // MANAGE_NEW_OBJECT_DWA200222_HPP
diff --git a/include/boost/python/module.hpp b/include/boost/python/module.hpp
deleted file mode 100644
index f97d9470..00000000
--- a/include/boost/python/module.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MODULE_DWA2001128_HPP
-# define MODULE_DWA2001128_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/module_init.hpp>
-# define BOOST_PYTHON_MODULE BOOST_PYTHON_MODULE_INIT
-
-#endif // MODULE_DWA20011221_HPP
diff --git a/include/boost/python/module_init.hpp b/include/boost/python/module_init.hpp
deleted file mode 100644
index 39162e25..00000000
--- a/include/boost/python/module_init.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MODULE_INIT_DWA20020722_HPP
-# define MODULE_INIT_DWA20020722_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# ifndef BOOST_PYTHON_MODULE_INIT
-
-namespace boost { namespace python { namespace detail {
-
-BOOST_PYTHON_DECL void init_module(char const* name, void(*)());
-
-}}}
-
-#  if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(BOOST_PYTHON_STATIC_MODULE)
-
-#   define BOOST_PYTHON_MODULE_INIT(name)               \
-void init_module_##name();                              \
-extern "C" __declspec(dllexport) void init##name()      \
-{                                                       \
-    boost::python::detail::init_module(                 \
-        #name,&init_module_##name);                     \
-}                                                       \
-void init_module_##name()
-
-#  elif defined(_AIX) && !defined(BOOST_PYTHON_STATIC_MODULE)
-
-#   include <boost/python/detail/aix_init_module.hpp>
-#   define BOOST_PYTHON_MODULE_INIT(name)                               \
-void init_module_##name();                                              \
-extern "C"                                                              \
-{                                                                       \
-    extern PyObject* _PyImport_LoadDynamicModule(char*, char*, FILE *); \
-    void init##name()                                                   \
-    {                                                                   \
-        boost::python::detail::aix_init_module(                         \
-            _PyImport_LoadDynamicModule, #name, &init_module_##name);   \
-    }                                                                   \
-}                                                                       \
-void init_module_##name()
-
-# else
-
-#   define BOOST_PYTHON_MODULE_INIT(name)                               \
-void init_module_##name();                                              \
-extern "C"  void init##name()                                           \
-{                                                                       \
-    boost::python::detail::init_module(#name, &init_module_##name);     \
-}                                                                       \
-void init_module_##name()
-
-#  endif
-
-# endif 
-
-#endif // MODULE_INIT_DWA20020722_HPP
diff --git a/include/boost/python/numeric.hpp b/include/boost/python/numeric.hpp
deleted file mode 100644
index b7fc1c64..00000000
--- a/include/boost/python/numeric.hpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef NUMARRAY_DWA2002922_HPP
-# define NUMARRAY_DWA2002922_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/tuple.hpp>
-# include <boost/python/str.hpp>
-# include <boost/preprocessor/iteration/local.hpp>
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/repetition/enum.hpp>
-# include <boost/preprocessor/repetition/enum_params.hpp>
-# include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-namespace boost { namespace python { namespace numeric {
-
-namespace aux
-{
-  struct BOOST_PYTHON_DECL array_base : object
-  {
-# define BOOST_PP_LOCAL_MACRO(n)                                \
-      array_base(BOOST_PP_ENUM_PARAMS_Z(1, n, object const& x));
-# define BOOST_PP_LOCAL_LIMITS (1, 7)
-# include BOOST_PP_LOCAL_ITERATE()
-
-      object argmax(long axis=-1);
-      object argmin(long axis=-1);
-      object argsort(long axis=-1);
-      object astype(object const& type = object());
-      void byteswap();
-      object copy() const;
-      object diagonal(long offset = 0, long axis1 = 0, long axis2 = 1) const;
-      void info() const;
-      bool is_c_array() const;
-      bool isbyteswapped() const;
-      object new_(object type) const;
-      void sort();
-      object trace(long offset = 0, long axis1 = 0, long axis2 = 1) const;
-      object type() const;
-      char typecode() const;
-      
-      object factory(object const& buffer=object()
-            , object const& type=object()
-            , object const& shape=object()
-            , bool copy = true
-            , bool savespace = false
-            , object typecode = object());
-
-      object getflat() const;
-      long getrank() const;
-      object getshape() const;
-      bool isaligned() const;
-      bool iscontiguous() const;
-      long itemsize() const;
-      long nelements() const;
-      object nonzero() const;
-   
-      void put(object const& indices, object const& values);
-   
-      void ravel();
-   
-      object repeat(object const& repeats, long axis=0);
-   
-      void resize(object const& shape);
-      
-      void setflat(object const& flat);
-      void setshape(object const& shape);
-   
-      void swapaxes(long axis1, long axis2);
-   
-      object take(object const& sequence, long axis = 0) const;
-   
-      void tofile(object const& file) const;
-   
-      str tostring() const;
-   
-      void transpose(object const& axes = object());
-   
-      object view() const;
-
-   public: // implementation detail - do not touch.
-      BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(array_base, object);
-  };
-
-  struct BOOST_PYTHON_DECL array_object_manager_traits
-  {
-      static bool check(PyObject* obj);
-      static detail::new_non_null_reference adopt(PyObject* obj);
-  };
-} // namespace aux
-
-class array : public aux::array_base
-{
-    typedef aux::array_base base;
- public:
-
-    object astype() { return base::astype(); }
-    
-    template <class Type>
-    object astype(Type const& type_)
-    {
-        return base::astype(object(type_));
-    }
-
-    template <class Type>
-    object new_(Type const& type_) const
-    {
-        return base::new_(object(type_));
-    }
-
-    template <class Sequence>
-    void resize(Sequence const& x)
-    {
-        base::resize(object(x));
-    }
-    
-# define BOOST_PP_LOCAL_MACRO(n)                                \
-      void resize(BOOST_PP_ENUM_PARAMS_Z(1, n, long x))              \
-      {                                                         \
-          resize(make_tuple(BOOST_PP_ENUM_PARAMS_Z(1, n, x)));       \
-      }
-# define BOOST_PP_LOCAL_LIMITS (1, BOOST_PYTHON_MAX_ARITY)
-# include BOOST_PP_LOCAL_ITERATE()
-
-    template <class Sequence>
-    void setshape(Sequence const& x)
-    {
-        base::setshape(object(x));
-    }
-    
-# define BOOST_PP_LOCAL_MACRO(n)                                \
-    void setshape(BOOST_PP_ENUM_PARAMS_Z(1, n, long x))              \
-    {                                                           \
-        setshape(make_tuple(BOOST_PP_ENUM_PARAMS_Z(1, n, x)));       \
-    }
-# define BOOST_PP_LOCAL_LIMITS (1, BOOST_PYTHON_MAX_ARITY)
-# include BOOST_PP_LOCAL_ITERATE()
-
-    template <class Indices, class Values>
-    void put(Indices const& indices, Values const& values)
-    {
-        base::put(object(indices), object(values));
-    }
-    
-    template <class Sequence>
-    object take(Sequence const& sequence, long axis = 0)
-    {
-        return base::take(object(sequence), axis);
-    }
-
-    template <class File>
-    void tofile(File const& f) const
-    {
-        base::tofile(object(f));
-    }
-
-    object factory()
-    {
-        return base::factory();
-    }
-    
-    template <class Buffer>
-    object factory(Buffer const& buffer)
-    {
-        return base::factory(object(buffer));
-    }
-    
-    template <class Buffer, class Type>
-    object factory(
-        Buffer const& buffer
-        , Type const& type_)
-    {
-        return base::factory(object(buffer), object(type_));
-    }
-
-    template <class Buffer, class Type, class Shape>
-    object factory(
-        Buffer const& buffer
-        , Type const& type_
-        , Shape const& shape
-        , bool copy = true
-        , bool savespace = false)
-    {
-        return base::factory(object(buffer), object(type_), object(shape), copy, savespace);
-    }
-    
-    template <class Buffer, class Type, class Shape>
-    object factory(
-        Buffer const& buffer
-        , Type const& type_
-        , Shape const& shape
-        , bool copy
-        , bool savespace
-        , char typecode)
-    {
-        return base::factory(object(buffer), object(type_), object(shape), copy, savespace, object(typecode));
-    }
-
-# define BOOST_PYTHON_ENUM_AS_OBJECT(z, n, x) object(BOOST_PP_CAT(x,n))
-# define BOOST_PP_LOCAL_MACRO(n)                                        \
-    template <BOOST_PP_ENUM_PARAMS_Z(1, n, class T)>                    \
-    explicit array(BOOST_PP_ENUM_BINARY_PARAMS_Z(1, n, T, const& x))    \
-    : base(BOOST_PP_ENUM_1(n, BOOST_PYTHON_ENUM_AS_OBJECT, x))          \
-    {}
-# define BOOST_PP_LOCAL_LIMITS (1, 7)
-# include BOOST_PP_LOCAL_ITERATE()
-# undef BOOST_PYTHON_AS_OBJECT
-
-    static BOOST_PYTHON_DECL void set_module_and_type(char const* package_name = 0, char const* type_attribute_name = 0);
-
- public: // implementation detail -- for internal use only
-    BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(array, base);
-};
-
-} // namespace boost::python::numeric
-
-namespace converter
-{
-  template <>
-  struct object_manager_traits< numeric::array >
-      : numeric::aux::array_object_manager_traits
-  {
-      BOOST_STATIC_CONSTANT(bool, is_specialized = true);
-  };
-}
-
-}} // namespace boost::python
-
-#endif // NUMARRAY_DWA2002922_HPP
diff --git a/include/boost/python/object.hpp b/include/boost/python/object.hpp
deleted file mode 100755
index a367ed1c..00000000
--- a/include/boost/python/object.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJECT_DWA2002612_HPP
-# define OBJECT_DWA2002612_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/object_core.hpp>
-# include <boost/python/object_attributes.hpp>
-# include <boost/python/object_items.hpp>
-# include <boost/python/object_slices.hpp>
-# include <boost/python/object_operators.hpp>
-# include <boost/python/converter/arg_to_python.hpp>
-
-#endif // OBJECT_DWA2002612_HPP
diff --git a/include/boost/python/object/add_to_namespace.hpp b/include/boost/python/object/add_to_namespace.hpp
deleted file mode 100644
index 6a862b3d..00000000
--- a/include/boost/python/object/add_to_namespace.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ADD_TO_NAMESPACE_DWA200286_HPP
-# define ADD_TO_NAMESPACE_DWA200286_HPP
-
-# include <boost/python/object_fwd.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-//
-// A setattr that's "smart" about function overloading (and docstrings).
-//
-BOOST_PYTHON_DECL void add_to_namespace(
-    object const& name_space, char const* name, object const& attribute);
-
-BOOST_PYTHON_DECL void add_to_namespace(
-    object const& name_space, char const* name, object const& attribute, char const* doc);
-
-}}} // namespace boost::python::objects
-
-#endif // ADD_TO_NAMESPACE_DWA200286_HPP
diff --git a/include/boost/python/object/class.hpp b/include/boost/python/object/class.hpp
deleted file mode 100644
index 45bffbf7..00000000
--- a/include/boost/python/object/class.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CLASS_DWA20011214_HPP
-# define CLASS_DWA20011214_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/utility.hpp>
-# include <boost/python/object_core.hpp>
-# include <boost/python/type_id.hpp>
-# include <cstddef>
-
-namespace boost { namespace python {
-
-namespace objects { 
-
-struct BOOST_PYTHON_DECL class_base : python::api::object
-{
-    // constructor
-    class_base(
-        char const* name              // The name of the class
-        
-        , std::size_t num_types         // A list of class_ids. The first is the type
-        , type_info const*const types    // this is wrapping. The rest are the types of
-                                        // any bases.
-        
-        , char const* doc = 0           // Docstring, if any.
-        );
-
-
-    // Implementation detail. Hiding this in the private section would
-    // require use of template friend declarations.
-    void enable_pickling(bool getstate_manages_dict);
-
- protected:
-    void add_property(char const* name, object const& fget);
-    void add_property(char const* name, object const& fget, object const& fset);
-
-    void add_static_property(char const* name, object const& fget);
-    void add_static_property(char const* name, object const& fget, object const& fset);
-    
-    // Retrieve the underlying object
-    void setattr(char const* name, object const&);
-
-    // Set a special attribute in the class which tells Boost.Python
-    // to allocate extra bytes for embedded C++ objects in Python
-    // instances.
-    void set_instance_size(std::size_t bytes);
-
-    // Set an __init__ function which throws an appropriate exception
-    // for abstract classes.
-    void def_no_init();
-
-    // Effects:
-    //  setattr(self, staticmethod(getattr(self, method_name)))
-    void make_method_static(const char *method_name);
-};
-
-BOOST_PYTHON_DECL void copy_class_object(type_info const& src, type_info const& dst);
-
-}}} // namespace boost::python::objects
-
-#endif // CLASS_DWA20011214_HPP
diff --git a/include/boost/python/object/class_converters.hpp b/include/boost/python/object/class_converters.hpp
deleted file mode 100644
index b9cf4a43..00000000
--- a/include/boost/python/object/class_converters.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CLASS_CONVERTERS_DWA2002119_HPP
-# define CLASS_CONVERTERS_DWA2002119_HPP
-
-# include <boost/python/converter/registry.hpp>
-# include <boost/python/converter/shared_ptr_from_python.hpp>
-
-# include <boost/python/object/inheritance.hpp>
-
-# include <boost/python/detail/force_instantiate.hpp>
-
-# include <boost/type_traits/add_pointer.hpp>
-# include <boost/type_traits/is_polymorphic.hpp>
-
-# include <boost/mpl/for_each.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-//////////////////////////////////////////////////////////////////////
-//
-// register_base_of<T> -
-//      A BinaryMetaFunction object which registers a single base
-//      class of T, and the corresponding cast(s)
-//
-
-
-// register_downcast/do_nothing -
-//      Helpers for register_base_of<> which take care of registering
-//      down-casts
-template <class Base, class Derived>
-struct register_downcast
-{
-    static void execute()
-    {
-        register_conversion<Base, Derived>(true);
-    }
-};
-
-struct do_nothing
-{
-    static void execute() { }
-};
-
-// Here's where the real work gets done:
-template <class Derived>
-struct register_base_of
-{
-    // Here's the runtime part:
-    template <class Base>
-    void operator()(Base*) const
-    {
-        // Register the Base class
-        register_dynamic_id<Base>();
-        // Register the up-cast
-        register_conversion<Derived,Base>(false);
-
-        // Register the down-cast, if appropriate.
-        mpl::if_<
-# if BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
-            mpl::true_
-# else
-            is_polymorphic<Base>
-# endif 
-          , register_downcast<Base,Derived>
-          , do_nothing
-        >::type::execute();
-    }
-};
-
-// Brings into existence all converters associated with a class. Bases
-// is expected to be an mpl sequence of base types.
-template <class Derived, class Bases>
-inline void register_class_from_python(Derived* = 0, Bases* = 0)
-{
-    python::detail::force_instantiate(converter::shared_ptr_from_python<Derived>::registration);
-    
-    // register all up/downcasts here
-    register_dynamic_id<Derived>();
-
-    // register each base in the sequence
-    mpl::for_each(register_base_of<Derived>(), (Bases*)0, (add_pointer<mpl::_>*)0);
-}
-
-}}} // namespace boost::python::object
-
-#endif // CLASS_CONVERTERS_DWA2002119_HPP
diff --git a/include/boost/python/object/class_detail.hpp b/include/boost/python/object/class_detail.hpp
deleted file mode 100644
index f4d4d51e..00000000
--- a/include/boost/python/object/class_detail.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CLASS_DETAIL_DWA200295_HPP
-# define CLASS_DETAIL_DWA200295_HPP
-
-# include <boost/python/handle.hpp>
-# include <boost/python/type_id.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-BOOST_PYTHON_DECL type_handle registered_class_object(type_info id);
-BOOST_PYTHON_DECL type_handle class_metatype();
-BOOST_PYTHON_DECL type_handle class_type();
-
-}}} // namespace boost::python::object
-
-#endif // CLASS_DETAIL_DWA200295_HPP
diff --git a/include/boost/python/object/class_wrapper.hpp b/include/boost/python/object/class_wrapper.hpp
deleted file mode 100644
index f0fad309..00000000
--- a/include/boost/python/object/class_wrapper.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef CLASS_WRAPPER_DWA20011221_HPP
-# define CLASS_WRAPPER_DWA20011221_HPP
-
-# include <boost/python/to_python_converter.hpp>
-# include <boost/ref.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-//
-// These two classes adapt the static execute function of a class
-// MakeInstance execute() function returning a new PyObject*
-// reference. The first one is used for class copy constructors, and
-// the second one is used to handle smart pointers.
-//
-
-template <class Src, class MakeInstance>
-struct class_cref_wrapper
-    : to_python_converter<Src,class_cref_wrapper<Src,MakeInstance> >
-{
-    static PyObject* convert(Src const& x)
-    {
-        return MakeInstance::execute(boost::ref(x));
-    }
-};
-
-template <class Src, class MakeInstance>
-struct class_value_wrapper
-    : to_python_converter<Src,class_value_wrapper<Src,MakeInstance> >
-{
-    static PyObject* convert(Src x)
-    {
-        return MakeInstance::execute(x);
-    }
-};
-
-}}} // namespace boost::python::objects
-
-#endif // CLASS_WRAPPER_DWA20011221_HPP
diff --git a/include/boost/python/object/enum_base.hpp b/include/boost/python/object/enum_base.hpp
deleted file mode 100644
index 8e4a7301..00000000
--- a/include/boost/python/object/enum_base.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ENUM_BASE_DWA200298_HPP
-# define ENUM_BASE_DWA200298_HPP
-
-# include <boost/python/object_core.hpp>
-# include <boost/python/type_id.hpp>
-# include <boost/python/converter/to_python_function_type.hpp>
-# include <boost/python/converter/convertible_function.hpp>
-# include <boost/python/converter/constructor_function.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-struct BOOST_PYTHON_DECL enum_base : python::api::object
-{
- protected:
-    enum_base(
-        char const* name
-        , converter::to_python_function_t
-        , converter::convertible_function
-        , converter::constructor_function
-        , type_info);
-
-    void add_value(char const* name, long value);
-    void export_values();
-    
-    static PyObject* to_python(PyTypeObject* type, long x);
-};
-
-}}} // namespace boost::python::object
-
-#endif // ENUM_BASE_DWA200298_HPP
diff --git a/include/boost/python/object/find_instance.hpp b/include/boost/python/object/find_instance.hpp
deleted file mode 100644
index 113b622d..00000000
--- a/include/boost/python/object/find_instance.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef FIND_INSTANCE_DWA2002312_HPP
-# define FIND_INSTANCE_DWA2002312_HPP
-
-# include <boost/python/type_id.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-// Given a type_id, find the instance data which corresponds to it, or
-// return 0 in case no such type is held.
-BOOST_PYTHON_DECL void* find_instance_impl(PyObject*, type_info);
-
-}}} // namespace boost::python::objects
-
-#endif // FIND_INSTANCE_DWA2002312_HPP
diff --git a/include/boost/python/object/forward.hpp b/include/boost/python/object/forward.hpp
deleted file mode 100644
index bf21aa2a..00000000
--- a/include/boost/python/object/forward.hpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef FORWARD_DWA20011215_HPP
-# define FORWARD_DWA20011215_HPP
-
-# include <boost/mpl/if.hpp>
-# include <boost/type_traits/is_scalar.hpp>
-# include <boost/type_traits/add_const.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/ref.hpp>
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
-#  include <boost/type_traits/is_enum.hpp>
-#  include <boost/mpl/and.hpp>
-#  include <boost/mpl/not.hpp>
-# endif 
-
-namespace boost { namespace python { namespace objects { 
-
-// Very much like boost::reference_wrapper<T>, except that in this
-// case T can be a reference already without causing a
-// reference-to-reference error.
-template <class T>
-struct reference_to_value
-{
-    typedef typename add_reference<typename add_const<T>::type>::type reference;
-    
-    reference_to_value(reference x) : m_value(x) {}
-    reference get() const { return m_value; }
- private:
-    reference m_value;
-};
-
-// A little metaprogram which selects the type to pass through an
-// intermediate forwarding function when the destination argument type
-// is T.
-template <class T>
-struct forward
-    : mpl::if_<
-# if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
-          // vc6 chokes on unforwarding enums nested in classes
-          mpl::and_<
-              is_scalar<T>
-            , mpl::not_< 
-                  is_enum<T>
-              >
-          >
-# else 
-          is_scalar<T>
-# endif 
-        , T
-        , reference_to_value<T>
-      >
-{
-};
-
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-template<typename T>
-struct unforward
-{
-    typedef typename unwrap_reference<T>::type& type;
-};
-
-template<typename T>
-struct unforward<reference_to_value<T> >
-{
-    typedef T type;
-};
-
-template <typename T>
-struct unforward_cref
-  : add_reference<
-        typename add_const<
-            typename unwrap_reference<T>::type
-        >::type
-    >
-{
-};
-
-template<typename T>
-struct unforward_cref<reference_to_value<T> >
-  : add_reference<typename add_const<T>::type>
-{
-};
-
-# else // no partial specialization
-
-namespace detail
-{
-  typedef char (&yes_reference_to_value_t)[1];
-  typedef char (&no_reference_to_value_t)[2];
-      
-  no_reference_to_value_t is_reference_to_value_test(...);
-
-  template<typename T>
-  yes_reference_to_value_t is_reference_to_value_test(boost::type< reference_to_value<T> >);
-
-  template<bool wrapped>
-  struct unforwarder
-  {
-      template <class T>
-      struct apply
-      {
-          typedef typename unwrap_reference<T>::type& type;
-      };
-  };
-
-  template<>
-  struct unforwarder<true>
-  {
-      template <class T>
-      struct apply
-      {
-          typedef typename T::reference type;
-      };
-  };
-
-  template<bool wrapped = false>
-  struct cref_unforwarder
-  {
-      template <class T>
-      struct apply
-        : add_reference<
-              typename add_const<
-                  typename unwrap_reference<T>::type
-              >::type
-          >
-      {          
-      };
-  };
-      
-  template<>
-  struct cref_unforwarder<true>
-  {
-      template <class T>
-      struct apply
-          : add_reference<
-                typename add_const<
-                    typename T::reference
-                >::type
-            >
-      {
-      };
-  };
-
-  template<typename T>
-  struct is_reference_to_value
-  {
-      BOOST_STATIC_CONSTANT(
-          bool, value = (
-              sizeof(is_reference_to_value_test(boost::type<T>()))
-              == sizeof(yes_reference_to_value_t)));
-      typedef mpl::bool_<value> type;
-  };
-}
-
-template <typename T>
-struct unforward
-    : public detail::unforwarder<
-        detail::is_reference_to_value<T>::value
-      >::template apply<T>
-{};
-
-template <typename T>
-struct unforward_cref
-    : public detail::cref_unforwarder<
-        detail::is_reference_to_value<T>::value
-      >::template apply<T>
-{};
-
-# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-
-template <class T>
-typename reference_to_value<T>::reference
-do_unforward(reference_to_value<T> const& x, int)
-{
-    return x.get();
-}
-
-template <class T>
-typename reference_wrapper<T>::type&
-do_unforward(reference_wrapper<T> const& x, int)
-{
-    return x.get();
-}
-
-template <class T>
-T const& do_unforward(T const& x, ...)
-{
-    return x;
-}
-
-}}} // namespace boost::python::objects
-
-#endif // FORWARD_DWA20011215_HPP
diff --git a/include/boost/python/object/function.hpp b/include/boost/python/object/function.hpp
deleted file mode 100644
index 9a3e0818..00000000
--- a/include/boost/python/object/function.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef FUNCTION_DWA20011214_HPP
-# define FUNCTION_DWA20011214_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/args_fwd.hpp>
-# include <boost/python/handle.hpp>
-# include <boost/function/function2.hpp>
-# include <boost/python/object_core.hpp>
-# include <boost/python/object/py_function.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-struct BOOST_PYTHON_DECL function : PyObject
-{
-    function(
-        py_function const&
-        , python::detail::keyword const* names_and_defaults
-        , unsigned num_keywords);
-      
-    ~function();
-    
-    PyObject* call(PyObject*, PyObject*) const;
-
-    // Add an attribute to the name_space with the given name. If it is
-    // a function object (this class), and an existing function is
-    // already there, add it as an overload.
-    static void add_to_namespace(
-        object const& name_space, char const* name, object const& attribute);
-
-    static void add_to_namespace(
-        object const& name_space, char const* name, object const& attribute, char const* doc);
-
-    object const& doc() const;
-    void doc(object const& x);
-    
-    object const& name() const;
-    
- private: // helper functions
-    void argument_error(PyObject* args, PyObject* keywords) const;
-    void add_overload(handle<function> const&);
-    
- private: // data members
-    py_function m_fn;
-    handle<function> m_overloads;
-    object m_name;
-    object m_namespace;
-    object m_doc;
-    object m_arg_names;
-    unsigned m_nkeyword_values;
-};
-
-//
-// implementations
-//
-inline object const& function::doc() const
-{
-    return this->m_doc;
-}
-
-inline void function::doc(object const& x)
-{
-    this->m_doc = x;
-}
-
-inline object const& function::name() const
-{
-    return this->m_name;
-}
-  
-}}} // namespace boost::python::objects
-
-#endif // FUNCTION_DWA20011214_HPP
diff --git a/include/boost/python/object/function_handle.hpp b/include/boost/python/object/function_handle.hpp
deleted file mode 100644
index f7b62b50..00000000
--- a/include/boost/python/object/function_handle.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef FUNCTION_HANDLE_DWA2002725_HPP
-# define FUNCTION_HANDLE_DWA2002725_HPP
-# include <boost/python/handle.hpp>
-# include <boost/python/detail/caller.hpp>
-# include <boost/python/default_call_policies.hpp>
-# include <boost/python/object/py_function.hpp>
-# include <boost/python/signature.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-BOOST_PYTHON_DECL handle<> function_handle_impl(py_function const& f);
-
-// Just like function_object, but returns a handle<> instead. Using
-// this for arg_to_python<> allows us to break a circular dependency
-// between object and arg_to_python.
-template <class F, class Signature>
-inline handle<> function_handle(F const& f, Signature)
-{
-    enum { n_arguments = mpl::size<Signature>::value - 1 };
-
-    return objects::function_handle_impl(
-        python::detail::caller<
-            F,default_call_policies,Signature
-        >(
-            f, default_call_policies()
-         )
-    );
-}
-
-// Just like make_function, but returns a handle<> intead. Same
-// reasoning as above.
-template <class F>
-handle<> make_function_handle(F f)
-{
-    return objects::function_handle(f, python::detail::get_signature(f));
-}
-
-}}} // namespace boost::python::objects
-
-#endif // FUNCTION_HANDLE_DWA2002725_HPP
diff --git a/include/boost/python/object/function_object.hpp b/include/boost/python/object/function_object.hpp
deleted file mode 100644
index 0bf91669..00000000
--- a/include/boost/python/object/function_object.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef FUNCTION_OBJECT_DWA2002725_HPP
-# define FUNCTION_OBJECT_DWA2002725_HPP
-# include <boost/python/detail/prefix.hpp>
-# include <boost/function/function2.hpp>
-# include <boost/python/object_core.hpp>
-# include <boost/python/args_fwd.hpp>
-# include <boost/python/object/py_function.hpp>
-
-namespace boost { namespace python {
-
-namespace objects
-{ 
-  BOOST_PYTHON_DECL api::object function_object(
-      py_function const& f
-      , python::detail::keyword_range const&);
-
-  BOOST_PYTHON_DECL api::object function_object(
-      py_function const& f
-      , python::detail::keyword_range const&);
-
-  BOOST_PYTHON_DECL api::object function_object(py_function const& f);
-
-  // Add an attribute to the name_space with the given name. If it is
-  // a Boost.Python function object
-  // (boost/python/object/function.hpp), and an existing function is
-  // already there, add it as an overload.
-  BOOST_PYTHON_DECL void add_to_namespace(
-      object const& name_space, char const* name, object const& attribute);
-
-  BOOST_PYTHON_DECL void add_to_namespace(
-      object const& name_space, char const* name, object const& attribute, char const* doc);
-}
-
-}} // namespace boost::python::objects
-
-#endif // FUNCTION_OBJECT_DWA2002725_HPP
diff --git a/include/boost/python/object/inheritance.hpp b/include/boost/python/object/inheritance.hpp
deleted file mode 100644
index 68295f62..00000000
--- a/include/boost/python/object/inheritance.hpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef INHERITANCE_DWA200216_HPP
-# define INHERITANCE_DWA200216_HPP
-
-# include <boost/python/type_id.hpp>
-# include <boost/shared_ptr.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/type_traits/is_polymorphic.hpp>
-# include <boost/type_traits/is_base_and_derived.hpp>
-# include <boost/detail/workaround.hpp>
-
-namespace boost { namespace python { namespace objects {
-
-typedef type_info class_id;
-using python::type_id;
-
-// Types used to get address and id of most derived type
-typedef std::pair<void*,class_id> dynamic_id_t;
-typedef dynamic_id_t (*dynamic_id_function)(void*);
-
-BOOST_PYTHON_DECL void register_dynamic_id_aux(
-    class_id static_id, dynamic_id_function get_dynamic_id);
-
-BOOST_PYTHON_DECL void add_cast(
-    class_id src_t, class_id dst_t, void* (*cast)(void*), bool is_downcast);
-
-//
-// a generator with an execute() function which, given a source type
-// and a pointer to an object of that type, returns its most-derived
-// /reachable/ type identifier and object pointer.
-//
-
-// first, the case where T has virtual functions
-template <class T>
-struct polymorphic_id_generator
-{
-    static dynamic_id_t execute(void* p_)
-    {
-        T* p = static_cast<T*>(p_);
-        return std::make_pair(dynamic_cast<void*>(p), class_id(typeid(*p)));
-    }
-};
-
-// now, the non-polymorphic case.
-template <class T>
-struct non_polymorphic_id_generator
-{
-    static dynamic_id_t execute(void* p_)
-    {
-        return std::make_pair(p_, python::type_id<T>());
-    }
-};
-
-// Now the generalized selector
-template <class T>
-struct dynamic_id_generator
-  : mpl::if_<
-        boost::is_polymorphic<T>
-        , boost::python::objects::polymorphic_id_generator<T>
-        , boost::python::objects::non_polymorphic_id_generator<T>
-    >
-{};
-
-// Register the dynamic id function for T with the type-conversion
-// system.
-template <class T>
-void register_dynamic_id(T* = 0)
-{
-    typedef typename dynamic_id_generator<T>::type generator;
-    register_dynamic_id_aux(
-        python::type_id<T>(), &generator::execute);
-}
-
-//
-// a generator with an execute() function which, given a void*
-// pointing to an object of type Source will attempt to convert it to
-// an object of type Target.
-//
-
-template <class Source, class Target>
-struct dynamic_cast_generator
-{
-    static void* execute(void* source)
-    {
-        return dynamic_cast<Target*>(
-            static_cast<Source*>(source));
-    }
-        
-};
-
-template <class Source, class Target>
-struct implicit_cast_generator
-{
-    static void* execute(void* source)
-    {
-        Target* result = static_cast<Source*>(source);
-        return result;
-    }
-};
-
-template <class Source, class Target>
-struct cast_generator
-  : mpl::if_<
-        is_base_and_derived<Target,Source>
-      , implicit_cast_generator<Source,Target>
-      , dynamic_cast_generator<Source,Target>
-    >
-{
-};
-
-template <class Source, class Target>
-inline void register_conversion(
-    bool is_downcast = ::boost::is_base_and_derived<Source,Target>::value
-    // These parameters shouldn't be used; they're an MSVC bug workaround
-    , Source* = 0, Target* = 0)
-{
-    typedef typename cast_generator<Source,Target>::type generator;
-
-    add_cast(
-        python::type_id<Source>()
-      , python::type_id<Target>()
-      , &generator::execute
-      , is_downcast
-    );
-}
-
-}}} // namespace boost::python::object
-
-#endif // INHERITANCE_DWA200216_HPP
diff --git a/include/boost/python/object/inheritance_query.hpp b/include/boost/python/object/inheritance_query.hpp
deleted file mode 100755
index de476f2d..00000000
--- a/include/boost/python/object/inheritance_query.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef INHERITANCE_QUERY_DWA2003520_HPP
-# define INHERITANCE_QUERY_DWA2003520_HPP
-
-# include <boost/python/type_id.hpp>
-
-namespace boost { namespace python { namespace objects {
-
-BOOST_PYTHON_DECL void* find_static_type(void* p, type_info src, type_info dst);
-BOOST_PYTHON_DECL void* find_dynamic_type(void* p, type_info src, type_info dst);
-
-}}} // namespace boost::python::object
-
-#endif // INHERITANCE_QUERY_DWA2003520_HPP
diff --git a/include/boost/python/object/instance.hpp b/include/boost/python/object/instance.hpp
deleted file mode 100644
index 8b4e45f0..00000000
--- a/include/boost/python/object/instance.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef INSTANCE_DWA200295_HPP
-# define INSTANCE_DWA200295_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/type_traits/alignment_traits.hpp>
-# include <cstddef>
-
-namespace boost { namespace python
-{
-  struct BOOST_PYTHON_DECL instance_holder;
-}} // namespace boost::python
-
-namespace boost { namespace python { namespace objects { 
-
-// Each extension instance will be one of these
-template <class Data = char>
-struct instance
-{
-    PyObject_VAR_HEAD
-    PyObject* dict;
-    PyObject* weakrefs; 
-    instance_holder* objects;
-
-    typedef typename type_with_alignment<
-        ::boost::alignment_of<Data>::value
-    >::type align_t;
-          
-    union
-    {
-        align_t align;
-        char bytes[sizeof(Data)];
-    } storage;
-};
-
-template <class Data>
-struct additional_instance_size
-{
-    typedef instance<Data> instance_data;
-    typedef instance<char> instance_char;
-    BOOST_STATIC_CONSTANT(
-        std::size_t, value = sizeof(instance_data)
-                           - BOOST_PYTHON_OFFSETOF(instance_char,storage));
-};
-
-}}} // namespace boost::python::object
-
-#endif // INSTANCE_DWA200295_HPP
diff --git a/include/boost/python/object/iterator.hpp b/include/boost/python/object/iterator.hpp
deleted file mode 100644
index 78d27783..00000000
--- a/include/boost/python/object/iterator.hpp
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ITERATOR_DWA2002510_HPP
-# define ITERATOR_DWA2002510_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/class.hpp>
-# include <boost/python/return_value_policy.hpp>
-# include <boost/python/return_by_value.hpp>
-# include <boost/python/handle.hpp>
-# include <boost/python/make_function.hpp>
-
-# include <boost/python/object/iterator_core.hpp>
-# include <boost/python/object/class_detail.hpp>
-# include <boost/python/object/function_object.hpp>
-
-# include <boost/mpl/vector/vector10.hpp>
-# include <boost/mpl/if.hpp>
-
-# include <boost/python/detail/raw_pyobject.hpp>
-
-# include <boost/type.hpp>
-
-# include <boost/type_traits/is_same.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/type_traits/add_const.hpp>
-
-# include <boost/detail/iterator.hpp>
-
-namespace boost { namespace python { namespace objects {
-
-// CallPolicies for the next() method of iterators. We don't want
-// users to have to explicitly specify that the references returned by
-// iterators are copied, so we just replace the result_converter from
-// the default_iterator_call_policies with a permissive one which
-// always copies the result.
-typedef return_value_policy<return_by_value> default_iterator_call_policies;
-
-// Instantiations of these are wrapped to produce Python iterators.
-template <class NextPolicies, class Iterator>
-struct iterator_range
-{
-    iterator_range(object sequence, Iterator start, Iterator finish);
-
-    typedef boost::detail::iterator_traits<Iterator> traits_t;
-
-    struct next
-    {
-        typedef typename mpl::if_<
-            is_reference<
-                typename traits_t::reference
-            >
-          , typename traits_t::reference
-          , typename traits_t::value_type
-        >::type result_type;
-        
-        result_type
-        operator()(iterator_range<NextPolicies,Iterator>& self)
-        {
-            if (self.m_start == self.m_finish)
-                stop_iteration_error();
-            return *self.m_start++;
-        }
-
-# if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
-        // CWPro8 has a codegen problem when this is an empty class
-        int garbage;
-# endif 
-    };
-    
-# ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-    // for compilers which can't deduce the value_type of pointers, we
-    // have a special implementation of next.  This takes advantage of
-    // the fact that T* results are treated like T& results by
-    // Boost.Python's function wrappers.
-    struct next_ptr
-    {
-        typedef Iterator result_type;
-        
-        result_type
-        operator()(iterator_range<NextPolicies,Iterator>& self)
-        {
-            if (self.m_start == self.m_finish)
-                stop_iteration_error();
-            return self.m_start++;
-        }
-    };
-    
-    typedef mpl::if_<
-        is_same<
-            boost::detail::please_invoke_BOOST_TT_BROKEN_COMPILER_SPEC_on_cv_unqualified_pointee<Iterator>
-          , typename traits_t::value_type
-        >
-      , next_ptr
-      , next
-    >::type next_fn;
-# else
-    typedef next next_fn;
-# endif
-    
-    object m_sequence; // Keeps the sequence alive while iterating.
-    Iterator m_start;
-    Iterator m_finish;
-};
-
-namespace detail
-{
-  // Get a Python class which contains the given iterator and
-  // policies, creating it if neccessary. Requires: NextPolicies is
-  // default-constructible.
-  template <class Iterator, class NextPolicies>
-  object demand_iterator_class(char const* name, Iterator* = 0, NextPolicies const& policies = NextPolicies())
-  {
-      typedef iterator_range<NextPolicies,Iterator> range_;
-
-      // Check the registry. If one is already registered, return it.
-      handle<> class_obj(
-          objects::registered_class_object(python::type_id<range_>()));
-        
-      if (class_obj.get() != 0)
-          return object(class_obj);
-
-      typedef typename range_::next_fn next_fn;
-      typedef typename next_fn::result_type result_type;
-      
-      return class_<range_>(name, no_init)
-          .def("__iter__", identity_function())
-          .def(
-              "next"
-            , make_function(
-                next_fn()
-              , policies
-              , mpl::vector2<result_type,range_&>()
-            ));
-  }
-
-  // A function object which builds an iterator_range.
-  template <
-      class Target
-    , class Iterator
-    , class Accessor1
-    , class Accessor2
-    , class NextPolicies
-  >
-  struct py_iter_
-  {
-      py_iter_(Accessor1 const& get_start, Accessor2 const& get_finish)
-        : m_get_start(get_start)
-        , m_get_finish(get_finish)
-      {}
-      
-      // Extract an object x of the Target type from the first Python
-      // argument, and invoke get_start(x)/get_finish(x) to produce
-      // iterators, which are used to construct a new iterator_range<>
-      // object that gets wrapped into a Python iterator.
-      iterator_range<NextPolicies,Iterator>
-      operator()(back_reference<Target&> x) const
-      {
-          // Make sure the Python class is instantiated.
-          detail::demand_iterator_class("iterator", (Iterator*)0, NextPolicies());
-          
-          return iterator_range<NextPolicies,Iterator>(
-              x.source()
-            , m_get_start(x.get())
-            , m_get_finish(x.get())
-          );
-      }
-   private:
-      Accessor1 m_get_start;
-      Accessor2 m_get_finish;
-  };
-
-  template <class Target, class Iterator, class NextPolicies, class Accessor1, class Accessor2>
-  inline object make_iterator_function(
-      Accessor1 const& get_start
-    , Accessor2 const& get_finish
-    , NextPolicies const& next_policies
-    , Iterator const& (*)()
-    , boost::type<Target>*
-    , int
-  )
-  {
-      return make_function(
-          py_iter_<Target,Iterator,Accessor1,Accessor2,NextPolicies>(get_start, get_finish)
-        , default_call_policies()
-        , mpl::vector2<iterator_range<NextPolicies,Iterator>, back_reference<Target&> >()
-      );
-  }
-
-  template <class Target, class Iterator, class NextPolicies, class Accessor1, class Accessor2>
-  inline object make_iterator_function(
-      Accessor1 const& get_start
-    , Accessor2 const& get_finish
-    , NextPolicies const& next_policies
-    , Iterator& (*)()
-    , boost::type<Target>*
-    , ...)
-  {
-      return make_iterator_function(
-          get_start
-        , get_finish
-        , next_policies
-        , (Iterator const&(*)())0
-        , (boost::type<Target>*)0
-        , 0
-      );
-  }
-
-}
-
-// Create a Python callable object which accepts a single argument
-// convertible to the C++ Target type and returns a Python
-// iterator. The Python iterator uses get_start(x) and get_finish(x)
-// (where x is an instance of Target) to produce begin and end
-// iterators for the range, and an instance of NextPolicies is used as
-// CallPolicies for the Python iterator's next() function. 
-template <class Target, class NextPolicies, class Accessor1, class Accessor2>
-inline object make_iterator_function(
-    Accessor1 const& get_start
-  , Accessor2 const& get_finish
-  , NextPolicies const& next_policies
-  , boost::type<Target>* = 0
-)
-{
-    typedef typename Accessor1::result_type iterator;
-    typedef typename add_const<iterator>::type iterator_const;
-    typedef typename add_reference<iterator_const>::type iterator_cref;
-      
-    return detail::make_iterator_function(
-        get_start
-      , get_finish
-      , next_policies
-      , (iterator_cref(*)())0
-      , (boost::type<Target>*)0
-      , 0
-    );
-}
-
-//
-// implementation
-//
-template <class NextPolicies, class Iterator>
-inline iterator_range<NextPolicies,Iterator>::iterator_range(
-    object sequence, Iterator start, Iterator finish)
-    : m_sequence(sequence), m_start(start), m_finish(finish)
-{
-}
-
-}}} // namespace boost::python::objects
-
-#endif // ITERATOR_DWA2002510_HPP
diff --git a/include/boost/python/object/iterator_core.hpp b/include/boost/python/object/iterator_core.hpp
deleted file mode 100644
index 4003c61d..00000000
--- a/include/boost/python/object/iterator_core.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef ITERATOR_CORE_DWA2002512_HPP
-# define ITERATOR_CORE_DWA2002512_HPP
-
-# include <boost/python/object_fwd.hpp>
-
-namespace boost { namespace python { namespace objects {
-
-BOOST_PYTHON_DECL object const& identity_function();
-BOOST_PYTHON_DECL void stop_iteration_error();
-
-}}} // namespace boost::python::object
-
-#endif // ITERATOR_CORE_DWA2002512_HPP
diff --git a/include/boost/python/object/life_support.hpp b/include/boost/python/object/life_support.hpp
deleted file mode 100644
index af520006..00000000
--- a/include/boost/python/object/life_support.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef LIFE_SUPPORT_DWA200222_HPP
-# define LIFE_SUPPORT_DWA200222_HPP
-# include <boost/python/detail/prefix.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-BOOST_PYTHON_DECL PyObject* make_nurse_and_patient(PyObject* nurse, PyObject* patient);
-
-}}} // namespace boost::python::object
-
-#endif // LIFE_SUPPORT_DWA200222_HPP
diff --git a/include/boost/python/object/make_holder.hpp b/include/boost/python/object/make_holder.hpp
deleted file mode 100644
index 91a0d455..00000000
--- a/include/boost/python/object/make_holder.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#if !defined(BOOST_PP_IS_ITERATING)
-
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# ifndef MAKE_HOLDER_DWA20011215_HPP
-#  define MAKE_HOLDER_DWA20011215_HPP
-
-#  include <boost/python/detail/prefix.hpp>
-
-#  include <boost/python/object/instance.hpp>
-
-#  include <boost/python/object/forward.hpp>
-#  include <boost/python/detail/preprocessor.hpp>
-
-#  include <boost/mpl/next.hpp>
-#  include <boost/mpl/begin_end.hpp>
-#  include <boost/mpl/apply.hpp>
-
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/iteration/local.hpp>
-#  include <boost/preprocessor/repeat.hpp>
-#  include <boost/preprocessor/debug/line.hpp>
-#  include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
-
-#  include <cstddef>
-
-namespace boost { namespace python { namespace objects {
-
-template <int nargs> struct make_holder;
-
-#  define BOOST_PYTHON_DO_FORWARD_ARG(z, index, _) , f##index(a##index)
-
-// specializations...
-#  define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/object/make_holder.hpp>))
-#  include BOOST_PP_ITERATE()
-
-#  undef BOOST_PYTHON_DO_FORWARD_ARG
-
-}}} // namespace boost::python::objects
-
-# endif // MAKE_HOLDER_DWA20011215_HPP
-
-#elif BOOST_PP_ITERATION_DEPTH() == 1
-# line BOOST_PP_LINE(__LINE__, make_holder.hpp)
-
-# define N BOOST_PP_ITERATION()
-
-template <>
-struct make_holder<N>
-{
-    template <class Holder, class ArgList>
-    struct apply
-    {
-# if N
-        // Unrolled iteration through each argument type in ArgList,
-        // choosing the type that will be forwarded on to the holder's
-        // templated constructor.
-        typedef typename mpl::begin<ArgList>::type iter0;
-        
-#  define BOOST_PP_LOCAL_MACRO(n)               \
-    typedef typename mpl::apply0<iter##n>::type t##n;        \
-    typedef typename forward<t##n>::type f##n;  \
-    typedef typename mpl::next<iter##n>::type   \
-        BOOST_PP_CAT(iter,BOOST_PP_INC(n)); // Next iterator type
-        
-#  define BOOST_PP_LOCAL_LIMITS (0, N-1)
-#  include BOOST_PP_LOCAL_ITERATE()
-# endif 
-        
-        static void execute(
-            PyObject* p
-            BOOST_PP_ENUM_TRAILING_BINARY_PARAMS_Z(1, N, t, a))
-        {
-            typedef instance<Holder> instance_t;
-            
-            void* memory = Holder::allocate(p, offsetof(instance_t, storage), sizeof(Holder));
-            try {
-                (new (memory) Holder(
-                    p BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_DO_FORWARD_ARG, nil)))->install(p);
-            }
-            catch(...) {
-                Holder::deallocate(p, memory);
-                throw;
-            }
-        }
-    };
-};
-
-# undef N
-
-#endif
diff --git a/include/boost/python/object/make_instance.hpp b/include/boost/python/object/make_instance.hpp
deleted file mode 100644
index 68e7b379..00000000
--- a/include/boost/python/object/make_instance.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MAKE_INSTANCE_DWA200296_HPP
-# define MAKE_INSTANCE_DWA200296_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/object/instance.hpp>
-# include <boost/python/converter/registered.hpp>
-# include <boost/python/detail/decref_guard.hpp>
-# include <boost/python/detail/none.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-template <class T, class Holder, class Derived>
-struct make_instance_impl
-{
-    typedef objects::instance<Holder> instance_t;
-        
-    template <class Arg>
-    static inline PyObject* execute(Arg& x)
-    {
-        BOOST_STATIC_ASSERT(is_class<T>::value);
-
-        PyTypeObject* type = Derived::get_class_object(x);
-
-		if (type == 0)
-			return python::detail::none();
-
-        PyObject* raw_result = type->tp_alloc(
-            type, objects::additional_instance_size<Holder>::value);
-          
-        if (raw_result != 0)
-        {
-            python::detail::decref_guard protect(raw_result);
-            
-            instance_t* instance = (instance_t*)raw_result;
-            
-            // construct the new C++ object and install the pointer
-            // in the Python object.
-            Derived::construct(&instance->storage, (PyObject*)instance, x)->install(raw_result);
-              
-            // Note the position of the internally-stored Holder,
-            // for the sake of destruction
-            instance->ob_size = offsetof(instance_t, storage);
-
-            // Release ownership of the python object
-            protect.cancel();
-        }
-        return raw_result;
-    }
-};
-    
-
-template <class T, class Holder>
-struct make_instance
-    : make_instance_impl<T, Holder, make_instance<T,Holder> >
-{
-    template <class U>
-    static inline PyTypeObject* get_class_object(U&)
-    {
-        return converter::registered<T>::converters.get_class_object();
-    }
-    
-    static inline Holder* construct(void* storage, PyObject* instance, reference_wrapper<T const> x)
-    {
-        return new (storage) Holder(instance, x);
-    }
-};
-  
-
-}}} // namespace boost::python::object
-
-#endif // MAKE_INSTANCE_DWA200296_HPP
diff --git a/include/boost/python/object/make_ptr_instance.hpp b/include/boost/python/object/make_ptr_instance.hpp
deleted file mode 100644
index 169106f4..00000000
--- a/include/boost/python/object/make_ptr_instance.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef MAKE_PTR_INSTANCE_DWA200296_HPP
-# define MAKE_PTR_INSTANCE_DWA200296_HPP
-
-# include <boost/python/object/make_instance.hpp>
-# include <boost/python/converter/registry.hpp>
-# include <boost/type_traits/is_polymorphic.hpp>
-# include <boost/get_pointer.hpp>
-# include <typeinfo>
-
-namespace boost { namespace python { namespace objects { 
-
-template <class T, class Holder>
-struct make_ptr_instance
-    : make_instance_impl<T, Holder, make_ptr_instance<T,Holder> >
-{
-    template <class Arg>
-    static inline Holder* construct(void* storage, PyObject*, Arg& x)
-    {
-        return new (storage) Holder(x);
-    }
-    
-    template <class Ptr>
-    static inline PyTypeObject* get_class_object(Ptr const& x)
-    {
-        return get_class_object_impl(get_pointer(x));
-    }
-
- private:
-    template <class U>
-    static inline PyTypeObject* get_class_object_impl(U const volatile* p)
-    {
-		if (p == 0)
-			return 0; // means "return None".
-
-        PyTypeObject* derived = get_derived_class_object(
-            BOOST_DEDUCED_TYPENAME is_polymorphic<U>::type(), p);
-        
-        if (derived)
-            return derived;
-        return converter::registered<T>::converters.get_class_object();
-    }
-    
-    template <class U>
-    static inline PyTypeObject* get_derived_class_object(mpl::true_, U const volatile* x)
-    {
-        converter::registration const* r = converter::registry::query(type_info(typeid(*x)));
-        return r ? r->m_class_object : 0;
-    }
-    
-    template <class U>
-    static inline PyTypeObject* get_derived_class_object(mpl::false_, U* x)
-    {
-# if BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
-        if (typeid(*x) != typeid(U))
-            return get_derived_class_object(mpl::true_(), x);
-# else
-        (void)x;
-# endif 
-        return 0;
-    }
-};
-  
-
-}}} // namespace boost::python::object
-
-#endif // MAKE_PTR_INSTANCE_DWA200296_HPP
diff --git a/include/boost/python/object/pickle_support.hpp b/include/boost/python/object/pickle_support.hpp
deleted file mode 100644
index cf1c5e99..00000000
--- a/include/boost/python/object/pickle_support.hpp
+++ /dev/null
@@ -1,125 +0,0 @@
-//  (C) Copyright R.W. Grosse-Kunstleve 2002.
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies. This
-//  software is provided "as is" without express or implied warranty, and
-//  with no claim as to its suitability for any purpose.
-#ifndef BOOST_PYTHON_OBJECT_PICKLE_SUPPORT_RWGK20020603_HPP
-# define BOOST_PYTHON_OBJECT_PICKLE_SUPPORT_RWGK20020603_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-namespace boost { namespace python {
-
-namespace api
-{
-  class object;
-}
-using api::object;
-class tuple;
-
-BOOST_PYTHON_DECL object const& make_instance_reduce_function();
-
-struct pickle_suite;
-
-namespace error_messages {
-
-  template <class T>
-  struct missing_pickle_suite_function_or_incorrect_signature {};
-
-  inline void must_be_derived_from_pickle_suite(pickle_suite const&) {}
-}
-
-namespace detail { struct pickle_suite_registration; }
-
-struct pickle_suite
-{
-  private:
-    struct inaccessible {};
-    friend struct detail::pickle_suite_registration;
-  public:
-    static inaccessible* getinitargs() { return 0; }
-    static inaccessible* getstate() { return 0; }
-    static inaccessible* setstate() { return 0; }
-    static bool getstate_manages_dict() { return false; }
-};
-
-namespace detail {
-
-  struct pickle_suite_registration
-  {
-    typedef pickle_suite::inaccessible inaccessible;
-
-    template <class Class_, class Tgetinitargs>
-    static
-    void
-    register_(
-      Class_& cl,
-      tuple (*getinitargs_fn)(Tgetinitargs),
-      inaccessible* (*getstate_fn)(),
-      inaccessible* (*setstate_fn)(),
-      bool)
-    {
-      cl.enable_pickling(false);
-      cl.def("__getinitargs__", getinitargs_fn);
-    }
-
-    template <class Class_,
-              class Rgetstate, class Tgetstate,
-              class Tsetstate, class Ttuple>
-    static
-    void
-    register_(
-      Class_& cl,
-      inaccessible* (*getinitargs_fn)(),
-      Rgetstate (*getstate_fn)(Tgetstate),
-      void (*setstate_fn)(Tsetstate, Ttuple),
-      bool getstate_manages_dict)
-    {
-      cl.enable_pickling(getstate_manages_dict);
-      cl.def("__getstate__", getstate_fn);
-      cl.def("__setstate__", setstate_fn);
-    }
-
-    template <class Class_,
-              class Tgetinitargs,
-              class Rgetstate, class Tgetstate,
-              class Tsetstate, class Ttuple>
-    static
-    void
-    register_(
-      Class_& cl,
-      tuple (*getinitargs_fn)(Tgetinitargs),
-      Rgetstate (*getstate_fn)(Tgetstate),
-      void (*setstate_fn)(Tsetstate, Ttuple),
-      bool getstate_manages_dict)
-    {
-      cl.enable_pickling(getstate_manages_dict);
-      cl.def("__getinitargs__", getinitargs_fn);
-      cl.def("__getstate__", getstate_fn);
-      cl.def("__setstate__", setstate_fn);
-    }
-
-    template <class Class_>
-    static
-    void
-    register_(
-      Class_&,
-      ...)
-    {
-      typedef typename
-        error_messages::missing_pickle_suite_function_or_incorrect_signature<
-          Class_>::error_type error_type;
-    }
-  };
-
-  template <typename PickleSuiteType>
-  struct pickle_suite_finalize
-  : PickleSuiteType,
-    pickle_suite_registration
-  {};
-
-} // namespace detail
-
-}} // namespace boost::python
-
-#endif // BOOST_PYTHON_OBJECT_PICKLE_SUPPORT_RWGK20020603_HPP
diff --git a/include/boost/python/object/pointer_holder.hpp b/include/boost/python/object/pointer_holder.hpp
deleted file mode 100644
index cc114925..00000000
--- a/include/boost/python/object/pointer_holder.hpp
+++ /dev/null
@@ -1,180 +0,0 @@
-#if !defined(BOOST_PP_IS_ITERATING)
-
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# ifndef POINTER_HOLDER_DWA20011215_HPP
-#  define POINTER_HOLDER_DWA20011215_HPP 
-
-#  include <boost/type.hpp>
-
-#  include <boost/python/instance_holder.hpp>
-#  include <boost/python/type_id.hpp>
-#  include <boost/python/object/inheritance_query.hpp>
-#  include <boost/python/object/forward.hpp>
-#  include <boost/python/pointee.hpp>
-#  include <boost/python/detail/force_instantiate.hpp>
-#  include <boost/python/detail/preprocessor.hpp>
-
-#  include <boost/mpl/if.hpp>
-#  include <boost/mpl/apply.hpp>
-
-#  include <boost/preprocessor/comma_if.hpp>
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/repeat.hpp>
-#  include <boost/preprocessor/debug/line.hpp>
-#  include <boost/preprocessor/enum_params.hpp>
-#  include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-namespace boost { namespace python { namespace objects {
-
-template <class T>
-bool is_null(T const& p, ...)
-{
-    return p.get() == 0;
-}
-
-template <class T>
-bool is_null(T* p, int)
-{
-    return p == 0;
-}
-
-#  if BOOST_WORKAROUND(__GNUC__, == 2)
-#   define BOOST_PYTHON_UNFORWARD_LOCAL(z, n, _) BOOST_PP_COMMA_IF(n) (typename unforward<A##n>::type)objects::do_unforward(a##n,0)
-#  else
-#   define BOOST_PYTHON_UNFORWARD_LOCAL(z, n, _) BOOST_PP_COMMA_IF(n) objects::do_unforward(a##n,0)
-#  endif 
-
-template <class Pointer, class Value>
-struct pointer_holder : instance_holder
-{
-    typedef Value value_type;
-    
-    pointer_holder(Pointer);
-
-    // Forward construction to the held object
-
-#  define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/object/pointer_holder.hpp>, 1))
-#  include BOOST_PP_ITERATE()
-
- private: // types
-    
- private: // required holder implementation
-    void* holds(type_info);
-
- private: // data members
-    Pointer m_p;
-};
-
-template <class Pointer, class Value>
-struct pointer_holder_back_reference : instance_holder
-{
- private:
-    typedef typename python::pointee<Pointer>::type held_type;
- public:
-    typedef Value value_type;
-
-    // Not sure about this one -- can it work? The source object
-    // undoubtedly does not carry the correct back reference pointer.
-    pointer_holder_back_reference(Pointer);
-
-    // Forward construction to the held object
-#  define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/object/pointer_holder.hpp>, 2))
-#  include BOOST_PP_ITERATE()
-
- private: // required holder implementation
-    void* holds(type_info);
-
- private: // data members
-    Pointer m_p;
-};
-
-#  undef BOOST_PYTHON_UNFORWARD_LOCAL
-
-template <class Pointer, class Value>
-inline pointer_holder<Pointer,Value>::pointer_holder(Pointer p)
-    : m_p(p)
-{
-}
-
-template <class Pointer, class Value>
-inline pointer_holder_back_reference<Pointer,Value>::pointer_holder_back_reference(Pointer p)
-    : m_p(p)
-{
-}
-
-template <class Pointer, class Value>
-void* pointer_holder<Pointer, Value>::holds(type_info dst_t)
-{
-    if (dst_t == python::type_id<Pointer>())
-        return &this->m_p;
-
-    if (objects::is_null(this->m_p, 0))
-        return 0;
-    
-    type_info src_t = python::type_id<Value>();
-    Value* p = &*this->m_p;
-    return src_t == dst_t ? p : find_dynamic_type(p, src_t, dst_t);
-}
-
-template <class Pointer, class Value>
-void* pointer_holder_back_reference<Pointer, Value>::holds(type_info dst_t)
-{
-    if (dst_t == python::type_id<Pointer>())
-        return &this->m_p;
-
-    if (objects::is_null(this->m_p, 0))
-        return 0;
-    
-    if (dst_t == python::type_id<held_type>())
-        return &*this->m_p;
-
-    type_info src_t = python::type_id<Value>();
-    Value* p = &*this->m_p;
-    return src_t == dst_t ? p : find_dynamic_type(p, src_t, dst_t);
-}
-
-}}} // namespace boost::python::objects
-
-# endif // POINTER_HOLDER_DWA20011215_HPP
-
-/* --------------- pointer_holder --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
-# line BOOST_PP_LINE(__LINE__, pointer_holder.hpp)
-
-# define N BOOST_PP_ITERATION()
-
-# if (N != 0)
-    template< BOOST_PP_ENUM_PARAMS_Z(1, N, class A) >
-# endif
-    pointer_holder(PyObject* BOOST_PP_COMMA_IF(N) BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, A, a))
-        : m_p(new Value(
-                BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_UNFORWARD_LOCAL, nil)
-            ))
-    {}
-
-# undef N
-
-/* --------------- pointer_holder_back_reference --------------- */
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 2
-# line BOOST_PP_LINE(__LINE__, pointer_holder.hpp(pointer_holder_back_reference))
-
-# define N BOOST_PP_ITERATION()
-
-# if (N != 0)
-    template < BOOST_PP_ENUM_PARAMS_Z(1, N, class A) >
-# endif
-    pointer_holder_back_reference(
-        PyObject* p BOOST_PP_COMMA_IF(N) BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, A, a))
-        : m_p(new held_type(
-                    p BOOST_PP_COMMA_IF(N) BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_UNFORWARD_LOCAL, nil)
-            ))
-    {}
-
-# undef N
-
-#endif
diff --git a/include/boost/python/object/py_function.hpp b/include/boost/python/object/py_function.hpp
deleted file mode 100644
index fe3bde37..00000000
--- a/include/boost/python/object/py_function.hpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef PY_FUNCTION_DWA200286_HPP
-# define PY_FUNCTION_DWA200286_HPP
-
-# include <boost/python/detail/signature.hpp>
-# include <boost/detail/workaround.hpp>
-# include <boost/mpl/size.hpp>
-# include <memory>
-
-namespace boost { namespace python { namespace objects {
-
-// This type is used as a "generalized Python callback", wrapping the
-// function signature:
-//
-//      PyObject* (PyObject* args, PyObject* keywords)
-
-struct BOOST_PYTHON_DECL py_function_impl_base
-{
-    virtual ~py_function_impl_base();
-    virtual PyObject* operator()(PyObject*, PyObject*) = 0;
-    virtual unsigned min_arity() const = 0;
-    virtual unsigned max_arity() const;
-    virtual python::detail::signature_element const* signature() const = 0;
-};
-
-template <class Caller>
-struct caller_py_function_impl : py_function_impl_base
-{
-    caller_py_function_impl(Caller const& caller)
-        : m_caller(caller)
-    {}
-    
-    PyObject* operator()(PyObject* args, PyObject* kw)
-    {
-        return m_caller(args, kw);
-    }
-    
-    virtual unsigned min_arity() const
-    {
-        return m_caller.min_arity();
-    }
-    
-    virtual python::detail::signature_element const* signature() const
-    {
-        return m_caller.signature();
-    }
-
- private:
-    Caller m_caller;
-};
-
-template <class Caller, class Sig>
-struct signature_py_function_impl : py_function_impl_base
-{
-    signature_py_function_impl(Caller const& caller)
-        : m_caller(caller)
-    {}
-    
-    PyObject* operator()(PyObject* args, PyObject* kw)
-    {
-        return m_caller(args, kw);
-    }
-    
-    virtual unsigned min_arity() const
-    {
-        return mpl::size<Sig>::value - 1;
-    }
-    
-    virtual python::detail::signature_element const* signature() const
-    {
-        return python::detail::signature<Sig>::elements();
-    }
-
- private:
-    Caller m_caller;
-};
-
-template <class Caller, class Sig>
-struct full_py_function_impl : py_function_impl_base
-{
-    full_py_function_impl(Caller const& caller, unsigned min_arity, unsigned max_arity)
-      : m_caller(caller)
-      , m_min_arity(min_arity)
-      , m_max_arity(max_arity > min_arity ? max_arity : min_arity)
-    {}
-    
-    PyObject* operator()(PyObject* args, PyObject* kw)
-    {
-        return m_caller(args, kw);
-    }
-    
-    virtual unsigned min_arity() const
-    {
-        return m_min_arity;
-    }
-    
-    virtual unsigned max_arity() const
-    {
-        return m_max_arity;
-    }
-    
-    virtual python::detail::signature_element const* signature() const
-    {
-        return python::detail::signature<Sig>::elements();
-    }
-
- private:
-    Caller m_caller;
-    unsigned m_min_arity;
-    unsigned m_max_arity;
-};
-
-struct py_function
-{
-    template <class Caller>
-    py_function(Caller const& caller)
-        : m_impl(new caller_py_function_impl<Caller>(caller))
-    {}
-
-    template <class Caller, class Sig>
-    py_function(Caller const& caller, Sig)
-      : m_impl(new signature_py_function_impl<Caller, Sig>(caller))
-    {}
-
-    template <class Caller, class Sig>
-    py_function(Caller const& caller, Sig, int min_arity, int max_arity = 0)
-      : m_impl(new full_py_function_impl<Caller, Sig>(caller, min_arity, max_arity))
-    {}
-
-    py_function(py_function const& rhs)
-        : m_impl(rhs.m_impl)
-    {}
-
-    PyObject* operator()(PyObject* args, PyObject* kw) const
-    {
-        return (*m_impl)(args, kw);
-    }
-
-    unsigned min_arity() const
-    {
-        return m_impl->min_arity();
-    }
-    
-    unsigned max_arity() const
-    {
-        return m_impl->max_arity();
-    }
-
-    python::detail::signature_element const* signature() const
-    {
-        return m_impl->signature();
-    }
-    
- private:
-    mutable std::auto_ptr<py_function_impl_base> m_impl;
-};
-
-}}} // namespace boost::python::objects
-
-#endif // PY_FUNCTION_DWA200286_HPP
diff --git a/include/boost/python/object/select_holder.hpp b/include/boost/python/object/select_holder.hpp
deleted file mode 100644
index 11a8c09a..00000000
--- a/include/boost/python/object/select_holder.hpp
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef SELECT_HOLDER_DWA2002322_HPP
-# define SELECT_HOLDER_DWA2002322_HPP
-
-# include <boost/python/has_back_reference.hpp>
-# include <boost/python/detail/not_specified.hpp>
-# include <boost/python/pointee.hpp>
-# include <boost/python/object/value_holder.hpp>
-# include <boost/python/object/pointer_holder.hpp>
-# include <boost/python/object/class_wrapper.hpp>
-# include <boost/python/object/make_ptr_instance.hpp>
-# include <boost/python/object/instance.hpp>
-# include <boost/python/detail/force_instantiate.hpp>
-
-# include <boost/type.hpp>
-
-# include <boost/mpl/bool.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/mpl/or.hpp>
-# include <boost/mpl/not.hpp>
-
-# include <boost/type_traits/same_traits.hpp>
-# include <boost/type_traits/is_base_and_derived.hpp>
-# include <boost/type_traits/alignment_traits.hpp>
-
-# include <cstddef>
-
-namespace boost { namespace python { namespace objects {
-
-namespace detail
-{
-
-  // check_default_constructible --
-  //
-  // Used to give a clean error message when the user doesn't specify
-  // any __init__ functions, but when the class being wrapped doesn't
-  // have an appropriate default constructor (or if
-  // has_back_reference<T> is true, a constructor taking PyObject*).
-  
-  // A helpful compile-time assertion which gives a reasonable error
-  // message if T can't be default-constructed.
-  template <class T>
-  static int specify_init_arguments_or_no_init_for_class_(T const&);
-
-  // U is expected to take an initial hidden PyObject* in its
-  // constructor. Normally this means U is a virtual function
-  // dispatcher subclass for T.
-  template <class T, class U>
-  void check_default_constructible(T*, U*, mpl::true_)
-  {
-      python::detail::force_instantiate(
-          sizeof(specify_init_arguments_or_no_init_for_class_<T>(U((::PyObject*)0)))
-          );
-  }
-
-  // Handles the "normal" case where T is held directly and
-  // has_back_reference<T> is not specialized.
-  template <class T>
-  void check_default_constructible(T*, T*, mpl::false_)
-  {
-      python::detail::force_instantiate(
-          sizeof(specify_init_arguments_or_no_init_for_class_<T>(T()))
-          );
-  }
-
-  //
-  // select_value_holder/select_pointer_holder --
-  //
-  //   An instantiation of one of these data-free class templates is
-  //   returned by select_holder::execute(), below.  Each provides the
-  //   following public interface:
-  //
-  //    static void assert_default_constructible() -- called when no
-  //    init<...> arguments are specified in class_<T, ...>'s
-  //    constructor; causes a compile-time error when T has no
-  //    corresponding default constructor.
-  //
-  //    typedef ... type -- the class derived from instance_holder
-  //    which will manage a Held object in Python class instances
-  //
-  //    static type* get() { return 0; } -- just a way to access the
-  //    computed type at runtime.
-  //
-  //    static void register_() -- forces registration of any
-  //    to_python converters corresponding to Held.
-  
-  template <class T, class Held>
-  struct select_value_holder
-  {
-   private:
-      typedef mpl::or_<
-          mpl::not_<is_same<T,Held> >
-        , has_back_reference<T>
-      > use_back_ref;
-  
-   public:
-      static void assert_default_constructible()
-      {
-          detail::check_default_constructible((T*)0,(Held*)0, use_back_ref());
-      }
-  
-      typedef typename mpl::if_<
-          use_back_ref
-        , value_holder_back_reference<T,Held>
-        , value_holder<T>
-      >::type type;
-
-      typedef Held held_type;
-      
-      static inline void register_() {}
-
-      static type* get() { return 0; }
-  };
-
-  template <class T,class Ptr>
-  struct select_pointer_holder
-  {
-   private:
-      typedef typename python::pointee<Ptr>::type wrapper;
-      typedef mpl::or_<
-          mpl::not_<is_same<T,wrapper> >
-        , has_back_reference<T>
-      > use_back_ref;
-
-   public:
-      static void assert_default_constructible()
-      {
-          detail::check_default_constructible((T*)0,(wrapper*)0, use_back_ref());
-      }
-  
-      typedef typename mpl::if_<
-            use_back_ref
-          , pointer_holder_back_reference<Ptr,T>
-          , pointer_holder<Ptr,T>
-      >::type type;
-      
-      typedef typename pointee<Ptr>::type held_type;
-      
-      static inline void register_()
-      {
-          select_pointer_holder::register_(use_back_ref());
-      }
-
-      static type* get() { return 0; }
-      
-   private:
-      static inline void register_(mpl::true_)
-      {
-      }
-
-      struct construct_from_pointer
-      {
-          static type* execute(PyObject*, Ptr x)
-          {
-              return new type(x);
-          }
-      };
-      
-      static inline void register_(mpl::false_)
-      {
-          python::detail::force_instantiate(
-              objects::class_value_wrapper<Ptr, make_ptr_instance<T,type> >());
-      }
-  };
-}
-
-//    select_holder<T,Held>::execute((Held*)0)
-//
-// Returns an instantiation of
-// detail::select_value_holder or detail::select_pointer_holder, as
-// appropriate for class_<T,Held>
-template <class T, class Held>
-struct select_holder
-  : mpl::if_<
-        is_same<Held, python::detail::not_specified>
-      , detail::select_value_holder<T,T>
-      , typename mpl::if_<
-            mpl::or_<
-                is_same<T,Held>
-              , is_base_and_derived<T, Held>
-            >
-          , detail::select_value_holder<T,Held>
-          , detail::select_pointer_holder<T, Held>
-        >::type
-    >::type
-{
-};
-
-}}} // namespace boost::python::objects
-
-#endif // SELECT_HOLDER_DWA2002322_HPP
diff --git a/include/boost/python/object/value_holder.hpp b/include/boost/python/object/value_holder.hpp
deleted file mode 100644
index 89e52352..00000000
--- a/include/boost/python/object/value_holder.hpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#if !defined(BOOST_PP_IS_ITERATING)
-
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# ifndef VALUE_HOLDER_DWA20011215_HPP
-#  define VALUE_HOLDER_DWA20011215_HPP 
-
-#  include <boost/python/object/value_holder_fwd.hpp>
-
-#  include <boost/python/instance_holder.hpp>
-#  include <boost/python/type_id.hpp>
-
-#  include <boost/python/object/inheritance_query.hpp>
-#  include <boost/python/object/forward.hpp>
-
-#  include <boost/python/detail/force_instantiate.hpp>
-#  include <boost/python/detail/preprocessor.hpp>
-
-#  include <boost/preprocessor/comma_if.hpp>
-#  include <boost/preprocessor/enum_params.hpp>
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/preprocessor/repeat.hpp>
-#  include <boost/preprocessor/debug/line.hpp>
-
-#  include <boost/preprocessor/repetition/enum_params.hpp>
-#  include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-#  if BOOST_WORKAROUND(__GNUC__, == 2)
-#   define BOOST_PYTHON_UNFORWARD_LOCAL(z, n, _) BOOST_PP_COMMA_IF(n) (typename unforward<A##n>::type)objects::do_unforward(a##n,0)
-#  else
-#   define BOOST_PYTHON_UNFORWARD_LOCAL(z, n, _) BOOST_PP_COMMA_IF(n) objects::do_unforward(a##n,0)
-#  endif 
-
-template <class Value>
-struct value_holder : instance_holder
-{
-    typedef Value held_type;
-    typedef Value value_type;
-
-    // Forward construction to the held object
-#  define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/object/value_holder.hpp>, 1))
-#  include BOOST_PP_ITERATE()
-
- private: // required holder implementation
-    void* holds(type_info);
-
- private: // data members
-    Value m_held;
-};
-
-template <class Value, class Held>
-struct value_holder_back_reference : instance_holder
-{
-    typedef Held held_type;
-    typedef Value value_type;
-    
-    // Forward construction to the held object
-#  define BOOST_PP_ITERATION_PARAMS_1 (4, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/object/value_holder.hpp>, 2))
-#  include BOOST_PP_ITERATE()
-
-private: // required holder implementation
-    void* holds(type_info);
-
- private: // data members
-    Held m_held;
-};
-
-#  undef BOOST_PYTHON_UNFORWARD_LOCAL
-
-template <class Value>
-void* value_holder<Value>::holds(type_info dst_t)
-{
-    type_info src_t = python::type_id<Value>();
-    return src_t == dst_t ? &m_held
-        : find_static_type(&m_held, src_t, dst_t);
-}
-
-template <class Value, class Held>
-void* value_holder_back_reference<Value,Held>::holds(
-    type_info dst_t)
-{
-    type_info src_t = python::type_id<Value>();
-    Value* x = &m_held;
-    
-    if (dst_t == src_t)
-        return x;
-    else if (dst_t == python::type_id<Held>())
-        return &m_held;
-    else
-        return find_static_type(x, src_t, dst_t);
-}
-
-}}} // namespace boost::python::objects
-
-# endif // VALUE_HOLDER_DWA20011215_HPP
-
-// --------------- value_holder ---------------
-
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 1
-# line BOOST_PP_LINE(__LINE__, value_holder.hpp(value_holder))
-
-# define N BOOST_PP_ITERATION()
-
-# if (N != 0)
-    template <BOOST_PP_ENUM_PARAMS_Z(1, N, class A)>
-# endif
-    value_holder(
-      PyObject* BOOST_PP_COMMA_IF(N) BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, A, a))
-        : m_held(
-            BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_UNFORWARD_LOCAL, nil)
-            )
-    {}
-
-# undef N
-
-// --------------- value_holder_back_reference ---------------
-
-#elif BOOST_PP_ITERATION_DEPTH() == 1 && BOOST_PP_ITERATION_FLAGS() == 2
-# line BOOST_PP_LINE(__LINE__, value_holder.hpp(value_holder_back_reference))
-
-# define N BOOST_PP_ITERATION()
-
-# if (N != 0)
-    template <BOOST_PP_ENUM_PARAMS_Z(1, N, class A)>
-# endif
-    value_holder_back_reference(
-        PyObject* p BOOST_PP_COMMA_IF(N) BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, A, a))
-        : m_held(
-            p BOOST_PP_COMMA_IF(N)
-            BOOST_PP_REPEAT_1ST(N, BOOST_PYTHON_UNFORWARD_LOCAL, nil)
-            )
-    {
-    }
-
-# undef N
-
-#endif
diff --git a/include/boost/python/object/value_holder_fwd.hpp b/include/boost/python/object/value_holder_fwd.hpp
deleted file mode 100644
index 6cb2a0f5..00000000
--- a/include/boost/python/object/value_holder_fwd.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef VALUE_HOLDER_FWD_DWA2002311_HPP
-# define VALUE_HOLDER_FWD_DWA2002311_HPP
-
-namespace boost { namespace python { namespace objects { 
-
-struct no_back_reference;
-
-template <class CallbackType = no_back_reference> struct value_holder_generator;
-
-}}} // namespace boost::python::object
-
-#endif // VALUE_HOLDER_FWD_DWA2002311_HPP
diff --git a/include/boost/python/object_attributes.hpp b/include/boost/python/object_attributes.hpp
deleted file mode 100755
index 56609037..00000000
--- a/include/boost/python/object_attributes.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJECT_ATTRIBUTES_DWA2002615_HPP
-# define OBJECT_ATTRIBUTES_DWA2002615_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/proxy.hpp>
-# include <boost/python/object_core.hpp>
-# include <boost/python/object_protocol.hpp>
-
-namespace boost { namespace python { namespace api {
-
-struct const_attribute_policies
-{
-    typedef char const* key_type;
-    static object get(object const& target, char const* key);
-};
-  
-struct attribute_policies : const_attribute_policies
-{
-    static object const& set(object const& target, char const* key, object const& value);
-    static void del(object const&target, char const* key);
-};
-
-//
-// implementation
-//
-template <class U>
-inline object_attribute object_operators<U>::attr(char const* name)
-{
-    object_cref2 x = *static_cast<U*>(this);
-    return object_attribute(x, name);
-}
-
-template <class U>
-inline const_object_attribute object_operators<U>::attr(char const* name) const
-{
-    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_attribute(x, name);
-}
-
-inline object const_attribute_policies::get(object const& target, char const* key)
-{
-    return python::getattr(target, key);
-}
-
-inline object const& attribute_policies::set(
-    object const& target
-    , char const* key
-    , object const& value)
-{
-    python::setattr(target, key, value);
-    return value;
-}
-
-inline void attribute_policies::del(
-    object const& target
-    , char const* key)
-{
-    python::delattr(target, key);
-}
-
-}}} // namespace boost::python::api
-
-#endif // OBJECT_ATTRIBUTES_DWA2002615_HPP
diff --git a/include/boost/python/object_call.hpp b/include/boost/python/object_call.hpp
deleted file mode 100644
index dd0c0dc0..00000000
--- a/include/boost/python/object_call.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-# if !defined(BOOST_PYTHON_SYNOPSIS)
-# // Copyright David Abrahams 2002. Permission to copy, use,
-# // modify, sell and distribute this software is granted provided this
-# // copyright notice appears in all copies. This software is provided
-# // "as is" without express or implied warranty, and with no claim as
-# // to its suitability for any purpose.
-
-#  if !defined(BOOST_PP_IS_ITERATING)
-#   error Boost.Python - do not include this file!
-#  endif
-
-#  define N BOOST_PP_ITERATION()
-
-    template <BOOST_PP_ENUM_PARAMS_Z(1, N, class A)>
-    typename detail::dependent<object, A0>::type
-    operator()(BOOST_PP_ENUM_BINARY_PARAMS_Z(1, N, A, const& a)) const
-    {
-        typedef typename detail::dependent<object, A0>::type obj;
-        U const& self = *static_cast<U const*>(this);
-        return call<obj>(get_managed_object(self, tag), BOOST_PP_ENUM_PARAMS_Z(1, N, a));
-    }
-
-#  undef N
-# endif // BOOST_PYTHON_SYNOPSIS 
diff --git a/include/boost/python/object_core.hpp b/include/boost/python/object_core.hpp
deleted file mode 100755
index eb59c52c..00000000
--- a/include/boost/python/object_core.hpp
+++ /dev/null
@@ -1,471 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJECT_CORE_DWA2002615_HPP
-# define OBJECT_CORE_DWA2002615_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/type.hpp>
-
-# include <boost/python/call.hpp>
-# include <boost/python/handle_fwd.hpp>
-# include <boost/python/errors.hpp>
-# include <boost/python/slice_nil.hpp>
-# include <boost/python/refcount.hpp>
-# include <boost/python/detail/preprocessor.hpp>
-# include <boost/python/tag.hpp>
-# include <boost/python/def_visitor.hpp>
-
-# include <boost/python/detail/raw_pyobject.hpp>
-# include <boost/python/detail/dependent.hpp>
-
-# include <boost/python/object/forward.hpp>
-# include <boost/python/object/add_to_namespace.hpp>
-
-# include <boost/preprocessor/iterate.hpp>
-# include <boost/preprocessor/debug/line.hpp>
-
-# include <boost/python/detail/is_xxx.hpp>
-# include <boost/python/detail/string_literal.hpp>
-# include <boost/python/detail/def_helper_fwd.hpp>
-
-# include <boost/type_traits/is_same.hpp>
-# include <boost/type_traits/is_convertible.hpp>
-# include <boost/type_traits/remove_reference.hpp>
-
-# if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-#  include <boost/type_traits/add_pointer.hpp>
-# endif
-
-namespace boost { namespace python { 
-
-namespace converter
-{
-  template <class T> struct arg_to_python;
-}
-
-// Put this in an inner namespace so that the generalized operators won't take over
-namespace api
-{
-  
-// This file contains the definition of the object class and enough to
-// construct/copy it, but not enough to do operations like
-// attribute/item access or addition.
-
-  template <class Policies> class proxy;
-  
-  struct const_attribute_policies;
-  struct attribute_policies;
-  struct const_item_policies;
-  struct item_policies;
-  struct const_slice_policies;
-  struct slice_policies;
-
-  typedef proxy<const_attribute_policies> const_object_attribute;
-  typedef proxy<attribute_policies> object_attribute;
-  typedef proxy<const_item_policies> const_object_item;
-  typedef proxy<item_policies> object_item;
-  typedef proxy<const_slice_policies> const_object_slice;
-  typedef proxy<slice_policies> object_slice;
-
-  //
-  // is_proxy -- proxy type detection
-  //
-  BOOST_PYTHON_IS_XXX_DEF(proxy, boost::python::api::proxy, 1)
-
-  template <class T> struct object_initializer;
-  
-  class object;
-  typedef PyObject* (object::*bool_type)() const;
-  
-  template <class U>
-  class object_operators : public def_visitor<U>
-  {
-   protected:
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1200
-      typedef object const& object_cref;
-# else 
-      typedef object object_cref;
-# endif
-   public:
-      // function call
-      //
-      object operator()() const;
-
-# define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PYTHON_MAX_ARITY, <boost/python/object_call.hpp>))
-# include BOOST_PP_ITERATE()
-
-      // truth value testing
-      //
-      operator bool_type() const;
-      bool operator!() const; // needed for vc6
-
-      // Attribute access
-      //
-      const_object_attribute attr(char const*) const;
-      object_attribute attr(char const*);
-
-      // item access
-      //
-      const_object_item operator[](object_cref) const;
-      object_item operator[](object_cref);
-    
-      template <class T>
-      const_object_item
-      operator[](T const& key) const
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-          ;
-# else 
-      {
-          return (*this)[object(key)];
-      }
-# endif 
-    
-      template <class T>
-      object_item
-      operator[](T const& key)
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-          ;
-# else 
-      {
-          return (*this)[object(key)];
-      }
-# endif
-
-      // slicing
-      //
-      const_object_slice slice(object_cref, object_cref) const;
-      object_slice slice(object_cref, object_cref);
-
-      const_object_slice slice(slice_nil, object_cref) const;
-      object_slice slice(slice_nil, object_cref);
-                             
-      const_object_slice slice(object_cref, slice_nil) const;
-      object_slice slice(object_cref, slice_nil);
-
-      template <class T, class V>
-      const_object_slice
-      slice(T const& start, V const& end) const
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-          ;
-# else
-      {
-          return this->slice(
-               slice_bound<T>::type(start)
-              ,  slice_bound<V>::type(end));
-      }
-# endif
-    
-      template <class T, class V>
-      object_slice
-      slice(T const& start, V const& end)
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-          ;
-# else
-      {
-          return this->slice(
-              slice_bound<T>::type(start)
-              , slice_bound<V>::type(end));
-      }
-# endif
-      
-   private: // def visitation for adding callable objects as class methods
-      template <class ClassT, class DocStringT>
-      void visit(ClassT& cl, char const* name, python::detail::def_helper<DocStringT> const& helper) const
-      {
-          // It's too late to specify anything other than docstrings if
-          // the callable object is already wrapped.
-          BOOST_STATIC_ASSERT(
-              (is_same<char const*,DocStringT>::value
-               || detail::is_string_literal<DocStringT>::value));
-        
-          objects::add_to_namespace(cl, name, this->derived_visitor(), helper.doc());
-      }
-
-      friend class python::def_visitor_access;
-      
-   private:
-     // there is a confirmed CWPro8 codegen bug here. We prevent the
-     // early destruction of a temporary by binding a named object
-     // instead.
-# if __MWERKS__ < 0x3000 || __MWERKS__ > 0x3003
-    typedef object const& object_cref2;
-# else
-    typedef object const object_cref2;
-# endif
-  };
-
-  
-  // VC6 and VC7 require this base class in order to generate the
-  // correct copy constructor for object. We can't define it there
-  // explicitly or it will complain of ambiguity.
-  struct object_base : object_operators<object>
-  {
-      // copy constructor without NULL checking, for efficiency. 
-      inline object_base(object_base const&);
-      inline object_base(PyObject* ptr);
-      
-      object_base& operator=(object_base const& rhs);
-      ~object_base();
-        
-      // Underlying object access -- returns a borrowed reference
-      PyObject* ptr() const;
-      
-   private:
-      PyObject* m_ptr;
-  };
-
-# ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-  template <class T, class U>
-  struct is_derived_impl
-  {
-      static T x;
-      template <class X>
-      static X* to_pointer(X const&);
-      
-      static char test(U const*);
-      typedef char (&no)[2];
-      static no test(...);
-
-      BOOST_STATIC_CONSTANT(bool, value = sizeof(test(to_pointer(x))) == 1);
-  };
-  
-  template <class T, class U>
-  struct is_derived
-    : mpl::bool_<is_derived_impl<T,U>::value>
-  {};
-# else
-  template <class T, class U>
-  struct is_derived
-    : is_convertible<
-          typename remove_reference<T>::type*
-        , U const*
-      >
-  {};
-# endif 
-
-  template <class T>
-  typename objects::unforward_cref<T>::type do_unforward_cref(T const& x)
-  {
-# if BOOST_WORKAROUND(__GNUC__, == 2)
-      typedef typename objects::unforward_cref<T>::type ret;
-      return ret(x);
-# else
-      return x;
-# endif 
-  }
-
-# if BOOST_WORKAROUND(__GNUC__, == 2)
-  // GCC 2.x has non-const string literals; this hacks around that problem.
-  template <unsigned N>
-  char const (& do_unforward_cref(char const(&x)[N]) )[N]
-  {
-      return x;
-  }
-# endif
-  
-  class object;
-  
-  template <class T>
-  PyObject* object_base_initializer(T const& x)
-  {
-      typedef typename is_derived<
-          BOOST_DEDUCED_TYPENAME objects::unforward_cref<T>::type
-        , object
-      >::type is_obj;
-
-      return object_initializer<
-          BOOST_DEDUCED_TYPENAME unwrap_reference<T>::type
-      >::get(
-            x
-          , is_obj()
-      );
-  }
-  
-  class object : public object_base
-  {
-   public:
-      // default constructor creates a None object
-      object();
-      
-      // explicit conversion from any C++ object to Python
-      template <class T>
-      explicit object(T const& x)
-        : object_base(object_base_initializer(x))
-      {
-      }
-
-      // Throw error_already_set() if the handle is null.
-      BOOST_PYTHON_DECL explicit object(handle<> const&);
-   private:
-      
-   public: // implementation detail -- for internal use only
-      explicit object(detail::borrowed_reference);
-      explicit object(detail::new_reference);
-      explicit object(detail::new_non_null_reference);
-  };
-
-  // Macros for forwarding constructors in classes derived from
-  // object. Derived classes will usually want these as an
-  // implementation detail
-# define BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS_(derived, base)       \
-    inline explicit derived(python::detail::borrowed_reference p)       \
-        : base(p) {}                                                    \
-    inline explicit derived(python::detail::new_reference p)            \
-        : base(p) {}                                                    \
-    inline explicit derived(python::detail::new_non_null_reference p)   \
-        : base(p) {}
-
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1200
-#  define BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS_
-# else
-  // MSVC6 has a bug which causes an explicit template constructor to
-  // be preferred over an appropriate implicit conversion operator
-  // declared on the argument type. Normally, that would cause a
-  // runtime failure when using extract<T> to extract a type with a
-  // templated constructor. This additional constructor will turn that
-  // runtime failure into an ambiguity error at compile-time due to
-  // the lack of partial ordering, or at least a link-time error if no
-  // generalized template constructor is declared.
-#  define BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(derived, base)       \
-    BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS_(derived, base)            \
-    template <class T>                                                  \
-    explicit derived(extract<T> const&);
-# endif
-
-  //
-  // object_initializer -- get the handle to construct the object with,
-  // based on whether T is a proxy or derived from object
-  //
-  template <bool is_proxy = false, bool is_object_manager = false>
-  struct object_initializer_impl
-  {
-      static PyObject*
-      get(object const& x, mpl::true_)
-      {
-          return python::incref(x.ptr());
-      }
-      
-      template <class T>
-      static PyObject*
-      get(T const& x, mpl::false_)
-      {
-          return python::incref(converter::arg_to_python<T>(x).get());
-      }
-  };
-      
-  template <>
-  struct object_initializer_impl<true, false>
-  {
-      template <class Policies>
-      static PyObject* 
-      get(proxy<Policies> const& x, mpl::false_)
-      {
-          return python::incref(x.operator object().ptr());
-      }
-  };
-
-  template <>
-  struct object_initializer_impl<false, true>
-  {
-      template <class T>
-      static PyObject*
-      get(T const& x, ...)
-      {
-          return python::incref(get_managed_object(x, tag));
-      }
-  };
-
-  template <>
-  struct object_initializer_impl<true, true>
-  {}; // empty implementation should cause an error
-
-  template <class T>
-  struct object_initializer : object_initializer_impl<
-      is_proxy<T>::value
-    , converter::is_object_manager<T>::value
-  >
-  {};
-
-}
-using api::object;
-template <class T> struct extract;
-
-//
-// implementation
-//
-
-inline object::object()
-    : object_base(python::incref(Py_None))
-{}
-
-// copy constructor without NULL checking, for efficiency
-inline api::object_base::object_base(object_base const& rhs)
-    : m_ptr(python::incref(rhs.m_ptr))
-{}
-
-inline api::object_base::object_base(PyObject* p)
-    : m_ptr(p)
-{}
-
-inline api::object_base& api::object_base::operator=(api::object_base const& rhs)
-{
-    Py_INCREF(rhs.m_ptr);
-    Py_DECREF(this->m_ptr);
-    this->m_ptr = rhs.m_ptr;
-    return *this;
-}
-
-inline api::object_base::~object_base()
-{
-    Py_DECREF(m_ptr);
-}
-
-inline object::object(detail::borrowed_reference p)
-    : object_base(python::incref((PyObject*)p))
-{}
-
-inline object::object(detail::new_reference p)
-    : object_base(expect_non_null((PyObject*)p))
-{}
-
-inline object::object(detail::new_non_null_reference p)
-    : object_base((PyObject*)p)
-{}
-
-inline PyObject* api::object_base::ptr() const
-{
-    return m_ptr;
-}
-
-//
-// Converter specialization implementations
-//
-namespace converter
-{
-  template <class T> struct object_manager_traits;
-  
-  template <>
-  struct object_manager_traits<object>
-  {
-      BOOST_STATIC_CONSTANT(bool, is_specialized = true);
-      static bool check(PyObject*) { return true; }
-      
-      static python::detail::new_non_null_reference adopt(PyObject* x)
-      {
-          return python::detail::new_non_null_reference(x);
-      }
-  };
-}
-
-inline PyObject* get_managed_object(object const& x, tag_t)
-{
-    return x.ptr();
-}
-
-}} // namespace boost::python
-
-#endif // OBJECT_CORE_DWA2002615_HPP
diff --git a/include/boost/python/object_fwd.hpp b/include/boost/python/object_fwd.hpp
deleted file mode 100644
index 5ac0c4d0..00000000
--- a/include/boost/python/object_fwd.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJECT_FWD_DWA2002724_HPP
-# define OBJECT_FWD_DWA2002724_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-namespace boost { namespace python { 
-namespace api
-{
-  class object;
-}
-using api::object;
-}} // namespace boost::python
-
-#endif // OBJECT_FWD_DWA2002724_HPP
diff --git a/include/boost/python/object_items.hpp b/include/boost/python/object_items.hpp
deleted file mode 100755
index c3ea1735..00000000
--- a/include/boost/python/object_items.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJECT_ITEMS_DWA2002615_HPP
-# define OBJECT_ITEMS_DWA2002615_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/proxy.hpp>
-# include <boost/python/object_core.hpp>
-# include <boost/python/object_protocol.hpp>
-
-namespace boost { namespace python { namespace api {
-
-struct const_item_policies
-{
-    typedef object key_type;
-    static object get(object const& target, object const& key);
-};
-  
-struct item_policies : const_item_policies
-{
-    static object const& set(object const& target, object const& key, object const& value);
-    static void del(object const& target, object const& key);
-};
-
-//
-// implementation
-//
-template <class U>
-inline object_item
-object_operators<U>::operator[](object_cref key)
-{
-    object_cref2 x = *static_cast<U*>(this);
-    return object_item(x, key);
-}
-
-template <class U>
-inline const_object_item
-object_operators<U>::operator[](object_cref key) const
-{
-    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_item(x, key);
-}
-
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-template <class U>
-template <class T>
-inline const_object_item
-object_operators<U>::operator[](T const& key) const
-{
-    return (*this)[object(key)];
-}
-
-template <class U>
-template <class T>
-inline object_item
-object_operators<U>::operator[](T const& key)
-{
-    return (*this)[object(key)];
-}
-# endif 
-
-
-inline object const_item_policies::get(object const& target, object const& key)
-{
-    return getitem(target, key);
-}
-
-inline object const& item_policies::set(
-    object const& target
-    , object const& key
-    , object const& value)
-{
-    setitem(target, key, value);
-    return value;
-}
-
-inline void item_policies::del(
-    object const& target
-    , object const& key)
-{
-    delitem(target, key);
-}
-
-}}} // namespace boost::python::api
-
-#endif // OBJECT_ITEMS_DWA2002615_HPP
diff --git a/include/boost/python/object_operators.hpp b/include/boost/python/object_operators.hpp
deleted file mode 100644
index 358b0b76..00000000
--- a/include/boost/python/object_operators.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJECT_OPERATORS_DWA2002617_HPP
-# define OBJECT_OPERATORS_DWA2002617_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/object_core.hpp>
-# include <boost/python/call.hpp>
-# include <boost/iterator/detail/enable_if.hpp>
-# include <boost/mpl/bool.hpp>
-
-# include <boost/iterator/detail/config_def.hpp>
-
-namespace boost { namespace python { namespace api {
-
-# if !defined(BOOST_NO_SFINAE) && !defined(BOOST_NO_IS_CONVERTIBLE)
-
-template <class X>
-char is_object_operators_helper(object_operators<X> const*);
-    
-typedef char (&no_type)[2];
-no_type is_object_operators_helper(...);
-
-template <class X> X* make_ptr();
-
-template <class L, class R>
-struct is_object_operators
-{
-    enum {
-        value 
-        = (sizeof(api::is_object_operators_helper(api::make_ptr<L>()))
-           + sizeof(api::is_object_operators_helper(api::make_ptr<R>()))
-           < 4
-        )
-    };
-    typedef mpl::bool_<value> type;
-};
-
-template <class L, class R, class T>
-struct enable_binary
-  : boost::iterators::enable_if<is_object_operators<L,R>, T>
-{};
-#  define BOOST_PYTHON_BINARY_RETURN(T) typename enable_binary<L,R,T>::type
-# else
-#  define BOOST_PYTHON_BINARY_RETURN(T) T
-# endif
-
-template <class U>
-object object_operators<U>::operator()() const
-{
-    object_cref2 f = *static_cast<U const*>(this);
-    return call<object>(f.ptr());
-}
-
-
-template <class U>
-inline
-object_operators<U>::operator bool_type() const
-{
-    object_cref2 x = *static_cast<U const*>(this);
-    return PyObject_IsTrue(x.ptr()) ? &object::ptr : 0;
-}
-
-template <class U>
-inline bool
-object_operators<U>::operator!() const
-{
-    object_cref2 x = *static_cast<U const*>(this);
-    return !PyObject_IsTrue(x.ptr());
-}
-
-# define BOOST_PYTHON_COMPARE_OP(op, opid)                              \
-template <class L, class R>                                             \
-BOOST_PYTHON_BINARY_RETURN(bool) operator op(L const& l, R const& r)    \
-{                                                                       \
-    return PyObject_RichCompareBool(                                    \
-        object(l).ptr(), object(r).ptr(), opid);                        \
-}
-BOOST_PYTHON_COMPARE_OP(>, Py_GT)
-BOOST_PYTHON_COMPARE_OP(>=, Py_GE)
-BOOST_PYTHON_COMPARE_OP(<, Py_LT)
-BOOST_PYTHON_COMPARE_OP(<=, Py_LE)
-BOOST_PYTHON_COMPARE_OP(==, Py_EQ)
-BOOST_PYTHON_COMPARE_OP(!=, Py_NE)
-# undef BOOST_PYTHON_COMPARE_OP
-    
-# define BOOST_PYTHON_BINARY_OPERATOR(op)                               \
-BOOST_PYTHON_DECL object operator op(object const& l, object const& r); \
-template <class L, class R>                                             \
-BOOST_PYTHON_BINARY_RETURN(object) operator op(L const& l, R const& r)  \
-{                                                                       \
-    return object(l) op object(r);                                      \
-}
-BOOST_PYTHON_BINARY_OPERATOR(+)
-BOOST_PYTHON_BINARY_OPERATOR(-)
-BOOST_PYTHON_BINARY_OPERATOR(*)
-BOOST_PYTHON_BINARY_OPERATOR(/)
-BOOST_PYTHON_BINARY_OPERATOR(%)
-BOOST_PYTHON_BINARY_OPERATOR(<<)
-BOOST_PYTHON_BINARY_OPERATOR(>>)
-BOOST_PYTHON_BINARY_OPERATOR(&)
-BOOST_PYTHON_BINARY_OPERATOR(^)
-BOOST_PYTHON_BINARY_OPERATOR(|)
-# undef BOOST_PYTHON_BINARY_OPERATOR
-
-        
-# define BOOST_PYTHON_INPLACE_OPERATOR(op)                              \
-BOOST_PYTHON_DECL object& operator op(object& l, object const& r);      \
-template <class R>                                                      \
-object& operator op(object& l, R const& r)                              \
-{                                                                       \
-    return l op object(r);                                              \
-}
-BOOST_PYTHON_INPLACE_OPERATOR(+=)
-BOOST_PYTHON_INPLACE_OPERATOR(-=)
-BOOST_PYTHON_INPLACE_OPERATOR(*=)
-BOOST_PYTHON_INPLACE_OPERATOR(/=)
-BOOST_PYTHON_INPLACE_OPERATOR(%=)
-BOOST_PYTHON_INPLACE_OPERATOR(<<=)
-BOOST_PYTHON_INPLACE_OPERATOR(>>=)
-BOOST_PYTHON_INPLACE_OPERATOR(&=)
-BOOST_PYTHON_INPLACE_OPERATOR(^=)
-BOOST_PYTHON_INPLACE_OPERATOR(|=)
-# undef BOOST_PYTHON_INPLACE_OPERATOR
-
-}}} // namespace boost::python
-
-#include <boost/iterator/detail/config_undef.hpp>
-
-#endif // OBJECT_OPERATORS_DWA2002617_HPP
diff --git a/include/boost/python/object_protocol.hpp b/include/boost/python/object_protocol.hpp
deleted file mode 100755
index 9e31c1b5..00000000
--- a/include/boost/python/object_protocol.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJECT_PROTOCOL_DWA2002615_HPP
-# define OBJECT_PROTOCOL_DWA2002615_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/object_protocol_core.hpp>
-# include <boost/python/object_core.hpp>
-
-namespace boost { namespace python { namespace api {
-
-template <class Target, class Key>
-object getattr(Target const& target, Key const& key)
-{
-    return getattr(object(target), object(key));
-}
-
-template <class Target, class Key, class Default>
-object getattr(Target const& target, Key const& key, Default const& default_)
-{
-    return getattr(object(target), object(key), object(default_));
-}
-
-
-template <class Key, class Value>
-void setattr(object const& target, Key const& key, Value const& value)
-{
-    setattr(target, object(key), object(value));
-}
-
-template <class Key>
-void delattr(object const& target, Key const& key)
-{
-    delattr(target, object(key));
-}
-
-template <class Target, class Key>
-object getitem(Target const& target, Key const& key)
-{
-    return getitem(object(target), object(key));
-}
-
-
-template <class Key, class Value>
-void setitem(object const& target, Key const& key, Value const& value)
-{
-    return setitem(target, object(key), object(value));
-}
-
-template <class Key>
-void delitem(object const& target, Key const& key)
-{
-    delitem(target, object(key));
-}
-
-template <class Target, class Begin, class End>
-object getslice(Target const& target, Begin const& begin, End const& end)
-{
-    return getslice(object(target), object(begin), object(end));
-}
-
-template <class Begin, class End, class Value>
-void setslice(object const& target, Begin const& begin, End const& end, Value const& value)
-{
-    setslice(target, object(begin), object(end), object(value));
-}
-
-template <class Begin, class End>
-void delslice(object const& target, Begin const& begin, End const& end)
-{
-    delslice(target, object(begin), object(end));
-}
-
-}}} // namespace boost::python::api
-
-#endif // OBJECT_PROTOCOL_DWA2002615_HPP
diff --git a/include/boost/python/object_protocol_core.hpp b/include/boost/python/object_protocol_core.hpp
deleted file mode 100755
index 021eff46..00000000
--- a/include/boost/python/object_protocol_core.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJECT_PROTOCOL_CORE_DWA2002615_HPP
-# define OBJECT_PROTOCOL_CORE_DWA2002615_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/handle_fwd.hpp>
-
-namespace boost { namespace python { 
-
-namespace api
-{
-  class object;
-
-  BOOST_PYTHON_DECL object getattr(object const& target, object const& key);
-  BOOST_PYTHON_DECL object getattr(object const& target, object const& key, object const& default_);
-  BOOST_PYTHON_DECL void setattr(object const& target, object const& key, object const& value);
-  BOOST_PYTHON_DECL void delattr(object const& target, object const& key);
-
-  // These are defined for efficiency, since attributes are commonly
-  // accessed through literal strings.
-  BOOST_PYTHON_DECL object getattr(object const& target, char const* key);
-  BOOST_PYTHON_DECL object getattr(object const& target, char const* key, object const& default_);
-  BOOST_PYTHON_DECL void setattr(object const& target, char const* key, object const& value);
-  BOOST_PYTHON_DECL void delattr(object const& target, char const* key);
-  
-  BOOST_PYTHON_DECL object getitem(object const& target, object const& key);
-  BOOST_PYTHON_DECL void setitem(object const& target, object const& key, object const& value);
-  BOOST_PYTHON_DECL void delitem(object const& target, object const& key);
-
-  BOOST_PYTHON_DECL object getslice(object const& target, handle<> const& begin, handle<> const& end);
-  BOOST_PYTHON_DECL void setslice(object const& target, handle<> const& begin, handle<> const& end, object const& value);
-  BOOST_PYTHON_DECL void delslice(object const& target, handle<> const& begin, handle<> const& end);
-}
-
-using api::getattr;
-using api::setattr;
-using api::delattr;
-
-using api::getitem;
-using api::setitem;
-using api::delitem;
-
-using api::getslice;
-using api::setslice;
-using api::delslice;
-
-}} // namespace boost::python
-
-#endif // OBJECT_PROTOCOL_CORE_DWA2002615_HPP
diff --git a/include/boost/python/object_slices.hpp b/include/boost/python/object_slices.hpp
deleted file mode 100644
index 9a3c747b..00000000
--- a/include/boost/python/object_slices.hpp
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OBJECT_SLICES_DWA2002615_HPP
-# define OBJECT_SLICES_DWA2002615_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/proxy.hpp>
-# include <boost/python/object_core.hpp>
-# include <boost/python/object_protocol.hpp>
-# include <boost/python/handle.hpp>
-# include <utility>
-
-namespace boost { namespace python { namespace api {
-
-struct const_slice_policies
-{
-    typedef std::pair<handle<>, handle<> > key_type;
-    static object get(object const& target, key_type const& key);
-};
-  
-struct slice_policies : const_slice_policies
-{
-    static object const& set(object const& target, key_type const& key, object const& value);
-    static void del(object const& target, key_type const& key);
-};
-
-//
-// implementation
-//
-template <class U>
-object_slice
-object_operators<U>::slice(object_cref start, object_cref finish)
-{
-    object_cref2 x = *static_cast<U*>(this);
-    return object_slice(x, std::make_pair(borrowed(start.ptr()), borrowed(finish.ptr())));
-}
-
-template <class U>
-const_object_slice
-object_operators<U>::slice(object_cref start, object_cref finish) const
-{
-    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_slice(x, std::make_pair(borrowed(start.ptr()), borrowed(finish.ptr())));
-}
-
-template <class U>
-object_slice
-object_operators<U>::slice(slice_nil, object_cref finish)
-{
-    object_cref2 x = *static_cast<U*>(this);
-    return object_slice(x, std::make_pair(allow_null((PyObject*)0), borrowed(finish.ptr())));
-}
-
-template <class U>
-const_object_slice
-object_operators<U>::slice(slice_nil, object_cref finish) const
-{
-    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_slice(x, std::make_pair(allow_null((PyObject*)0), borrowed(finish.ptr())));
-}
-
-template <class U>
-object_slice
-object_operators<U>::slice(object_cref start, slice_nil)
-{
-    object_cref2 x = *static_cast<U*>(this);
-    return object_slice(x, std::make_pair(borrowed(start.ptr()), allow_null((PyObject*)0)));
-}
-
-template <class U>
-const_object_slice
-object_operators<U>::slice(object_cref start, slice_nil) const
-{
-    object_cref2 x = *static_cast<U const*>(this);
-    return const_object_slice(x, std::make_pair(borrowed(start.ptr()), allow_null((PyObject*)0)));
-}
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1300
-template <class U>
-template <class T, class V>
-inline const_object_slice
-object_operators<U>::slice(T const& start, V const& end) const
-{
-    return this->slice(
-        typename slice_bound<T>::type(start)
-        , typename slice_bound<V>::type(end));
-}
-
-template <class U>
-template <class T, class V>
-inline object_slice
-object_operators<U>::slice(T const& start, V const& end)
-{
-    return this->slice(
-        typename slice_bound<T>::type(start)
-        , typename slice_bound<V>::type(end));
-}
-# endif 
-
-
-inline object const_slice_policies::get(object const& target, key_type const& key)
-{
-    return getslice(target, key.first, key.second);
-}
-
-inline object const& slice_policies::set(
-    object const& target
-    , key_type const& key
-    , object const& value)
-{
-    setslice(target, key.first, key.second, value);
-    return value;
-}
-
-inline void slice_policies::del(
-    object const& target
-    , key_type const& key)
-{
-    delslice(target, key.first, key.second);
-}
-
-}}} // namespace boost::python::api
-
-#endif // OBJECT_SLICES_DWA2002615_HPP
diff --git a/include/boost/python/opaque_pointer_converter.hpp b/include/boost/python/opaque_pointer_converter.hpp
deleted file mode 100644
index 8f9a1dd9..00000000
--- a/include/boost/python/opaque_pointer_converter.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright Gottfried Ganßauge 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-/*
- * Generic Conversion of opaque C++-pointers to a Python-Wrapper.
- */
-# ifndef OPAQUE_POINTER_CONVERTER_HPP_
-# define OPAQUE_POINTER_CONVERTER_HPP_
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/lvalue_from_pytype.hpp>
-# include <boost/python/to_python_converter.hpp>
-# include <boost/python/detail/dealloc.hpp>
-# include <boost/python/detail/none.hpp>
-# include <boost/type_traits/remove_pointer.hpp>
-# include <boost/type_traits/is_pointer.hpp>
-
-// opaque_pointer_converter --
-//
-// usage: opaque_pointer_converter<Pointer>("name")
-//
-// registers to- and from- python conversions for a type Pointer,
-// and a corresponding Python type called "name".
-//
-// Note:
-// In addition you need to define specializations for type_id
-// on the type pointed to by Pointer using
-// BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(Pointee)
-//
-// For an example see libs/python/test/opaque.cpp
-//
-namespace boost { namespace python {
-    namespace detail {
-        template <class R>
-        struct opaque_pointer_converter_requires_a_pointer_type
-# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
-        {}
-# endif
-        ;
-    }
-
-template <class Pointer>
-struct opaque_pointer_converter
-    : to_python_converter<
-          Pointer, opaque_pointer_converter<Pointer> >
-{
-    BOOST_STATIC_CONSTANT(
-        bool, ok = is_pointer<Pointer>::value);
-        
-    typedef typename mpl::if_c<
-        ok
-        , Pointer
-        , detail::opaque_pointer_converter_requires_a_pointer_type<Pointer>
-    >::type ptr_type;
-
-private:
-    struct instance;
-
-public:
-    explicit opaque_pointer_converter(char const* name)
-    {
-        type_object.tp_name = const_cast<char *> (name);
-
-        lvalue_from_pytype<
-            opaque_pointer_converter<ptr_type>,
-            &opaque_pointer_converter<ptr_type>::type_object
-        >();
-    }
-
-    static PyObject* convert(ptr_type x)
-    {
-        PyObject *result = 0;
-        
-        if (x != 0) {
-            instance *o = PyObject_New (instance, &type_object);
-
-            o->x   = x;
-            result = &o->base_;
-        } else {
-            result = detail::none();
-        }
-        
-        return (result);
-    }
-
-    static typename ::boost::remove_pointer<ptr_type>::type&
-    execute(instance &p_)
-    {
-        return *p_.x;
-    }
-
-private:
-    static PyTypeObject type_object;
-
-    // This is a POD so we can use PyObject_Del on it, for example.
-    struct instance
-    {
-        PyObject base_;
-        ptr_type x;
-    };
-};
-
-template <class Pointer>
-PyTypeObject opaque_pointer_converter<Pointer>::type_object =
-{
-    PyObject_HEAD_INIT(NULL)
-    0,
-    0,
-    sizeof(typename opaque_pointer_converter<Pointer>::instance),
-    0,
-    ::boost::python::detail::dealloc
-};
-}} // namespace boost::python
-#  ifdef BOOST_MSVC
-// MSC works without this workaround, but needs another one ...
-#  define BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(Pointee)      \
-     BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(Pointee)
-#  else
-#   define BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(Pointee)                     \
-    namespace boost { namespace python {                                        \
-    template<>                                                                  \
-    inline type_info type_id<Pointee>(BOOST_PYTHON_EXPLICIT_TT_DEF(Pointee))    \
-    {                                                                           \
-        return type_info (typeid (Pointee *));                                  \
-    }                                                                           \
-    template<>                                                                  \
-    inline type_info type_id<const volatile Pointee&>(                          \
-        BOOST_PYTHON_EXPLICIT_TT_DEF(const volatile Pointee&))                  \
-    {                                                                           \
-        return type_info (typeid (Pointee *));                                  \
-    }                                                                           \
-}}
-#  endif
-# endif	// OPAQUE_POINTER_CONVERTER_HPP_
diff --git a/include/boost/python/operators.hpp b/include/boost/python/operators.hpp
deleted file mode 100644
index cf137af4..00000000
--- a/include/boost/python/operators.hpp
+++ /dev/null
@@ -1,357 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OPERATORS_DWA2002530_HPP
-# define OPERATORS_DWA2002530_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/def_visitor.hpp>
-# include <boost/python/converter/arg_to_python.hpp>
-# include <boost/python/detail/operator_id.hpp>
-# include <boost/python/detail/not_specified.hpp>
-# include <boost/python/back_reference.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/mpl/apply_if.hpp>
-# include <boost/python/self.hpp>
-# include <boost/python/other.hpp>
-# include <boost/lexical_cast.hpp>
-# include <boost/python/refcount.hpp>
-# include <string>
-# include <complex>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  // This is essentially the old v1 to_python(). It will be eliminated
-  // once the public interface for to_python is settled on.
-  template <class T>
-  PyObject* convert_result(T const& x)
-  {
-      return converter::arg_to_python<T>(x).release();
-  }
-
-  // Operator implementation template declarations. The nested apply
-  // declaration here keeps MSVC6 happy.
-  template <operator_id> struct operator_l
-  {
-      template <class L, class R> struct apply;
-  };
-  
-  template <operator_id> struct operator_r
-  {
-      template <class L, class R> struct apply;
-  };
-
-  template <operator_id> struct operator_1
-  {
-      template <class T> struct apply;
-  };
-
-  // MSVC6 doesn't want us to do this sort of inheritance on a nested
-  // class template, so we use this layer of indirection to avoid
-  // ::template<...> on the nested apply functions below
-  template <operator_id id, class L, class R>
-  struct operator_l_inner
-      : operator_l<id>::template apply<L,R>
-  {};
-      
-  template <operator_id id, class L, class R>
-  struct operator_r_inner
-      : operator_r<id>::template apply<L,R>
-  {};
-
-  template <operator_id id, class T>
-  struct operator_1_inner
-      : operator_1<id>::template apply<T>
-  {};
-      
-  // Define three different binary_op templates which take care of
-  // these cases:
-  //    self op self
-  //    self op R
-  //    L op self
-  // 
-  // The inner apply metafunction is used to adjust the operator to
-  // the class type being defined. Inheritance of the outer class is
-  // simply used to provide convenient access to the operation's
-  // name().
-
-  // self op self
-  template <operator_id id>
-  struct binary_op : operator_l<id>
-  {
-      template <class T>
-      struct apply : operator_l_inner<id,T,T>
-      {
-      };
-  };
-
-  // self op R
-  template <operator_id id, class R>
-  struct binary_op_l : operator_l<id>
-  {
-      template <class T>
-      struct apply : operator_l_inner<id,T,R>
-      {
-      };
-  };
-
-  // L op self
-  template <operator_id id, class L>
-  struct binary_op_r : operator_r<id>
-  {
-      template <class T>
-      struct apply : operator_r_inner<id,L,T>
-      {
-      };
-  };
-
-  template <operator_id id>
-  struct unary_op : operator_1<id>
-  {
-      template <class T>
-      struct apply : operator_1_inner<id,T>
-      {
-      };
-  };
-
-  // This type is what actually gets returned from operators used on
-  // self_t
-  template <operator_id id, class L = not_specified, class R = not_specified>
-  struct operator_
-    : def_visitor<operator_<id,L,R> >
-  {
-   private:
-      template <class ClassT>
-      void visit(ClassT& cl) const
-      {
-          typedef typename mpl::apply_if<
-              is_same<L,self_t>
-            , mpl::if_<
-                  is_same<R,self_t>
-                , binary_op<id>
-                , binary_op_l<
-                      id
-                    , BOOST_DEDUCED_TYPENAME unwrap_other<R>::type
-                  >
-              >
-            , mpl::if_<
-                  is_same<L,not_specified>
-                , unary_op<id>
-                , binary_op_r<
-                      id
-                    , BOOST_DEDUCED_TYPENAME unwrap_other<L>::type
-                  >
-              >
-          >::type generator;
-      
-          cl.def(
-              generator::name()
-            , &generator::template apply<
-                 BOOST_DEDUCED_TYPENAME ClassT::wrapped_type
-              >::execute
-          );
-      }
-    
-      friend class python::def_visitor_access;
-  };
-}
-
-# define BOOST_PYTHON_BINARY_OPERATION(id, rid, expr)       \
-namespace detail                                            \
-{                                                           \
-  template <>                                               \
-  struct operator_l<op_##id>                                \
-  {                                                         \
-      template <class L, class R>                           \
-      struct apply                                          \
-      {                                                     \
-          static inline PyObject* execute(L& l, R const& r) \
-          {                                                 \
-              return detail::convert_result(expr);          \
-          }                                                 \
-      };                                                    \
-      static char const* name() { return "__" #id "__"; }   \
-  };                                                        \
-                                                            \
-  template <>                                               \
-  struct operator_r<op_##id>                                \
-  {                                                         \
-      template <class L, class R>                           \
-      struct apply                                          \
-      {                                                     \
-          static inline PyObject* execute(R& r, L const& l) \
-          {                                                 \
-              return detail::convert_result(expr);          \
-          }                                                 \
-      };                                                    \
-      static char const* name() { return "__" #rid "__"; }  \
-  };                                                        \
-} 
-
-# define BOOST_PYTHON_BINARY_OPERATOR(id, rid, op)      \
-BOOST_PYTHON_BINARY_OPERATION(id, rid, l op r)          \
-namespace self_ns                                       \
-{                                                       \
-  template <class L, class R>                           \
-  inline detail::operator_<detail::op_##id,L,R>         \
-  operator op(L const&, R const&)                       \
-  {                                                     \
-      return detail::operator_<detail::op_##id,L,R>();  \
-  }                                                     \
-}
-  
-BOOST_PYTHON_BINARY_OPERATOR(add, radd, +)
-BOOST_PYTHON_BINARY_OPERATOR(sub, rsub, -)
-BOOST_PYTHON_BINARY_OPERATOR(mul, rmul, *)
-BOOST_PYTHON_BINARY_OPERATOR(div, rdiv, /)
-BOOST_PYTHON_BINARY_OPERATOR(mod, rmod, %)
-BOOST_PYTHON_BINARY_OPERATOR(lshift, rlshift, <<)
-BOOST_PYTHON_BINARY_OPERATOR(rshift, rrshift, >>)
-BOOST_PYTHON_BINARY_OPERATOR(and, rand, &)
-BOOST_PYTHON_BINARY_OPERATOR(xor, rxor, ^)
-BOOST_PYTHON_BINARY_OPERATOR(or, ror, |)
-BOOST_PYTHON_BINARY_OPERATOR(gt, lt, >)
-BOOST_PYTHON_BINARY_OPERATOR(ge, le, >=)
-BOOST_PYTHON_BINARY_OPERATOR(lt, gt, <)
-BOOST_PYTHON_BINARY_OPERATOR(le, ge, <=)
-BOOST_PYTHON_BINARY_OPERATOR(eq, eq, ==)
-BOOST_PYTHON_BINARY_OPERATOR(ne, ne, !=)
-# undef BOOST_PYTHON_BINARY_OPERATOR
-    
-// pow isn't an operator in C++; handle it specially.
-BOOST_PYTHON_BINARY_OPERATION(pow, rpow, pow(l,r))
-# undef BOOST_PYTHON_BINARY_OPERATION
-    
-namespace self_ns
-{
-# ifndef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-  template <class L, class R>
-  inline detail::operator_<detail::op_pow,L,R>
-  pow(L const&, R const&)
-  {
-      return detail::operator_<detail::op_pow,L,R>();
-  }
-# else
-  // When there's no argument-dependent lookup, we need these
-  // overloads to handle the case when everything is imported into the
-  // global namespace. Note that the plain overload below does /not/
-  // take const& arguments. This is needed by MSVC6 at least, or it
-  // complains of ambiguities, since there's no partial ordering.
-  inline detail::operator_<detail::op_pow,self_t,self_t>
-  pow(self_t, self_t)
-  {
-      return detail::operator_<detail::op_pow,self_t,self_t>();
-  }
-  template <class R>
-  inline detail::operator_<detail::op_pow,self_t,R>
-  pow(self_t const&, R const&)
-  {
-      return detail::operator_<detail::op_pow,self_t,R>();
-  }
-  template <class L>
-  inline detail::operator_<detail::op_pow,L,self_t>
-  pow(L const&, self_t const&)
-  {
-      return detail::operator_<detail::op_pow,L,self_t>();
-  }
-# endif 
-}
-
-
-# define BOOST_PYTHON_INPLACE_OPERATOR(id, op)                  \
-namespace detail                                                \
-{                                                               \
-  template <>                                                   \
-  struct operator_l<op_##id>                                    \
-  {                                                             \
-      template <class L, class R>                               \
-      struct apply                                              \
-      {                                                         \
-          static inline PyObject*                               \
-          execute(back_reference<L&> l, R const& r)             \
-          {                                                     \
-              l.get() op r;                                     \
-              return python::incref(l.source().ptr());          \
-          }                                                     \
-      };                                                        \
-      static char const* name() { return "__" #id "__"; }       \
-  };                                                            \
-}                                                               \
-namespace self_ns                                               \
-{                                                               \
-  template <class R>                                            \
-  inline detail::operator_<detail::op_##id,self_t,R>            \
-  operator op(self_t const&, R const&)                          \
-  {                                                             \
-      return detail::operator_<detail::op_##id,self_t,R>();     \
-  }                                                             \
-}
-
-BOOST_PYTHON_INPLACE_OPERATOR(iadd,+=)
-BOOST_PYTHON_INPLACE_OPERATOR(isub,-=)
-BOOST_PYTHON_INPLACE_OPERATOR(imul,*=)
-BOOST_PYTHON_INPLACE_OPERATOR(idiv,/=)
-BOOST_PYTHON_INPLACE_OPERATOR(imod,%=)
-BOOST_PYTHON_INPLACE_OPERATOR(ilshift,<<=)
-BOOST_PYTHON_INPLACE_OPERATOR(irshift,>>=)
-BOOST_PYTHON_INPLACE_OPERATOR(iand,&=)
-BOOST_PYTHON_INPLACE_OPERATOR(ixor,^=)
-BOOST_PYTHON_INPLACE_OPERATOR(ior,|=)
-    
-# define BOOST_PYTHON_UNARY_OPERATOR(id, op, func_name)         \
-namespace detail                                                \
-{                                                               \
-  template <>                                                   \
-  struct operator_1<op_##id>                                    \
-  {                                                             \
-      template <class T>                                        \
-      struct apply                                              \
-      {                                                         \
-          static PyObject* execute(T& x)                        \
-          {                                                     \
-              return detail::convert_result(op(x));             \
-          }                                                     \
-      };                                                        \
-      static char const* name() { return "__" #id "__"; }       \
-  };                                                            \
-}                                                               \
-namespace self_ns                                               \
-{                                                               \
-  inline detail::operator_<detail::op_##id>                     \
-  func_name(self_t const&)                                      \
-  {                                                             \
-      return detail::operator_<detail::op_##id>();              \
-  }                                                             \
-}
-# undef BOOST_PYTHON_INPLACE_OPERATOR
-
-BOOST_PYTHON_UNARY_OPERATOR(neg, -, operator-)
-BOOST_PYTHON_UNARY_OPERATOR(pos, +, operator+)
-BOOST_PYTHON_UNARY_OPERATOR(abs, abs, abs)
-BOOST_PYTHON_UNARY_OPERATOR(invert, ~, operator~)
-BOOST_PYTHON_UNARY_OPERATOR(nonzero, !!, operator!)
-BOOST_PYTHON_UNARY_OPERATOR(int, long, int_)
-BOOST_PYTHON_UNARY_OPERATOR(long, PyLong_FromLong, long_)
-BOOST_PYTHON_UNARY_OPERATOR(float, double, float_)
-BOOST_PYTHON_UNARY_OPERATOR(complex, std::complex<double>, complex_)
-BOOST_PYTHON_UNARY_OPERATOR(str, lexical_cast<std::string>, str)
-# undef BOOST_PYTHON_UNARY_OPERATOR
-
-}} // namespace boost::python
-
-# ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
-using boost::python::self_ns::abs;
-using boost::python::self_ns::int_;
-using boost::python::self_ns::long_;
-using boost::python::self_ns::float_;
-using boost::python::self_ns::complex_;
-using boost::python::self_ns::str;
-using boost::python::self_ns::pow;
-# endif
-
-#endif // OPERATORS_DWA2002530_HPP
diff --git a/include/boost/python/other.hpp b/include/boost/python/other.hpp
deleted file mode 100755
index 86cd94b0..00000000
--- a/include/boost/python/other.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-#ifndef OTHER_DWA20020601_HPP
-# define OTHER_DWA20020601_HPP
-
-# include <boost/python/detail/prefix.hpp>
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-# if _MSC_VER+0 >= 1020
-#  pragma once
-# endif
-
-# include <boost/config.hpp>
-
-namespace boost { namespace python {
-
-template<class T> struct other
-{ 
-    typedef T type;
-};
-
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-namespace detail
-{
-  template<typename T>
-  class is_other
-  {
-   public:
-      BOOST_STATIC_CONSTANT(bool, value = false); 
-  };
-
-  template<typename T>
-  class is_other<other<T> >
-  {
-   public:
-      BOOST_STATIC_CONSTANT(bool, value = true);
-  };
-
-  template<typename T>
-  class unwrap_other
-  {
-   public:
-      typedef T type;
-  };
-
-  template<typename T>
-  class unwrap_other<other<T> >
-  {
-   public:
-      typedef T type;
-  };
-}
-# else // no partial specialization
-
-}} // namespace boost::python
-
-#include <boost/type.hpp>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  typedef char (&yes_other_t)[1];
-  typedef char (&no_other_t)[2];
-      
-  no_other_t is_other_test(...);
-
-  template<typename T>
-  yes_other_t is_other_test(type< other<T> >);
-
-  template<bool wrapped>
-  struct other_unwrapper
-  {
-      template <class T>
-      struct apply
-      {
-          typedef T type;
-      };
-  };
-
-  template<>
-  struct other_unwrapper<true>
-  {
-      template <class T>
-      struct apply
-      {
-          typedef typename T::type type;
-      };
-  };
-
-  template<typename T>
-  class is_other
-  {
-   public:
-      BOOST_STATIC_CONSTANT(
-          bool, value = (
-              sizeof(detail::is_other_test(type<T>()))
-              == sizeof(detail::yes_other_t)));
-  };
-
-  template <typename T>
-  class unwrap_other
-      : public detail::other_unwrapper<
-      is_other<T>::value
-  >::template apply<T>
-  {};
-}
-
-# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-
-}} // namespace boost::python
-
-#endif // #ifndef OTHER_DWA20020601_HPP
diff --git a/include/boost/python/overloads.hpp b/include/boost/python/overloads.hpp
deleted file mode 100644
index 34909033..00000000
--- a/include/boost/python/overloads.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef OVERLOADS_DWA2002101_HPP
-# define OVERLOADS_DWA2002101_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/detail/overloads_fwd.hpp>
-# include <boost/python/detail/defaults_def.hpp>
-
-#endif // OVERLOADS_DWA2002101_HPP
diff --git a/include/boost/python/pointee.hpp b/include/boost/python/pointee.hpp
deleted file mode 100644
index 72cd8664..00000000
--- a/include/boost/python/pointee.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef POINTEE_DWA2002323_HPP
-# define POINTEE_DWA2002323_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/type_traits/object_traits.hpp>
-# include <boost/type_traits/remove_pointer.hpp>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  template <bool is_ptr = true>
-  struct pointee_impl
-  {
-      template <class T> struct apply : remove_pointer<T> {};
-  };
-
-  template <>
-  struct pointee_impl<false>
-  {
-      template <class T> struct apply
-      {
-          typedef typename T::element_type type;
-      };
-  };
-}
-
-template <class T>
-struct pointee
-    : detail::pointee_impl<
-        ::boost::is_pointer<T>::value
-      >::template apply<T>
-{
-};
-
-}} // namespace boost::python::detail
-
-#endif // POINTEE_DWA2002323_HPP
diff --git a/include/boost/python/proxy.hpp b/include/boost/python/proxy.hpp
deleted file mode 100755
index 4585201b..00000000
--- a/include/boost/python/proxy.hpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef PROXY_DWA2002615_HPP
-# define PROXY_DWA2002615_HPP
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/object_core.hpp>
-# include <boost/python/object_operators.hpp>
-
-namespace boost { namespace python { namespace api {
-
-template <class Policies>
-class proxy : public object_operators<proxy<Policies> >
-{
-    typedef typename Policies::key_type key_type;
-    
-# if !defined(BOOST_MSVC) || BOOST_MSVC > 1200
-    typedef proxy const& assignment_self;
-# else
-    typedef proxy assignment_self;
-# endif
- public:
-    proxy(object const& target, key_type const& key);
-    operator object() const;
-
-    // to support a[b] = c[d]
-    proxy const& operator=(assignment_self) const;
-    
-    template <class T>
-    inline proxy const& operator=(T const& rhs) const
-    {
-        Policies::set(m_target, m_key, object(rhs));
-        return *this;
-    }
-
- public: // implementation detail
-    void del() const;
-        
- private:
-    object m_target;
-    key_type m_key;
-};
-
-
-template <class T>
-inline void del(proxy<T> const& x)
-{
-    x.del();
-}
-
-//
-// implementation
-//
-
-template <class Policies>
-inline proxy<Policies>::proxy(object const& target, key_type const& key)
-    : m_target(target), m_key(key)
-{}
-
-template <class Policies>
-inline proxy<Policies>::operator object() const
-{
-    return Policies::get(m_target, m_key);
-}
-
-// to support a[b] = c[d]
-template <class Policies>
-inline proxy<Policies> const& proxy<Policies>::operator=(typename proxy::assignment_self rhs) const
-{
-    return *this = python::object(rhs);
-}
-
-# define BOOST_PYTHON_PROXY_INPLACE(op)                                         \
-template <class Policies, class R>                                              \
-proxy<Policies> const& operator op(proxy<Policies> const& lhs, R const& rhs)    \
-{                                                                               \
-    object old(lhs);                                                            \
-    return lhs = (old op rhs);                                                  \
-} 
-BOOST_PYTHON_PROXY_INPLACE(+=)
-BOOST_PYTHON_PROXY_INPLACE(-=)
-BOOST_PYTHON_PROXY_INPLACE(*=)
-BOOST_PYTHON_PROXY_INPLACE(/=)
-BOOST_PYTHON_PROXY_INPLACE(%=)
-BOOST_PYTHON_PROXY_INPLACE(<<=)
-BOOST_PYTHON_PROXY_INPLACE(>>=)
-BOOST_PYTHON_PROXY_INPLACE(&=)
-BOOST_PYTHON_PROXY_INPLACE(^=)
-BOOST_PYTHON_PROXY_INPLACE(|=)
-# undef BOOST_PYTHON_PROXY_INPLACE
-
-template <class Policies>
-inline void proxy<Policies>::del() const
-{
-    Policies::del(m_target, m_key);
-}
-
-}}} // namespace boost::python::api
-
-#endif // PROXY_DWA2002615_HPP
diff --git a/include/boost/python/ptr.hpp b/include/boost/python/ptr.hpp
deleted file mode 100644
index 1bbe8c5e..00000000
--- a/include/boost/python/ptr.hpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#ifndef PTR_DWA20020601_HPP
-# define PTR_DWA20020601_HPP
-
-# include <boost/python/detail/prefix.hpp>
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-//
-// Based on boost/ref.hpp, thus:
-//  Copyright (C) 1999, 2000 Jaakko Järvi (jaakko.jarvi@cs.utu.fi)
-//  Copyright (C) 2001 Peter Dimov
-
-# if _MSC_VER+0 >= 1020
-#  pragma once
-# endif
-
-# include <boost/config.hpp>
-# include <boost/mpl/bool.hpp>
-
-namespace boost { namespace python {
-
-template<class Ptr> class pointer_wrapper
-{ 
- public:
-    typedef Ptr type;
-    
-    explicit pointer_wrapper(Ptr x): p_(x) {}
-    operator Ptr() const { return p_; }
-    Ptr get() const { return p_; }
- private:
-    Ptr p_;
-};
-
-template<class T>
-inline pointer_wrapper<T> ptr(T t)
-{ 
-    return pointer_wrapper<T>(t);
-}
-
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-template<typename T>
-class is_pointer_wrapper
-    : public mpl::false_
-{
-};
-
-template<typename T>
-class is_pointer_wrapper<pointer_wrapper<T> >
-    : public mpl::true_
-{
-};
-
-template<typename T>
-class unwrap_pointer
-{
- public:
-    typedef T type;
-};
-
-template<typename T>
-class unwrap_pointer<pointer_wrapper<T> >
-{
- public:
-    typedef T type;
-};
-# else // no partial specialization
-
-}} // namespace boost::python
-
-#include <boost/type.hpp>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  typedef char (&yes_pointer_wrapper_t)[1];
-  typedef char (&no_pointer_wrapper_t)[2];
-      
-  no_pointer_wrapper_t is_pointer_wrapper_test(...);
-
-  template<typename T>
-  yes_pointer_wrapper_t is_pointer_wrapper_test(boost::type< pointer_wrapper<T> >);
-
-  template<bool wrapped>
-  struct pointer_unwrapper
-  {
-      template <class T>
-      struct apply
-      {
-          typedef T type;
-      };
-  };
-
-  template<>
-  struct pointer_unwrapper<true>
-  {
-      template <class T>
-      struct apply
-      {
-          typedef typename T::type type;
-      };
-  };
-}
-
-template<typename T>
-class is_pointer_wrapper
-{
- public:
-    BOOST_STATIC_CONSTANT(
-        bool, value = (
-        sizeof(detail::is_pointer_wrapper_test(boost::type<T>()))
-            == sizeof(detail::yes_pointer_wrapper_t)));
-    typedef mpl::bool_<value> type;
-};
-
-template <typename T>
-class unwrap_pointer
-    : public detail::pointer_unwrapper<
-        is_pointer_wrapper<T>::value
-      >::template apply<T>
-{};
-
-# endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-
-}} // namespace boost::python
-
-#endif // #ifndef PTR_DWA20020601_HPP
diff --git a/include/boost/python/pure_virtual.hpp b/include/boost/python/pure_virtual.hpp
deleted file mode 100755
index 8c4c4074..00000000
--- a/include/boost/python/pure_virtual.hpp
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef PURE_VIRTUAL_DWA2003810_HPP
-# define PURE_VIRTUAL_DWA2003810_HPP
-
-# include <boost/python/def_visitor.hpp>
-# include <boost/python/default_call_policies.hpp>
-# include <boost/mpl/push_front.hpp>
-# include <boost/mpl/pop_front.hpp>
-
-# include <boost/python/detail/nullary_function_adaptor.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  //
-  // @group Helpers for pure_virtual_visitor. {
-  //
-  
-  // Raises a Python RuntimeError reporting that a pure virtual
-  // function was called.
-  void BOOST_PYTHON_DECL pure_virtual_called();
-
-  // Replace the two front elements of S with T1 and T2
-  template <class S, class T1, class T2>
-  struct replace_front2
-  {
-      // Metafunction forwarding seemed to confound vc6 
-      typedef typename mpl::push_front<
-          typename mpl::push_front<
-              typename mpl::pop_front<
-                  typename mpl::pop_front<
-                      S
-                  >::type
-              >::type
-            , T2
-          >::type
-        , T1
-      >::type type;
-  };
-
-  // Given an MPL sequence representing a member function [object]
-  // signature, returns a new MPL sequence whose return type is
-  // replaced by void, and whose first argument is replaced by C&.
-  template <class C, class S>
-  typename replace_front2<S,void,C&>::type
-  error_signature(S BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(C))
-  {
-      typedef typename replace_front2<S,void,C&>::type r;
-      return r();
-  }
-
-  //
-  // } 
-  //
-
-  //
-  // A def_visitor which defines a method as usual, then adds a
-  // corresponding function which raises a "pure virtual called"
-  // exception unless it's been overridden.
-  //
-  template <class PointerToMemberFunction>
-  struct pure_virtual_visitor
-    : def_visitor<pure_virtual_visitor<PointerToMemberFunction> >
-  {
-      pure_virtual_visitor(PointerToMemberFunction pmf)
-        : m_pmf(pmf)
-      {}
-      
-#if !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
-   private:
-#endif
-      friend class def_visitor_access;
-      
-      template <class C_, class Options>
-      void visit(C_& c, char const* name, Options& options) const
-      {
-          // This should probably be a nicer error message
-          BOOST_STATIC_ASSERT(!Options::has_default_implementation);
-
-          // Add the virtual function dispatcher
-          c.def(
-              name
-            , m_pmf
-            , options.doc()
-            , options.keywords()
-            , options.policies()
-          );
-
-          typedef BOOST_DEDUCED_TYPENAME C_::select_holder::held_type held_t;
-          
-          // Add the default implementation which raises the exception
-          c.def(
-              name
-            , make_function(
-                  detail::nullary_function_adaptor<void(*)()>(pure_virtual_called)
-                , default_call_policies()
-                , detail::error_signature<held_t>(detail::get_signature(m_pmf))
-              )
-          );
-      }
-      
-   private: // data members
-      PointerToMemberFunction m_pmf;
-  };
-}
-
-//
-// Passed a pointer to member function, generates a def_visitor which
-// creates a method that only dispatches to Python if the function has
-// been overridden, either in C++ or in Python, raising a "pure
-// virtual called" exception otherwise.
-//
-template <class PointerToMemberFunction>
-detail::pure_virtual_visitor<PointerToMemberFunction>
-pure_virtual(PointerToMemberFunction pmf)
-{
-    return detail::pure_virtual_visitor<PointerToMemberFunction>(pmf);
-}
-
-}} // namespace boost::python
-
-#endif // PURE_VIRTUAL_DWA2003810_HPP
diff --git a/include/boost/python/raw_function.hpp b/include/boost/python/raw_function.hpp
deleted file mode 100755
index 1ed3c3c1..00000000
--- a/include/boost/python/raw_function.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef RAW_FUNCTION_DWA200336_HPP
-# define RAW_FUNCTION_DWA200336_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/tuple.hpp>
-# include <boost/python/dict.hpp>
-# include <boost/python/object/py_function.hpp>
-# include <boost/mpl/vector/vector10.hpp>
-
-# include <boost/limits.hpp>
-# include <cstddef>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  template <class F>
-  struct raw_dispatcher
-  {
-      raw_dispatcher(F f) : f(f) {}
-      
-      PyObject* operator()(PyObject* args, PyObject* keywords)
-      {
-          return incref(
-              object(
-                  f(
-                      tuple(borrowed_reference(args))
-                    , keywords ? dict(borrowed_reference(keywords)) : dict()
-                  )
-              ).ptr()
-          );
-      }
-
-   private:
-      F f;
-  };
-
-  object BOOST_PYTHON_DECL make_raw_function(objects::py_function);
-}
-
-template <class F>
-object raw_function(F f, std::size_t min_args = 0)
-{
-    return detail::make_raw_function(
-        objects::py_function(
-            detail::raw_dispatcher<F>(f)
-          , mpl::vector1<PyObject*>()
-          , min_args
-          , std::numeric_limits<unsigned>::max()
-        )
-    );
-}
-    
-}} // namespace boost::python
-
-#endif // RAW_FUNCTION_DWA200336_HPP
diff --git a/include/boost/python/refcount.hpp b/include/boost/python/refcount.hpp
deleted file mode 100755
index 45b1e9ab..00000000
--- a/include/boost/python/refcount.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef REFCOUNT_DWA2002615_HPP
-# define REFCOUNT_DWA2002615_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/cast.hpp>
-
-namespace boost { namespace python { 
-
-template <class T>
-inline T* incref(T* p)
-{
-    Py_INCREF(python::upcast<PyObject>(p));
-    return p;
-}
-
-template <class T>
-inline T* xincref(T* p)
-{
-    Py_XINCREF(python::upcast<PyObject>(p));
-    return p;
-}
-
-template <class T>
-inline void decref(T* p)
-{
-    Py_DECREF(python::upcast<PyObject>(p));
-}
-
-template <class T>
-inline void xdecref(T* p)
-{
-    Py_XDECREF(python::upcast<PyObject>(p));
-}
-
-}} // namespace boost::python
-
-#endif // REFCOUNT_DWA2002615_HPP
diff --git a/include/boost/python/reference_existing_object.hpp b/include/boost/python/reference_existing_object.hpp
deleted file mode 100644
index 5aeeab6c..00000000
--- a/include/boost/python/reference_existing_object.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef REFERENCE_EXISTING_OBJECT_DWA200222_HPP
-# define REFERENCE_EXISTING_OBJECT_DWA200222_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/mpl/if.hpp>
-# include <boost/python/to_python_indirect.hpp>
-# include <boost/type_traits/composite_traits.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  template <class R>
-  struct reference_existing_object_requires_a_pointer_or_reference_return_type
-# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
-  {}
-# endif
-  ;
-}
-
-template <class T> struct to_python_value;
-
-struct reference_existing_object
-{
-    template <class T>
-    struct apply
-    {
-        BOOST_STATIC_CONSTANT(
-            bool, ok = is_pointer<T>::value || is_reference<T>::value);
-        
-        typedef typename mpl::if_c<
-            ok
-            , to_python_indirect<T, detail::make_reference_holder>
-            , detail::reference_existing_object_requires_a_pointer_or_reference_return_type<T>
-        >::type type;
-    };
-};
-
-}} // namespace boost::python
-
-#endif // REFERENCE_EXISTING_OBJECT_DWA200222_HPP
diff --git a/include/boost/python/register_ptr_to_python.hpp b/include/boost/python/register_ptr_to_python.hpp
deleted file mode 100644
index cbd42cc1..00000000
--- a/include/boost/python/register_ptr_to_python.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.     
-#ifndef REGISTER_PTR_TO_PYTHON_HPP
-#define REGISTER_PTR_TO_PYTHON_HPP
-
-#include <boost/python/pointee.hpp>
-#include <boost/python/object.hpp>
-#include <boost/python/object/class_wrapper.hpp>
-
-namespace boost { namespace python {
-    
-template <class P>
-void register_ptr_to_python(BOOST_EXPLICIT_TEMPLATE_TYPE(P))
-{
-    typedef typename boost::python::pointee<P>::type X;
-    objects::class_value_wrapper<
-        P
-      , objects::make_ptr_instance<
-            X
-          , objects::pointer_holder<P,X>
-        >
-    >();
-}           
-
-}} // namespace boost::python
-
-#endif // REGISTER_PTR_TO_PYTHON_HPP
-
-
diff --git a/include/boost/python/return_arg.hpp b/include/boost/python/return_arg.hpp
deleted file mode 100755
index 716c2664..00000000
--- a/include/boost/python/return_arg.hpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright David Abrahams and Nikolay Mladenov 2003. Permission to
-// copy, use, modify, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. This software
-// is provided "as is" without express or implied warranty, and with
-// no claim as to its suitability for any purpose.
-#ifndef RETURN_ARG_DWA2003719_HPP
-# define RETURN_ARG_DWA2003719_HPP
-# include <boost/python/default_call_policies.hpp>
-# include <boost/python/detail/none.hpp>
-
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/type_traits/add_const.hpp>
-
-# if 0 // argpkg
-#  include <boost/mpl/int.hpp>
-# endif
-
-# include <boost/static_assert.hpp>
-# include <boost/python/refcount.hpp>
-
-# include <cstddef>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  template <std::size_t>
-  struct return_arg_pos_argument_must_be_positive
-# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
-  {}
-# endif
-  ;
-
-  struct return_none
-  {
-      template <class T> struct apply
-      {
-          struct type
-          {
-              static bool convertible()
-              {
-                  return true;
-              }
-              
-              PyObject *operator()(
-                  typename add_reference<
-                      typename add_const<T>::type
-                  >::type
-              ) const
-              {
-                  return none();
-              }
-          };
-      };
-  };
-}
-    
-template <
-    std::size_t arg_pos=1
-  , class Base = default_call_policies
-> 
-struct return_arg : Base
-{
- private:
-    BOOST_STATIC_CONSTANT(bool, legal = arg_pos > 0);
-
- public:
-    typedef typename mpl::if_c<
-        legal
-        , detail::return_none
-        , detail::return_arg_pos_argument_must_be_positive<arg_pos>
-        // we could default to the base result_converter in case or
-        // arg_pos==0 since return arg 0 means return result, but I
-        // think it is better to issue an error instead, cause it can
-        // lead to confusions
-    >::type result_converter;
-
-    template <class ArgumentPackage>
-    static PyObject* postcall(ArgumentPackage const& args, PyObject* result)
-    {
-        // In case of arg_pos == 0 we could simply return Base::postcall,
-        // but this is redundant
-        BOOST_STATIC_ASSERT(arg_pos > 0);
-
-        result = Base::postcall(args,result);
-        if (!result)
-            return 0;
-        Py_DECREF(result);
-# if 0 // argpkg
-        return incref( detail::get(mpl::int_<arg_pos-1>(),args) );
-# else
-        return incref( detail::get<(arg_pos-1)>(args) );
-# endif 
-    }
-};
-
-template <
-    class Base = default_call_policies
-    >
-struct return_self 
-  : return_arg<1,Base>
-{};
-
-}} // namespace boost::python
-
-#endif // RETURN_ARG_DWA2003719_HPP
diff --git a/include/boost/python/return_by_value.hpp b/include/boost/python/return_by_value.hpp
deleted file mode 100644
index dba6736f..00000000
--- a/include/boost/python/return_by_value.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef BY_VALUE_DWA20021015_HPP
-# define BY_VALUE_DWA20021015_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/to_python_value.hpp>
-# include <boost/type_traits/add_reference.hpp>
-# include <boost/type_traits/add_const.hpp>
-
-namespace boost { namespace python { 
-
-struct return_by_value
-{
-    template <class R>
-    struct apply
-    {
-       typedef to_python_value<
-           typename add_reference<
-               typename add_const<R>::type
-           >::type
-       > type;
-    };
-};
-
-}} // namespace boost::python
-
-#endif // BY_VALUE_DWA20021015_HPP
diff --git a/include/boost/python/return_internal_reference.hpp b/include/boost/python/return_internal_reference.hpp
deleted file mode 100644
index 70e5d749..00000000
--- a/include/boost/python/return_internal_reference.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef RETURN_INTERNAL_REFERENCE_DWA2002131_HPP
-# define RETURN_INTERNAL_REFERENCE_DWA2002131_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/default_call_policies.hpp>
-# include <boost/python/reference_existing_object.hpp>
-# include <boost/python/with_custodian_and_ward.hpp>
-# include <boost/mpl/if.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  template <std::size_t>
-  struct return_internal_reference_owner_arg_must_be_greater_than_zero
-# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
-  {}
-# endif
-  ;
-}
-
-template <std::size_t owner_arg = 1, class BasePolicy_ = default_call_policies>
-struct return_internal_reference
-    : with_custodian_and_ward_postcall<0, owner_arg, BasePolicy_>
-{
- private:
-    BOOST_STATIC_CONSTANT(bool, legal = owner_arg > 0);
- public:
-    typedef typename mpl::if_c<
-        legal
-        , reference_existing_object
-        , detail::return_internal_reference_owner_arg_must_be_greater_than_zero<owner_arg>
-    >::type result_converter;
-};
-
-}} // namespace boost::python
-
-#endif // RETURN_INTERNAL_REFERENCE_DWA2002131_HPP
diff --git a/include/boost/python/return_opaque_pointer.hpp b/include/boost/python/return_opaque_pointer.hpp
deleted file mode 100644
index 6a3af9be..00000000
--- a/include/boost/python/return_opaque_pointer.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright Gottfried Ganßauge 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-/*
- * Generic Return value converter generator for opaque C++-pointers
- */
-# ifndef RETURN_OPAQUE_POINTER_HPP_
-# define RETURN_OPAQUE_POINTER_HPP_
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/opaque_pointer_converter.hpp>
-# include <boost/python/detail/indirect_traits.hpp>
-# include <boost/mpl/if.hpp>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  template <class Pointer>
-  struct opaque_conversion_holder
-  {
-      inline PyObject *operator()(Pointer p) const
-      {
-          static opaque_pointer_converter<Pointer> converter (
-              typeid (Pointer).name());
-
-          return converter.convert(p);
-      }
-  };
-
-  template <class R>
-  struct return_opaque_pointer_requires_a_pointer_type
-# if defined(__GNUC__) && __GNUC__ >= 3 || defined(__EDG__)
-  {}
-# endif
-  ;
-}
-    
-struct return_opaque_pointer
-{
-    template <class R>
-    struct apply
-    {
-        BOOST_STATIC_CONSTANT(
-            bool, ok = is_pointer<R>::value);
-        
-        typedef typename mpl::if_c<
-            ok
-          , detail::opaque_conversion_holder<R>
-          , detail::return_opaque_pointer_requires_a_pointer_type<R>
-        >::type type;
-    };
-};
-}} // namespace boost::python
-# endif // RETURN_OPAQUE_POINTER_HPP_
diff --git a/include/boost/python/return_value_policy.hpp b/include/boost/python/return_value_policy.hpp
deleted file mode 100644
index 7f23ea91..00000000
--- a/include/boost/python/return_value_policy.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef RETURN_VALUE_POLICY_DWA2002131_HPP
-# define RETURN_VALUE_POLICY_DWA2002131_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/default_call_policies.hpp>
-
-namespace boost { namespace python { 
-
-template <class ResultConverterGenerator, class BasePolicy_ = default_call_policies>
-struct return_value_policy : BasePolicy_
-{
-    typedef ResultConverterGenerator result_converter;
-};
-
-}} // namespace boost::python
-
-#endif // RETURN_VALUE_POLICY_DWA2002131_HPP
diff --git a/include/boost/python/scope.hpp b/include/boost/python/scope.hpp
deleted file mode 100644
index caaf3b1c..00000000
--- a/include/boost/python/scope.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef SCOPE_DWA2002724_HPP
-# define SCOPE_DWA2002724_HPP
-
-# include <boost/python/detail/prefix.hpp>
-# include <boost/python/object.hpp>
-# include <boost/python/refcount.hpp>
-# include <boost/utility.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  // Making this a namespace-scope variable to avoid Cygwin issues.
-  // Use a PyObject* to avoid problems with static destruction after Py_Finalize
-  extern BOOST_PYTHON_DECL PyObject* current_scope;
-}
-
-class scope
-  : public object
-{
- public:
-    inline scope(scope const&);
-    inline scope(object const&);
-    inline scope();
-    inline ~scope();
-    
- private: // data members
-    PyObject* m_previous_scope;
-
- private: // unimplemented functions
-    void operator=(scope const&);
-};
-
-inline scope::scope(object const& new_scope)
-    : object(new_scope)
-    , m_previous_scope(detail::current_scope)
-{
-    detail::current_scope = python::incref(new_scope.ptr());
-}
-
-inline scope::scope()
-    : object(detail::borrowed_reference(
-                 detail::current_scope ? detail::current_scope : Py_None
-                 ))
-    , m_previous_scope(python::xincref(detail::current_scope))
-{
-}
-
-inline scope::~scope()
-{
-    python::xdecref(detail::current_scope);
-    detail::current_scope = m_previous_scope;
-}
-
-namespace converter
-{
-  template <>
-  struct object_manager_traits<scope>
-      : object_manager_traits<object>
-  {
-  };
-}
-
-// Placing this after the specialization above suppresses a CWPro8.3 bug
-inline scope::scope(scope const& new_scope)
-    : object(new_scope)
-    , m_previous_scope(detail::current_scope)
-{
-    detail::current_scope = python::incref(new_scope.ptr());
-}
-
-}} // namespace boost::python
-
-#endif // SCOPE_DWA2002724_HPP
diff --git a/include/boost/python/self.hpp b/include/boost/python/self.hpp
deleted file mode 100755
index 665546d2..00000000
--- a/include/boost/python/self.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef SELF_DWA2002531_HPP
-# define SELF_DWA2002531_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-namespace boost { namespace python {
-
-#define BOOST_PYTHON_SELF_IS_CLASS
-
-// Sink self_t into its own namespace so that we have a safe place to
-// put the completely general operator templates which operate on
-// it. It is possible to avoid this, but it turns out to be much more
-// complicated and finally GCC 2.95.2 chokes on it.
-namespace self_ns
-{
-# ifndef BOOST_PYTHON_SELF_IS_CLASS
-  enum self_t { self };
-# else 
-  struct self_t {};
-  extern BOOST_PYTHON_DECL self_t self;
-# endif
-}
-
-using self_ns::self_t;
-using self_ns::self;
-
-}} // namespace boost::python
-
-#endif // SELF_DWA2002531_HPP
diff --git a/include/boost/python/signature.hpp b/include/boost/python/signature.hpp
deleted file mode 100644
index 718640db..00000000
--- a/include/boost/python/signature.hpp
+++ /dev/null
@@ -1,180 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-// Copyright David Abrahams 2002, Joel de Guzman, 2002. Permission to copy,
-// use, modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided "as is"
-// without express or implied warranty, and with no claim as to its
-// suitability for any purpose.
-//
-///////////////////////////////////////////////////////////////////////////////
-#if !defined(BOOST_PP_IS_ITERATING)
-
-# ifndef SIGNATURE_JDG20020813_HPP
-#  define SIGNATURE_JDG20020813_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/mpl/if.hpp>
-# include <boost/type_traits/is_convertible.hpp>
-
-#  include <boost/python/detail/preprocessor.hpp>
-#  include <boost/preprocessor/repeat.hpp>
-#  include <boost/preprocessor/enum.hpp>
-#  include <boost/preprocessor/enum_params.hpp>
-#  include <boost/preprocessor/empty.hpp>
-#  include <boost/preprocessor/arithmetic/sub.hpp>
-#  include <boost/preprocessor/iterate.hpp>
-#  include <boost/python/detail/type_list.hpp>
-
-#  include <boost/preprocessor/debug/line.hpp>
-#  include <boost/preprocessor/arithmetic/sub.hpp>
-#  include <boost/preprocessor/arithmetic/inc.hpp>
-#  include <boost/preprocessor/repetition/enum_trailing_params.hpp>
-
-# define BOOST_PYTHON_LIST_INC(n)        \
-   BOOST_PP_CAT(mpl::vector, BOOST_PP_INC(n))
-
-///////////////////////////////////////////////////////////////////////////////
-namespace boost { namespace python { namespace detail {
-
-// A metafunction returning C1 if C1 is derived from C2, and C2
-// otherwise
-template <class C1, class C2>
-struct most_derived
-{
-    typedef typename mpl::if_<
-        is_convertible<C1*,C2*>
-      , C1
-      , C2
-    >::type type;
-};
-
-//  The following macros generate expansions for::
-//
-//      template <class RT, class T0... class TN>
-//      inline mpl::vector<RT, T0...TN>
-//      get_signature(RT(*)(T0...TN), void* = 0)
-//      {
-//          return mpl::list<RT, T0...TN>();
-//      }
-//
-//   And, for an appropriate assortment of cv-qualifications::
-//
-//      template <class RT, class ClassT, class T0... class TN>
-//      inline mpl::vector<RT, ClassT&, T0...TN>
-//      get_signature(RT(ClassT::*)(T0...TN) cv))
-//      {
-//          return mpl::list<RT, ClassT&, T0...TN>();
-//      }
-//
-//      template <class Target, class RT, class ClassT, class T0... class TN>
-//      inline mpl::vector<
-//          RT
-//        , typename most_derived<Target, ClassT>::type&
-//        , T0...TN
-//      >
-//      get_signature(RT(ClassT::*)(T0...TN) cv), Target*)
-//      {
-//          return mpl::list<RT, ClassT&, T0...TN>();
-//      }
-//
-//  There are two forms for invoking get_signature::
-//
-//      get_signature(f)
-//
-//  and ::
-//
-//      get_signature(f,(Target*)0)
-//
-//  These functions extract the return type, class (for member
-//  functions) and arguments of the input signature and stuff them in
-//  an mpl type sequence.  Note that cv-qualification is dropped from
-//  the "hidden this" argument of member functions; that is a
-//  necessary sacrifice to ensure that an lvalue from_python converter
-//  is used.  A pointer is not used so that None will be rejected for
-//  overload resolution.
-//
-//  The second form of get_signature essentially downcasts the "hidden
-//  this" argument of member functions to Target, because the function
-//  may actually be a member of a base class which is not wrapped, and
-//  in that case conversion from python would fail.
-//
-// @group {
-
-#  define BOOST_PP_ITERATION_PARAMS_1                                   \
-    (3, (0, BOOST_PYTHON_MAX_ARITY, <boost/python/signature.hpp>))
-
-#  include BOOST_PP_ITERATE()
-#  undef BOOST_PYTHON_LIST_INC
-
-// }
-
-}}} // namespace boost::python::detail
-
-
-# endif // SIGNATURE_JDG20020813_HPP
-
-#elif BOOST_PP_ITERATION_DEPTH() == 1 // defined(BOOST_PP_IS_ITERATING)
-
-# define N BOOST_PP_ITERATION()
-
-template <
-    class RT BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class T)>
-inline BOOST_PYTHON_LIST_INC(N)<
-    RT BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, T)>
-get_signature(RT(*)(BOOST_PP_ENUM_PARAMS_Z(1, N, T)), void* = 0)
-{
-    return BOOST_PYTHON_LIST_INC(N)<
-            RT BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, T)
-        >();
-}
-
-# undef N
-
-# define BOOST_PP_ITERATION_PARAMS_2 \
-    (3, (0, 3, <boost/python/signature.hpp>))
-# include BOOST_PP_ITERATE()
-
-#else
-
-# define N BOOST_PP_RELATIVE_ITERATION(1)
-# define Q BOOST_PYTHON_CV_QUALIFIER(BOOST_PP_ITERATION())
-
-template <
-    class RT, class ClassT BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class T)>
-inline BOOST_PYTHON_LIST_INC(BOOST_PP_INC(N))<
-    RT, ClassT& BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, T)>
-get_signature(RT(ClassT::*)(BOOST_PP_ENUM_PARAMS_Z(1, N, T)) Q)
-{
-    return BOOST_PYTHON_LIST_INC(BOOST_PP_INC(N))<
-            RT, ClassT& BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, T)
-        >();
-}
-
-template <
-    class Target
-  , class RT
-  , class ClassT
-    BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, class T)
->
-inline BOOST_PYTHON_LIST_INC(BOOST_PP_INC(N))<
-    RT
-  , typename most_derived<Target, ClassT>::type&
-    BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, T)
->
-get_signature(
-    RT(ClassT::*)(BOOST_PP_ENUM_PARAMS_Z(1, N, T)) Q
-  , Target*
-)
-{
-    return BOOST_PYTHON_LIST_INC(BOOST_PP_INC(N))<
-        RT
-      , BOOST_DEDUCED_TYPENAME most_derived<Target, ClassT>::type&
-        BOOST_PP_ENUM_TRAILING_PARAMS_Z(1, N, T)
-    >();
-}
-
-# undef Q
-# undef N
-
-#endif // !defined(BOOST_PP_IS_ITERATING)
diff --git a/include/boost/python/slice_nil.hpp b/include/boost/python/slice_nil.hpp
deleted file mode 100644
index b77d06cb..00000000
--- a/include/boost/python/slice_nil.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef SLICE_NIL_DWA2002620_HPP
-# define SLICE_NIL_DWA2002620_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-namespace boost { namespace python { namespace api {
-
-class object;
-
-enum slice_nil
-{
-# ifndef _ // Watch out for GNU gettext users, who #define _(x)
-      _
-# endif 
-};
-
-template <class T>
-struct slice_bound
-{
-    typedef object type;
-};
-
-template <>
-struct slice_bound<slice_nil>
-{
-    typedef slice_nil type;
-};
-
-}
-
-using api::slice_nil;
-# ifndef _ // Watch out for GNU gettext users, who #define _(x)
-using api::_;
-# endif 
-
-}} // namespace boost::python
-
-#endif // SLICE_NIL_DWA2002620_HPP
diff --git a/include/boost/python/str.hpp b/include/boost/python/str.hpp
deleted file mode 100644
index 024712f1..00000000
--- a/include/boost/python/str.hpp
+++ /dev/null
@@ -1,415 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef STR_20020703_HPP
-#define STR_20020703_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-#include <boost/python/object.hpp>
-#include <boost/python/list.hpp>
-#include <boost/python/converter/pytype_object_mgr_traits.hpp>
-
-// disable defines in <cctype> provided by some system libraries
-#undef isspace
-#undef islower
-#undef isalpha
-#undef isdigit
-#undef isalnum
-#undef isupper
-
-namespace boost { namespace python {
-
-class str;
-
-namespace detail
-{
-  struct BOOST_PYTHON_DECL str_base : object
-  {
-      str capitalize() const;
-
-      str center(object_cref width) const;
-
-      long count(object_cref sub) const;
-
-      long count(object_cref sub, object_cref start) const;
-    
-      long count(object_cref sub, object_cref start, object_cref end) const;
-
-      object decode() const;
-      object decode(object_cref encoding) const;
-
-      object decode(object_cref encoding, object_cref errors) const;
-
-      object encode() const;
-      object encode(object_cref encoding) const;
-      object encode(object_cref encoding, object_cref errors) const;
-
-      bool endswith(object_cref suffix) const;
-    
-      bool endswith(object_cref suffix, object_cref start) const;
-      bool endswith(object_cref suffix, object_cref start, object_cref end) const;
-    
-      str expandtabs() const;
-      str expandtabs(object_cref tabsize) const;
-
-      long find(object_cref sub) const;
-      long find(object_cref sub, object_cref start) const;
-
-      long find(object_cref sub, object_cref start, object_cref end) const;
-
-      long index(object_cref sub) const;
-
-      long index(object_cref sub, object_cref start) const;
-      long index(object_cref sub, object_cref start, object_cref end) const;
-
-      bool isalnum() const;
-      bool isalpha() const;
-      bool isdigit() const;
-      bool islower() const;
-      bool isspace() const;
-      bool istitle() const;
-      bool isupper() const;
-    
-      str join(object_cref sequence) const;
-
-      str ljust(object_cref width) const;
-      str lower() const;
-      str lstrip() const;
-
-      str replace(object_cref old, object_cref new_) const;
-      str replace(object_cref old, object_cref new_, object_cref maxsplit) const;
-      long rfind(object_cref sub) const;
-
-      long rfind(object_cref sub, object_cref start) const;
-
-      long rfind(object_cref sub, object_cref start, object_cref end) const;
-      long rindex(object_cref sub) const;
-      long rindex(object_cref sub, object_cref start) const;
-
-
-      long rindex(object_cref sub, object_cref start, object_cref end) const;
-
-      str rjust(object_cref width) const;
-    
-      str rstrip() const;
-    
-      list split() const; 
-      list split(object_cref sep) const;
-   
-      list split(object_cref sep, object_cref maxsplit) const; 
-    
-
-      list splitlines() const;
-      list splitlines(object_cref keepends) const;
-
-      bool startswith(object_cref prefix) const;
-
-
-      bool startswith(object_cref prefix, object_cref start) const;
-      bool startswith(object_cref prefix, object_cref start, object_cref end) const;
-
-      str strip() const;
-      str swapcase() const;
-      str title() const;
-    
-      str translate(object_cref table) const;
-
-      str translate(object_cref table, object_cref deletechars) const;
-
-    
-      str upper() const;
-
-   protected:
-      str_base(); // new str
-    
-      str_base(const char* s); // new str
-
-      str_base(char const* start, char const* finish);
-      
-      str_base(char const* start, std::size_t length);
-      
-      explicit str_base(object_cref other);
-
-      BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(str_base, object)
-   private:
-      static new_reference call(object const&);
-  };
-}
-
-
-class str : public detail::str_base
-{
-    typedef detail::str_base base;
- public:
-    str() {} // new str
-    
-    str(const char* s) : base(s) {} // new str
-    
-    str(char const* start, char const* finish) // new str
-      : base(start, finish)
-    {}
-    
-    str(char const* start, std::size_t length) // new str
-      : base(start, length)
-    {}
-    
-    template <class T>
-    explicit str(T const& other)
-        : base(object(other))
-    {
-    }
-
-    template <class T>
-    str center(T const& width) const
-    {
-        return base::center(object(width));
-    }
-
-    template<class T>
-    long count(T const& sub) const
-    {
-        return base::count(object(sub));
-    }
-
-    template<class T1, class T2>
-    long count(T1 const& sub,T2 const& start) const
-    {
-        return base::count(object(sub), object(start));
-    }
-
-    template<class T1, class T2, class T3>
-    long count(T1 const& sub,T2 const& start, T3 const& end) const
-    {
-        return base::count(object(sub), object(start));
-    }
-
-    object decode() const { return base::decode(); }
-    
-    template<class T>
-    object decode(T const& encoding) const
-    {
-        return base::decode(object(encoding));
-    }
-
-    template<class T1, class T2>
-    object decode(T1 const& encoding, T2 const& errors) const
-    {
-        return base::decode(object(encoding),object(errors));
-    }
-
-    object encode() const { return base::encode(); }
-
-    template <class T>
-    object encode(T const& encoding) const
-    {
-        return base::encode(object(encoding));
-    }
-
-    template <class T1, class T2>
-    object encode(T1 const& encoding, T2 const& errors) const
-    {
-        return base::encode(object(encoding),object(errors));
-    }
-
-    template <class T>
-    bool endswith(T const& suffix) const
-    {
-        return base::endswith(object(suffix));
-    }
-
-    template <class T1, class T2>
-    bool endswith(T1 const& suffix, T2 const& start) const
-    {
-        return base::endswith(object(suffix), object(start));
-    }
-
-    template <class T1, class T2, class T3>
-    bool endswith(T1 const& suffix, T2 const& start, T3 const& end) const
-    {
-        return base::endswith(object(suffix), object(start), object(end));
-    }
-    
-    str expandtabs() const { return base::expandtabs(); }
-
-    template <class T>
-    str expandtabs(T const& tabsize) const
-    {
-        return base::expandtabs(object(tabsize));
-    }
-    
-    template <class T>
-    long find(T const& sub) const
-    {
-        return base::find(object(sub));
-    }
-
-    template <class T1, class T2>
-    long find(T1 const& sub, T2 const& start) const
-    {
-        return base::find(object(sub), object(start));
-    }
-
-    template <class T1, class T2, class T3>
-    long find(T1 const& sub, T2 const& start, T3 const& end) const
-    {
-        return base::find(object(sub), object(start), object(end));
-    }
-    
-    template <class T>
-    long index(T const& sub) const
-    {
-        return base::index(object(sub));
-    }
-    
-    template <class T1, class T2>
-    long index(T1 const& sub, T2 const& start) const
-    {
-        return base::index(object(sub), object(start));
-    }
-
-    template <class T1, class T2, class T3>
-    long index(T1 const& sub, T2 const& start, T3 const& end) const
-    {
-        return base::index(object(sub), object(start), object(end));
-    }
-
-    template <class T>
-    str join(T const& sequence) const
-    {
-        return base::join(object(sequence));
-    }
-    
-    template <class T>
-    str ljust(T const& width) const
-    {
-        return base::ljust(object(width));
-    }
-
-    template <class T1, class T2>
-    str replace(T1 const& old, T2 const& new_) const 
-    {
-        return base::replace(object(old),object(new_));
-    }
-
-    template <class T1, class T2, class T3>
-    str replace(T1 const& old, T2 const& new_, T3 const& maxsplit) const 
-    {
-        return base::replace(object(old),object(new_), object(maxsplit));
-    }
-    
-    template <class T>
-    long rfind(T const& sub) const
-    {
-        return base::rfind(object(sub));
-    }
-
-    template <class T1, class T2>
-    long rfind(T1 const& sub, T2 const& start) const
-    {
-        return base::rfind(object(sub), object(start));
-    }
-    
-    template <class T1, class T2, class T3>
-    long rfind(T1 const& sub, T2 const& start, T3 const& end) const
-    {
-        return base::rfind(object(sub), object(start), object(end));
-    }
-    
-    template <class T>
-    long rindex(T const& sub) const
-    {
-        return base::rindex(object(sub));
-    }
-
-    template <class T1, class T2>
-    long rindex(T1 const& sub, T2 const& start) const
-    {
-        return base::rindex(object(sub), object(start));
-    }
-
-    template <class T1, class T2, class T3>
-    long rindex(T1 const& sub, T2 const& start, T3 const& end) const
-    {
-        return base::rindex(object(sub), object(start), object(end));
-    }
-
-    template <class T>
-    str rjust(T const& width) const
-    {
-        return base::rjust(object(width));
-    }
-    
-    list split() const { return base::split(); }
-   
-    template <class T>
-    list split(T const& sep) const
-    {
-        return base::split(object(sep));
-    }
-
-    template <class T1, class T2>
-    list split(T1 const& sep, T2 const& maxsplit) const
-    {
-        return base::split(object(sep), object(maxsplit));
-    }
-
-    list splitlines() const { return base::splitlines(); }
-
-    template <class T>
-    list splitlines(T const& keepends) const
-    {
-        return base::splitlines(object(keepends));
-    }
-
-    template <class T>
-    bool startswith(T const& prefix) const
-    {
-        return base::startswith(object(prefix));
-    }
-
-    template <class T1, class T2>
-    bool startswith(T1 const& prefix, T2 const& start) const
-    {
-        return base::startswith(object(prefix), object(start));
-    }
-     
-    template <class T1, class T2, class T3>
-    bool startswith(T1 const& prefix, T2 const& start, T3 const& end) const
-    {
-        return base::startswith(object(prefix), object(start), object(end));
-    }
-
-    template <class T>
-    str translate(T const& table) const
-    {
-        return base::translate(object(table));
-    }
-
-    template <class T1, class T2>
-    str translate(T1 const& table, T2 const& deletechars) const
-    {
-        return base::translate(object(table), object(deletechars));
-    }
-    
- public: // implementation detail -- for internal use only
-    BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(str, base)
-};
-
-//
-// Converter Specializations
-//
-namespace converter
-{
-  template <>
-  struct object_manager_traits<str>
-      : pytype_object_manager_traits<&PyString_Type,str>
-  {
-  };
-}
-
-}}  // namespace boost::python
-
-#endif // STR_20020703_HPP
diff --git a/include/boost/python/suite/indexing/container_utils.hpp b/include/boost/python/suite/indexing/container_utils.hpp
deleted file mode 100644
index 2370fa8d..00000000
--- a/include/boost/python/suite/indexing/container_utils.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-
-//  (C) Copyright Joel de Guzman 2003.
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies. This
-//  software is provided "as is" without express or implied warranty, and
-//  with no claim as to its suitability for any purpose.
-
-#ifndef PY_CONTAINER_UTILS_JDG20038_HPP
-# define PY_CONTAINER_UTILS_JDG20038_HPP
-
-# include <boost/python/object.hpp>
-# include <boost/python/handle.hpp>
-# include <boost/python/extract.hpp>
-
-namespace boost { namespace python { namespace container_utils {
-        
-    template <typename Container>
-    void
-    extend_container(Container& container, object l)
-    {
-        typedef typename Container::value_type data_type;
-        
-        //  l must be a list or some container
-
-        for (int i = 0; i < l.attr("__len__")(); i++)
-        {
-            object elem(l[i]);
-            extract<data_type const&> x(elem);
-            //  try if elem is an exact data_type type
-            if (x.check())
-            {
-                container.push_back(x());
-            }
-            else
-            {
-                //  try to convert elem to data_type type
-                extract<data_type> x(elem);
-                if (x.check())
-                {
-                    container.push_back(x());
-                }
-                else
-                {
-                    PyErr_SetString(PyExc_TypeError, "Incompatible Data Type");
-                    throw_error_already_set();
-                }
-            }
-        }          
-    }
-
-}}} // namespace boost::python::container_utils
-
-#endif
diff --git a/include/boost/python/suite/indexing/detail/indexing_suite_detail.hpp b/include/boost/python/suite/indexing/detail/indexing_suite_detail.hpp
deleted file mode 100644
index 10aa0954..00000000
--- a/include/boost/python/suite/indexing/detail/indexing_suite_detail.hpp
+++ /dev/null
@@ -1,706 +0,0 @@
-//  (C) Copyright Joel de Guzman 2003.
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies. This
-//  software is provided "as is" without express or implied warranty, and
-//  with no claim as to its suitability for any purpose.
-
-#ifndef INDEXING_SUITE_DETAIL_JDG20036_HPP
-# define INDEXING_SUITE_DETAIL_JDG20036_HPP
-
-# include <boost/python/extract.hpp>
-# include <boost/scoped_ptr.hpp>
-# include <boost/detail/binary_search.hpp>
-# include <boost/get_pointer.hpp>
-# include <vector>
-# include <map>
-
-namespace boost { namespace python { namespace detail {
-
-#if defined(NDEBUG)
-#define BOOST_PYTHON_INDEXING_CHECK_INVARIANT
-#else
-#define BOOST_PYTHON_INDEXING_CHECK_INVARIANT check_invariant()
-#endif
-    
-    template <class Proxy>
-    struct compare_proxy_index
-    {
-        //  This functor compares a proxy and an index.
-        //  This is used by proxy_group::first_proxy to
-        //  get first proxy with index i.
-                
-        template <class Index>
-        bool operator()(PyObject* prox, Index i) const
-        {
-            typedef typename Proxy::policies_type policies_type;
-            Proxy& proxy = extract<Proxy&>(prox)();
-            return policies_type::
-                compare_index(proxy.get_container(), proxy.get_index(), i);
-        }
-    };        
- 
-    //  The proxy_group class holds a vector of container element
-    //  proxies. First, what is a container element proxy? A container 
-    //  element proxy acts like a smart pointer holding a reference to 
-    //  a container and an index (see container_element, for details). 
-    //
-    //  The proxies are held in a vector always sorted by its index.
-    //  Various functions manage the addition, removal and searching
-    //  of proxies from the vector.
-    //
-    template <class Proxy>
-    class proxy_group
-    {
-    public:
-    
-        typedef typename std::vector<PyObject*>::const_iterator const_iterator;
-        typedef typename std::vector<PyObject*>::iterator iterator;
-        typedef typename Proxy::index_type index_type;
-        typedef typename Proxy::policies_type policies_type;
-        
-        iterator
-        first_proxy(index_type i)
-        {
-            // Return the first proxy with index <= i
-            return boost::detail::lower_bound(
-                proxies.begin(), proxies.end(), 
-                i, compare_proxy_index<Proxy>());
-        }
-
-        void
-        remove(Proxy& proxy)
-        {
-            // Remove a proxy
-            for (iterator iter = first_proxy(proxy.get_index());
-                iter != proxies.end(); ++iter)
-            {
-                if (&extract<Proxy&>(*iter)() == &proxy)
-                {
-                    proxies.erase(iter);
-                    break;
-                }
-            }
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-        }
-
-        void
-        add(PyObject* prox)
-        {
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-            // Add a proxy
-            proxies.insert(
-                first_proxy(extract<Proxy&>(prox)().get_index()), prox);
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-        }
-
-        void
-        erase(index_type i, mpl::false_)
-        {
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-            // Erase the proxy with index i 
-            replace(i, i+1, 0);
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-        }
-
-        void
-        erase(index_type i, mpl::true_)
-        {
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-            // Erase the proxy with index i 
-            
-            iterator iter = first_proxy(i);
-            extract<Proxy&> p(*iter);
-            
-            if (iter != proxies.end() && p().get_index() == i)
-            {
-                extract<Proxy&> p(*iter);
-                p().detach();
-                proxies.erase(iter);
-            }
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-        }
-
-        void
-        erase(index_type from, index_type to)
-        {
-            // note: this cannot be called when container is not sliceable
-            
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-            // Erase all proxies with indexes from..to 
-            replace(from, to, 0);
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-        }
-
-        void
-        replace(
-            index_type from, 
-            index_type to, 
-            typename std::vector<PyObject*>::size_type len)
-        {
-            // note: this cannot be called when container is not sliceable
-
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-            // Erase all proxies with indexes from..to.
-            // Adjust the displaced indexes such that the
-            // final effect is that we have inserted *len*
-            // number of proxies in the vacated region. This
-            // procedure involves adjusting the indexes of 
-            // the proxies.
-            
-            iterator left = first_proxy(from);
-            iterator right = proxies.end(); // we'll adjust this later
-            
-            for (iterator iter = left; iter != right; ++iter)
-            {
-                if (extract<Proxy&>(*iter)().get_index() > to)
-                {
-                    right = iter; // adjust right
-                    break;
-                }
-                extract<Proxy&> p(*iter);
-                p().detach();
-            }
-            
-            typename std::vector<PyObject*>::size_type 
-                offset = left-proxies.begin();
-            proxies.erase(left, right);
-            right = proxies.begin()+offset;
-
-            while (right != proxies.end())
-            {
-                typedef typename Proxy::container_type::difference_type difference_type;
-                extract<Proxy&> p(*right);
-                p().set_index(
-                    extract<Proxy&>(*right)().get_index() 
-                    - (difference_type(to) - from - len)
-                );
-                    
-                ++right;
-            }
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-        }
-        
-        PyObject*
-        find(index_type i)
-        {
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-            // Find the proxy with *exact* index i.
-            // Return 0 (null) if no proxy with the 
-            // given index is found.
-            iterator iter = first_proxy(i);
-            if (iter != proxies.end()
-                && extract<Proxy&>(*iter)().get_index() == i)
-            {
-                BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-                return *iter;
-            }
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-            return 0;
-        }
-
-        typename std::vector<PyObject*>::size_type 
-        size() const
-        {
-            BOOST_PYTHON_INDEXING_CHECK_INVARIANT;
-            // How many proxies are there so far?
-            return proxies.size();
-        } 
-
-    private:
-
-#if !defined(NDEBUG)
-        void
-        check_invariant() const
-        {
-            for (const_iterator i = proxies.begin(); i != proxies.end(); ++i)
-            {
-                if ((*i)->ob_refcnt <= 0)
-                {
-                    PyErr_SetString(PyExc_RuntimeError, 
-                        "Invariant: Proxy vector in an inconsistent state");
-                    throw_error_already_set();
-                }
-                
-                if (i+1 != proxies.end())
-                {
-                    if (extract<Proxy&>(*(i+1))().get_index() ==
-                        extract<Proxy&>(*(i))().get_index())
-                    {
-                        PyErr_SetString(PyExc_RuntimeError, 
-                            "Invariant: Proxy vector in an inconsistent state (duplicate proxy)");
-                        throw_error_already_set();
-                    }
-                }
-            }
-        }
-#endif
-        
-        std::vector<PyObject*> proxies;
-    };
-            
-    // proxy_links holds a map of Container pointers (keys)
-    // with proxy_group(s) (data). Various functions manage 
-    // the addition, removal and searching of proxies from 
-    // the map.
-    //
-    template <class Proxy, class Container>
-    class proxy_links
-    {
-    public:
-    
-        typedef std::map<Container*, proxy_group<Proxy> > links_t;
-        typedef typename Proxy::index_type index_type;
-
-        void
-        remove(Proxy& proxy)
-        {
-            // Remove a proxy.
-            typename links_t::iterator r = links.find(&proxy.get_container());
-            if (r != links.end())
-            {
-                r->second.remove(proxy);
-                if (r->second.size() == 0)
-                    links.erase(r);
-            }
-        }
-        
-        void
-        add(PyObject* prox, Container& container)
-        {
-            // Add a proxy
-            links[&container].add(prox);
-        }
-        
-        template <class NoSlice>
-        void erase(Container& container, index_type i, NoSlice no_slice)
-        {
-            // Erase the proxy with index i 
-            typename links_t::iterator r = links.find(&container);
-            if (r != links.end())
-            {
-                r->second.erase(i, no_slice);
-                if (r->second.size() == 0)
-                    links.erase(r);
-            }
-        }
-        
-        void
-        erase(Container& container, index_type from, index_type to)
-        {
-            // Erase all proxies with indexes from..to 
-            typename links_t::iterator r = links.find(&container);
-            if (r != links.end())
-            {
-                r->second.erase(from, to);
-                if (r->second.size() == 0)
-                    links.erase(r);
-            }
-        }
-
-        void
-        replace(
-            Container& container, 
-            index_type from, index_type to, index_type len)
-        {
-            // Erase all proxies with indexes from..to.
-            // Adjust the displaced indexes such that the
-            // final effect is that we have inserted *len*
-            // number of proxies in the vacated region. This
-            // procedure involves adjusting the indexes of 
-            // the proxies.
-
-            typename links_t::iterator r = links.find(&container);
-            if (r != links.end())
-            {
-                r->second.replace(from, to, len);
-                if (r->second.size() == 0)
-                    links.erase(r);
-            }
-        }
-        
-        PyObject*
-        find(Container& container, index_type i)
-        {
-            // Find the proxy with *exact* index i.
-            // Return 0 (null) if no proxy with the given 
-            // index is found.
-            typename links_t::iterator r = links.find(&container);
-            if (r != links.end())
-                return r->second.find(i);
-            return 0;
-        }
-
-    private:
-    
-        links_t links;
-    };
-    
-    // container_element is our container proxy class.
-    // This class acts like a smart pointer to a container
-    // element. The class holds an index and a reference to
-    // a container. Dereferencing the smart pointer will
-    // retrieve the nth (index) element from the container.
-    //
-    // A container_element can also be detached from the
-    // container. In such a detached state, the container_element
-    // holds a copy of the nth (index) element, which it 
-    // returns when dereferenced.
-    //
-    template <class Container, class Index, class Policies>
-    class container_element
-    {
-    public:
-    
-        typedef Index index_type;
-        typedef Container container_type;
-        typedef typename Policies::data_type element_type;
-        typedef Policies policies_type;
-        typedef container_element<Container, Index, Policies> self_t;
-        typedef proxy_group<self_t> links_type;
-        
-        container_element(object container, Index index)
-            : ptr()
-            , container(container)
-            , index(index)
-        {
-        }
-            
-        container_element(container_element const& ce)
-            : ptr(ce.ptr.get() == 0 ? 0 : new element_type(*ce.ptr.get()))
-            , container(ce.container)
-            , index(ce.index)
-        {
-        }
-
-        ~container_element()
-        {
-            if (!is_detached())
-                get_links().remove(*this);
-        }
-                      
-        element_type& operator*() const
-        {
-            if (is_detached())
-                return *ptr.get();
-            return Policies::get_item(get_container(), index);
-        }
-        
-        element_type* get() const
-        {
-            if (is_detached())
-                return ptr.get();
-            return &Policies::get_item(get_container(), index);
-        }
-        
-        void
-        detach()
-        {
-            if (!is_detached())
-            {
-                ptr.reset(
-                    new element_type(
-                        Policies::get_item(get_container(), index)));
-                container = object(); // free container. reset it to None
-            }
-        }
-        
-        bool
-        is_detached() const
-        {
-            return ptr.get() != 0;
-        }
-
-        Container& 
-        get_container() const
-        {
-            return extract<Container&>(container)();
-        }
-        
-        Index 
-        get_index() const
-        {
-            return index;
-        }
-
-        void 
-        set_index(Index i)
-        {
-            index = i;
-        }
- 
-        static proxy_links<self_t, Container>&
-        get_links()
-        {
-            // All container_element(s) maintain links to
-            // its container in a global map (see proxy_links).
-            // This global "links" map is a singleton.
-            
-            static proxy_links<self_t, Container> links;
-            return links; // singleton
-        }
-
-    private:
-            
-        container_element& operator=(container_element const& ce);
-
-        scoped_ptr<element_type> ptr;
-        object container;
-        Index index;
-    };
-
-    template <
-          class Container
-        , class DerivedPolicies
-        , class ContainerElement
-        , class Index
-    >
-    struct no_proxy_helper
-    {                
-        static void
-        register_container_element()
-        { 
-        }
-
-        static object
-        base_get_item_(back_reference<Container&> const& container, PyObject* i)
-        { 
-            return object(
-                DerivedPolicies::get_item(
-                    container.get(), DerivedPolicies::
-                        convert_index(container.get(), i)));
-        }
-
-        static void
-        base_replace_indexes(
-            Container& container, Index from, 
-            Index to, Index n)
-        {
-        }
-
-        template <class NoSlice>
-        static void
-        base_erase_index(
-            Container& container, Index i, NoSlice no_slice)
-        {
-        }
-        
-        static void
-        base_erase_indexes(Container& container, Index from, Index to)
-        {
-        }
-    };            
-          
-    template <
-          class Container
-        , class DerivedPolicies
-        , class ContainerElement
-        , class Index
-    >
-    struct proxy_helper
-    {        
-        static void
-        register_container_element()
-        { 
-            register_ptr_to_python<ContainerElement>();
-        }
-
-        static object
-        base_get_item_(back_reference<Container&> const& container, PyObject* i)
-        { 
-            // Proxy  
-            Index idx = DerivedPolicies::convert_index(container.get(), i);
-            
-            if (PyObject* shared = 
-                ContainerElement::get_links().find(container.get(), idx))
-            {
-                handle<> h(python::borrowed(shared));
-                return object(h);
-            }
-            else
-            {
-                object prox(ContainerElement(container.source(), idx));
-                ContainerElement::
-                    get_links().add(prox.ptr(), container.get());
-                return prox;
-            }
-        }
-
-        static void
-        base_replace_indexes(
-            Container& container, Index from, 
-            Index to, Index n)
-        {
-            ContainerElement::get_links().replace(container, from, to, n);
-        }
-        
-        template <class NoSlice>
-        static void
-        base_erase_index(
-            Container& container, Index i, NoSlice no_slice)
-        {
-            ContainerElement::get_links().erase(container, i, no_slice);
-        }
-        
-        static void
-        base_erase_indexes(
-            Container& container, Index from, Index to)
-        {
-            ContainerElement::get_links().erase(container, from, to);
-        }
-    };        
-    
-    template <
-          class Container
-        , class DerivedPolicies
-        , class ProxyHandler
-        , class Data
-        , class Index
-    >
-    struct slice_helper
-    {        
-        static object 
-        base_get_slice(Container& container, PySliceObject* slice)
-        { 
-            Index from, to;
-            base_get_slice_data(container, slice, from, to);
-            return DerivedPolicies::get_slice(container, from, to);
-        }
-
-        static void
-        base_get_slice_data(
-            Container& container, PySliceObject* slice, Index& from, Index& to)
-        {
-            if (Py_None == slice->start)
-                from = DerivedPolicies::get_min_index(container);
-            else 
-                from = DerivedPolicies::convert_index(container, slice->start);
-
-            if (Py_None == slice->stop)
-                to = DerivedPolicies::get_max_index(container);
-            else 
-                to = DerivedPolicies::convert_index(container, slice->stop);
-        }        
-   
-        static void 
-        base_set_slice(Container& container, PySliceObject* slice, PyObject* v)
-        {
-            Index from, to;
-            base_get_slice_data(container, slice, from, to);
-            
-            extract<Data&> elem(v);
-            // try if elem is an exact Data
-            if (elem.check())
-            {
-                ProxyHandler::base_replace_indexes(container, from, to, 1);
-                DerivedPolicies::set_slice(container, from, to, elem());
-            }
-            else
-            {
-                //  try to convert elem to Data
-                extract<Data> elem(v);
-                if (elem.check())
-                {
-                    ProxyHandler::base_replace_indexes(container, from, to, 1);
-                    DerivedPolicies::set_slice(container, from, to, elem());
-                }
-                else
-                {
-                    //  Otherwise, it must be a list or some container
-                    handle<> l_(python::borrowed(v));
-                    object l(l_);
-    
-                    std::vector<Data> temp;
-                    for (int i = 0; i < l.attr("__len__")(); i++)
-                    {
-                        object elem(l[i]);
-                        extract<Data const&> x(elem);
-                        //  try if elem is an exact Data type
-                        if (x.check())
-                        {
-                            temp.push_back(x());
-                        }
-                        else
-                        {
-                            //  try to convert elem to Data type
-                            extract<Data> x(elem);
-                            if (x.check())
-                            {
-                                temp.push_back(x());
-                            }
-                            else
-                            {
-                                PyErr_SetString(PyExc_TypeError, 
-                                    "Invalid sequence element");
-                                throw_error_already_set();
-                            }
-                        }
-                    }          
-                  
-                    ProxyHandler::base_replace_indexes(container, from, to, 
-                        temp.end()-temp.begin());
-                    DerivedPolicies::set_slice(container, from, to, 
-                        temp.begin(), temp.end());
-                }
-            }            
-        }
-        
-        static void 
-        base_delete_slice(Container& container, PySliceObject* slice)
-        { 
-            Index from, to;
-            base_get_slice_data(container, slice, from, to);
-            ProxyHandler::base_erase_indexes(container, from, to);
-            DerivedPolicies::delete_slice(container, from, to);
-        }  
-    };
-    
-    template <
-          class Container
-        , class DerivedPolicies
-        , class ProxyHandler
-        , class Data
-        , class Index
-    >
-    struct no_slice_helper
-    {        
-        static void
-        slicing_not_suported()
-        {
-            PyErr_SetString(PyExc_RuntimeError, "Slicing not supported");
-            throw_error_already_set();
-        }
-        
-        static object 
-        base_get_slice(Container& container, PySliceObject* slice)
-        { 
-            slicing_not_suported();
-            return object();
-        }
-   
-        static void 
-        base_set_slice(Container& container, PySliceObject* slice, PyObject* v)
-        {
-            slicing_not_suported();
-        }
-        
-        static void 
-        base_delete_slice(Container& container, PySliceObject* slice)
-        { 
-            slicing_not_suported();
-        }  
-    };
-
-  }}  // namespace python::detail
-
-    template <class Container, class Index, class Policies>
-    inline typename Policies::data_type* 
-    get_pointer(
-        python::detail::container_element<Container, Index, Policies> const& p)
-    {
-        // Get the pointer of a container_element smart pointer
-        return p.get();
-    }
-
-} // namespace boost
-
-#endif // INDEXING_SUITE_DETAIL_JDG20036_HPP
diff --git a/include/boost/python/suite/indexing/indexing_suite.hpp b/include/boost/python/suite/indexing/indexing_suite.hpp
deleted file mode 100644
index e2dc4a85..00000000
--- a/include/boost/python/suite/indexing/indexing_suite.hpp
+++ /dev/null
@@ -1,300 +0,0 @@
-//  (C) Copyright Joel de Guzman 2003.
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies. This
-//  software is provided "as is" without express or implied warranty, and
-//  with no claim as to its suitability for any purpose.
-
-#ifndef INDEXING_SUITE_JDG20036_HPP
-# define INDEXING_SUITE_JDG20036_HPP
-
-# include <boost/python/class.hpp>
-# include <boost/python/def_visitor.hpp>
-# include <boost/python/register_ptr_to_python.hpp>
-# include <boost/python/suite/indexing/detail/indexing_suite_detail.hpp>
-# include <boost/python/return_internal_reference.hpp>
-# include <boost/python/iterator.hpp>
-# include <boost/mpl/or.hpp>
-# include <boost/mpl/not.hpp>
-
-namespace boost { namespace python {
-                   
-    // indexing_suite class. This class is the protocol class for
-    // the management of C++ containers intended to be integrated
-    // to Python. The objective is make a C++ container look and
-    // feel and behave exactly as we'd expect a Python container.
-    // By default indexed elements are returned by proxy. This can be
-    // disabled by supplying *true* in the NoProxy template parameter.
-    // 
-    // Derived classes provide the hooks needed by the indexing_suite
-    // to do its job:
-    //
-    //      static data_type& 
-    //      get_item(Container& container, index_type i);
-    //
-    //      static object 
-    //      get_slice(Container& container, index_type from, index_type to);
-    //
-    //      static void 
-    //      set_item(Container& container, index_type i, data_type const& v);
-    //
-    //      static void 
-    //      set_slice(
-    //         Container& container, index_type from, 
-    //         index_type to, data_type const& v
-    //      );
-    //
-    //      template <class Iter>
-    //      static void 
-    //      set_slice(Container& container, index_type from, 
-    //          index_type to, Iter first, Iter last
-    //      );
-    //
-    //      static void 
-    //      delete_item(Container& container, index_type i);
-    //        
-    //      static void 
-    //      delete_slice(Container& container, index_type from, index_type to);
-    //        
-    //      static size_t
-    //      size(Container& container);
-    //
-    //      template <class T>
-    //      static bool
-    //      contains(Container& container, T const& val);
-    //        
-    //      static index_type
-    //      convert_index(Container& container, PyObject* i);
-    //        
-    //      static index_type
-    //      adjust_index(index_type current, index_type from, 
-    //          index_type to, size_type len
-    //      );
-    //
-    // Most of these policies are self explanatory. convert_index and 
-    // adjust_index, however, deserves some explanation. 
-    //
-    // convert_index converts an Python index into a C++ index that the 
-    // container can handle. For instance, negative indexes in Python, by 
-    // convention, indexes from the right (e.g. C[-1] indexes the rightmost 
-    // element in C). convert_index should handle the necessary conversion 
-    // for the C++ container (e.g. convert -1 to C.size()-1). convert_index
-    // should also be able to convert the type of the index (A dynamic Python
-    // type) to the actual type that the C++ container expects.
-    //
-    // When a container expands or contracts, held indexes to its elements
-    // must be adjusted to follow the movement of data. For instance, if
-    // we erase 3 elements, starting from index 0 from a 5 element vector, 
-    // what used to be at index 4 will now be at index 1:
-    //
-    //      [a][b][c][d][e] ---> [d][e]
-    //                   ^           ^
-    //                   4           1
-    //
-    // adjust_index takes care of the adjustment. Given a current index,
-    // the function should return the adjusted index when data in the
-    // container at index from..to is replaced by *len* elements.
-    //
-
-    template <
-          class Container
-        , class DerivedPolicies
-        , bool NoProxy = false
-        , bool NoSlice = false
-        , class Data = typename Container::value_type
-        , class Index = typename Container::size_type
-        , class Key = typename Container::value_type
-    >
-    class indexing_suite 
-        : public def_visitor<
-            indexing_suite<
-              Container
-            , DerivedPolicies
-            , NoProxy
-            , NoSlice
-            , Data
-            , Index
-            , Key
-        > >
-    {
-    private:
-        
-        typedef mpl::or_<
-            mpl::bool_<NoProxy>
-          , mpl::not_<is_class<Data> > > 
-        no_proxy;
-                    
-        typedef detail::container_element<Container, Index, DerivedPolicies>
-            container_element_t;
-       
-#if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
-        struct return_policy : return_internal_reference<> {};
-#else
-        typedef return_internal_reference<> return_policy;
-#endif
-
-        typedef typename mpl::if_<
-            no_proxy
-          , iterator<Container>
-          , iterator<Container, return_policy> >::type
-        def_iterator;
-        
-        typedef typename mpl::if_<
-            no_proxy
-          , detail::no_proxy_helper<
-                Container
-              , DerivedPolicies
-              , container_element_t
-              , Index>
-          , detail::proxy_helper<
-                Container
-              , DerivedPolicies
-              , container_element_t
-              , Index> >::type
-        proxy_handler;
-
-        typedef typename mpl::if_<
-            mpl::bool_<NoSlice>
-          , detail::no_slice_helper<
-                Container
-              , DerivedPolicies
-              , proxy_handler
-              , Data
-              , Index>
-          , detail::slice_helper<
-                Container
-              , DerivedPolicies
-              , proxy_handler
-              , Data
-              , Index> >::type
-        slice_handler;
-  
-    public:
-      
-        template <class Class>
-        void visit(Class& cl) const
-        {
-            // Hook into the class_ generic visitation .def function
-            proxy_handler::register_container_element();
-            
-            cl
-                .def("__len__", base_size)
-                .def("__setitem__", &base_set_item)
-                .def("__delitem__", &base_delete_item)
-                .def("__getitem__", &base_get_item)
-                .def("__contains__", &base_contains)
-
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1200
-// crazy VC6 doesn't like this! perhaps there's a better 
-// fix but this one will do for now. def __iter__ is just 
-// an optimization anyway. 
-                .def("__iter__", def_iterator())
-#endif
-            ;
-            
-            DerivedPolicies::extension_def(cl);
-        }        
-        
-        template <class Class>
-        static void 
-        extension_def(Class& cl)
-        {
-            // default.
-            // no more extensions
-        }
-
-    private:
-      
-        static object
-        base_get_item(back_reference<Container&> container, PyObject* i)
-        { 
-            if (PySlice_Check(i))
-                return slice_handler::base_get_slice(
-                    container.get(), reinterpret_cast<PySliceObject*>(i));
-            
-            return proxy_handler::base_get_item_(container, i);
-        }
-        
-        static void 
-        base_set_item(Container& container, PyObject* i, PyObject* v)
-        {
-            if (PySlice_Check(i))
-            {
-                 slice_handler::base_set_slice(container, 
-                     reinterpret_cast<PySliceObject*>(i), v);
-            }
-            else
-            {
-                extract<Data&> elem(v);
-                // try if elem is an exact Data
-                if (elem.check())
-                {
-                    DerivedPolicies::
-                        set_item(container, 
-                            DerivedPolicies::
-                                convert_index(container, i), elem());
-                }
-                else
-                {
-                    //  try to convert elem to Data
-                    extract<Data> elem(v);
-                    if (elem.check())
-                    {
-                        DerivedPolicies::
-                            set_item(container, 
-                                DerivedPolicies::
-                                    convert_index(container, i), elem());
-                    }
-                    else
-                    {
-                        PyErr_SetString(PyExc_TypeError, "Invalid assignment");
-                        throw_error_already_set();
-                    }
-                }
-            }
-        }
-
-        static void 
-        base_delete_item(Container& container, PyObject* i)
-        {
-            if (PySlice_Check(i))
-            {
-                slice_handler::base_delete_slice(
-                    container, reinterpret_cast<PySliceObject*>(i));
-                return;
-            }
-            
-            Index index = DerivedPolicies::convert_index(container, i);
-            proxy_handler::base_erase_index(container, index, mpl::bool_<NoSlice>());
-            DerivedPolicies::delete_item(container, index);
-        } 
-
-        static size_t
-        base_size(Container& container)
-        {
-            return DerivedPolicies::size(container);
-        }
-
-        static bool
-        base_contains(Container& container, PyObject* key)
-        {
-            extract<Key const&> x(key);
-            //  try if key is an exact Key type
-            if (x.check())
-            {
-                return DerivedPolicies::contains(container, x());
-            }
-            else
-            {
-                //  try to convert key to Key type
-                extract<Key> x(key);
-                if (x.check())
-                    return DerivedPolicies::contains(container, x());
-                else
-                    return false;
-            }            
-        }
-    };
-    
-}} // namespace boost::python 
-
-#endif // INDEXING_SUITE_JDG20036_HPP
diff --git a/include/boost/python/suite/indexing/map_indexing_suite.hpp b/include/boost/python/suite/indexing/map_indexing_suite.hpp
deleted file mode 100644
index acdb664f..00000000
--- a/include/boost/python/suite/indexing/map_indexing_suite.hpp
+++ /dev/null
@@ -1,180 +0,0 @@
-//  (C) Copyright Joel de Guzman 2003.
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies. This
-//  software is provided "as is" without express or implied warranty, and
-//  with no claim as to its suitability for any purpose.
-
-#ifndef MAP_INDEXING_SUITE_JDG20038_HPP
-# define MAP_INDEXING_SUITE_JDG20038_HPP
-
-# include <boost/python/suite/indexing/indexing_suite.hpp>
-# include <boost/python/iterator.hpp>
-# include <boost/python/call_method.hpp>
-# include <boost/python/tuple.hpp>
-
-namespace boost { namespace python {
-            
-    // Forward declaration
-    template <class Container, bool NoProxy, class DerivedPolicies>
-    class map_indexing_suite;
-    
-    namespace detail
-    {
-        template <class Container, bool NoProxy>
-        class final_map_derived_policies 
-            : public map_indexing_suite<Container, 
-                NoProxy, final_map_derived_policies<Container, NoProxy> > {};
-    }
-
-    // The map_indexing_suite class is a predefined indexing_suite derived 
-    // class for wrapping std::vector (and std::vector like) classes. It provides
-    // all the policies required by the indexing_suite (see indexing_suite).
-    // Example usage:
-    //
-    //  class X {...};
-    //
-    //  ...
-    //
-    //      class_<std::map<std::string, X> >("XMap")
-    //          .def(map_indexing_suite<std::map<std::string, X> >())
-    //      ;
-    //
-    // By default indexed elements are returned by proxy. This can be
-    // disabled by supplying *true* in the NoProxy template parameter.
-    //
-    template <
-        class Container, 
-        bool NoProxy = false,
-        class DerivedPolicies 
-            = detail::final_map_derived_policies<Container, NoProxy> >
-    class map_indexing_suite 
-        : public indexing_suite<
-            Container
-          , DerivedPolicies
-          , NoProxy
-          , true
-          , typename Container::value_type::second_type
-          , typename Container::key_type
-          , typename Container::key_type
-        >
-    {      
-    public:
-    
-        typedef typename Container::value_type value_type;
-        typedef typename Container::value_type::second_type data_type;
-        typedef typename Container::key_type key_type;
-        typedef typename Container::key_type index_type;
-        typedef typename Container::size_type size_type;
-        typedef typename Container::difference_type difference_type;
-
-        template <class Class>
-        static void 
-        extension_def(Class& cl)
-        {
-            //  Wrap the map's element (value_type)
-            std::string elem_name = "map_indexing_suite_";
-            elem_name += cl.ptr()->ob_type->tp_name; // the class name
-            elem_name += "_entry";
-
-            typedef typename mpl::if_<
-                is_class<data_type>
-              , return_internal_reference<>
-              , default_call_policies
-            >::type get_data_return_policy;
-           
-            class_<value_type>(elem_name.c_str())
-                .def("__repr__", &DerivedPolicies::print_elem)
-                .def("data", &DerivedPolicies::get_data, get_data_return_policy())
-                .def("key", &DerivedPolicies::get_key)
-            ;
-        }
-        
-        static object
-        print_elem(typename Container::value_type const& e)
-        {
-            return "(%s, %s)" % make_tuple(e.first, e.second);
-        }
-
-        static 
-        typename mpl::if_<
-            is_class<data_type>
-          , data_type&
-          , data_type
-        >::type
-        get_data(typename Container::value_type& e)
-        {
-            return e.second;
-        }
-
-        static typename Container::key_type
-        get_key(typename Container::value_type& e)
-        {
-            return e.first;
-        }
-
-        static data_type& 
-        get_item(Container& container, index_type i_)
-        { 
-            typename Container::iterator i = container.find(i_);
-            if (i == container.end())
-            {
-                PyErr_SetString(PyExc_KeyError, "Invalid key");
-                throw_error_already_set();
-            }
-            return i->second;
-        }
-
-        static void 
-        set_item(Container& container, index_type i, data_type const& v)
-        { 
-            container[i] = v;
-        }
-
-        static void 
-        delete_item(Container& container, index_type i)
-        { 
-            container.erase(i);
-        }
-       
-        static size_t
-        size(Container& container)
-        {
-            return container.size();
-        }
-        
-        static bool
-        contains(Container& container, key_type const& key)
-        {
-            return container.find(key) != container.end();
-        }
-        
-        static bool 
-        compare_index(Container& container, index_type a, index_type b)
-        {
-            return container.key_comp()(a, b);
-        }
-                
-        static index_type
-        convert_index(Container& container, PyObject* i_)
-        { 
-            extract<key_type const&> i(i_);
-            if (i.check())
-            {
-                return i();
-            }
-            else
-            {
-                extract<key_type> i(i_);
-                if (i.check())
-                    return i();
-            }
-
-            PyErr_SetString(PyExc_TypeError, "Invalid index type");
-            throw_error_already_set();
-            return index_type();
-        }
-    };
-       
-}} // namespace boost::python 
-
-#endif // MAP_INDEXING_SUITE_JDG20038_HPP
diff --git a/include/boost/python/suite/indexing/vector_indexing_suite.hpp b/include/boost/python/suite/indexing/vector_indexing_suite.hpp
deleted file mode 100644
index 20c58af6..00000000
--- a/include/boost/python/suite/indexing/vector_indexing_suite.hpp
+++ /dev/null
@@ -1,227 +0,0 @@
-//  (C) Copyright Joel de Guzman 2003.
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies. This
-//  software is provided "as is" without express or implied warranty, and
-//  with no claim as to its suitability for any purpose.
-
-#ifndef VECTOR_INDEXING_SUITE_JDG20036_HPP
-# define VECTOR_INDEXING_SUITE_JDG20036_HPP
-
-# include <boost/python/suite/indexing/indexing_suite.hpp>
-# include <boost/python/suite/indexing/container_utils.hpp>
-# include <boost/python/iterator.hpp>
-
-namespace boost { namespace python {
-            
-    // Forward declaration
-    template <class Container, bool NoProxy, class DerivedPolicies>
-    class vector_indexing_suite;
-    
-    namespace detail
-    {
-        template <class Container, bool NoProxy>
-        class final_vector_derived_policies 
-            : public vector_indexing_suite<Container, 
-                NoProxy, final_vector_derived_policies<Container, NoProxy> > {};
-    }
-
-    // The vector_indexing_suite class is a predefined indexing_suite derived 
-    // class for wrapping std::vector (and std::vector like) classes. It provides
-    // all the policies required by the indexing_suite (see indexing_suite).
-    // Example usage:
-    //
-    //  class X {...};
-    //
-    //  ...
-    //
-    //      class_<std::vector<X> >("XVec")
-    //          .def(vector_indexing_suite<std::vector<X> >())
-    //      ;
-    //
-    // By default indexed elements are returned by proxy. This can be
-    // disabled by supplying *true* in the NoProxy template parameter.
-    //
-    template <
-        class Container, 
-        bool NoProxy = false,
-        class DerivedPolicies 
-            = detail::final_vector_derived_policies<Container, NoProxy> >
-    class vector_indexing_suite 
-        : public indexing_suite<Container, DerivedPolicies, NoProxy>
-    {
-    public:
-    
-        typedef typename Container::value_type data_type;
-        typedef typename Container::value_type key_type;
-        typedef typename Container::size_type index_type;
-        typedef typename Container::size_type size_type;
-        typedef typename Container::difference_type difference_type;
-        
-        template <class Class>
-        static void 
-        extension_def(Class& cl)
-        {
-            cl
-                .def("append", &base_append)
-                .def("extend", &base_extend)
-            ;
-        }
-        
-        static 
-        typename mpl::if_<
-            is_class<data_type>
-          , data_type&
-          , data_type
-        >::type
-        get_item(Container& container, index_type i)
-        { 
-            return container[i];
-        }
-
-        static object 
-        get_slice(Container& container, index_type from, index_type to)
-        { 
-            return object(Container(container.begin()+from, container.begin()+to));
-        }
-
-        static void 
-        set_item(Container& container, index_type i, data_type const& v)
-        { 
-            container[i] = v;
-        }
-
-        static void 
-        set_slice(Container& container, index_type from, 
-            index_type to, data_type const& v)
-        { 
-            container.erase(container.begin()+from, container.begin()+to);
-            container.insert(container.begin()+from, v);
-        }
-
-        template <class Iter>
-        static void 
-        set_slice(Container& container, index_type from, 
-            index_type to, Iter first, Iter last)
-        { 
-            container.erase(container.begin()+from, container.begin()+to);
-            container.insert(container.begin()+from, first, last);
-        }
-
-        static void 
-        delete_item(Container& container, index_type i)
-        { 
-            container.erase(container.begin()+i);
-        }
-        
-        static void 
-        delete_slice(Container& container, index_type from, index_type to)
-        { 
-            container.erase(container.begin()+from, container.begin()+to);
-        }
-        
-        static size_t
-        size(Container& container)
-        {
-            return container.size();
-        }
-        
-        static bool
-        contains(Container& container, key_type const& key)
-        {
-            return std::find(container.begin(), container.end(), key)
-                != container.end();
-        }
-        
-        static index_type
-        get_min_index(Container& container)
-        { 
-            return 0;
-        }
-
-        static index_type
-        get_max_index(Container& container)
-        { 
-            return container.size();
-        }
-      
-        static bool 
-        compare_index(Container& container, index_type a, index_type b)
-        {
-            return a < b;
-        }
-        
-        static index_type
-        convert_index(Container& container, PyObject* i_)
-        { 
-            extract<long> i(i_);
-            if (i.check())
-            {
-                long index = i();
-                if (index < 0)
-                    index += DerivedPolicies::size(container);
-                if (index >= long(container.size()) || index < 0)
-                {
-                    PyErr_SetString(PyExc_IndexError, "Index out of range");
-                    throw_error_already_set();
-                }
-                return index;
-            }
-            
-            PyErr_SetString(PyExc_TypeError, "Invalid index type");
-            throw_error_already_set();
-            return index_type();
-        }
-      
-        static void 
-        append(Container& container, data_type const& v)
-        { 
-            container.push_back(v);
-        }
-        
-        template <class Iter>
-        static void 
-        extend(Container& container, Iter first, Iter last)
-        { 
-            container.insert(container.end(), first, last);
-        }
-        
-    private:
-    
-        static void
-        base_append(Container& container, object v)
-        {
-            extract<data_type&> elem(v);
-            // try if elem is an exact Data
-            if (elem.check())
-            {
-                DerivedPolicies::append(container, elem());
-            }
-            else
-            {
-                //  try to convert elem to data_type
-                extract<data_type> elem(v);
-                if (elem.check())
-                {
-                    DerivedPolicies::append(container, elem());
-                }
-                else
-                {
-                    PyErr_SetString(PyExc_TypeError, 
-                        "Attempting to append an invalid type");
-                    throw_error_already_set();
-                }
-            }
-        }
-        
-        static void
-        base_extend(Container& container, object v)
-        {
-            std::vector<data_type> temp;
-            container_utils::extend_container(temp, v);
-            DerivedPolicies::extend(container, temp.begin(), temp.end());
-        }
-    };
-       
-}} // namespace boost::python 
-
-#endif // VECTOR_INDEXING_SUITE_JDG20036_HPP
diff --git a/include/boost/python/tag.hpp b/include/boost/python/tag.hpp
deleted file mode 100644
index ff27071b..00000000
--- a/include/boost/python/tag.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef TAG_DWA2002720_HPP
-# define TAG_DWA2002720_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-namespace boost { namespace python { 
-
-// used only to prevent argument-dependent lookup from finding the
-// wrong function in some cases. Cheaper than qualification.
-enum tag_t { tag };
-
-}} // namespace boost::python
-
-#endif // TAG_DWA2002720_HPP
diff --git a/include/boost/python/to_python_converter.hpp b/include/boost/python/to_python_converter.hpp
deleted file mode 100644
index 7d859025..00000000
--- a/include/boost/python/to_python_converter.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef TO_PYTHON_CONVERTER_DWA200221_HPP
-# define TO_PYTHON_CONVERTER_DWA200221_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/converter/registry.hpp>
-# include <boost/python/converter/as_to_python_function.hpp>
-# include <boost/python/type_id.hpp>
-
-namespace boost { namespace python { 
-
-template <class T, class Conversion>
-struct to_python_converter
-{
-    to_python_converter();
-};
-
-//
-// implementation
-//
-
-template <class T, class Conversion>
-to_python_converter<T,Conversion>::to_python_converter()
-{
-    typedef converter::as_to_python_function<
-        T, Conversion
-        > normalized;
-        
-    converter::registry::insert(
-        &normalized::convert
-        , type_id<T>());
-}
-
-}} // namespace boost::python
-
-#endif // TO_PYTHON_CONVERTER_DWA200221_HPP
diff --git a/include/boost/python/to_python_indirect.hpp b/include/boost/python/to_python_indirect.hpp
deleted file mode 100644
index 61dff0d5..00000000
--- a/include/boost/python/to_python_indirect.hpp
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef TO_PYTHON_INDIRECT_DWA200221_HPP
-# define TO_PYTHON_INDIRECT_DWA200221_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/type_traits/object_traits.hpp>
-# include <boost/python/object/pointer_holder.hpp>
-# include <boost/python/object/instance.hpp>
-# include <boost/python/converter/registered.hpp>
-# include <boost/python/detail/unwind_type.hpp>
-# include <boost/python/detail/none.hpp>
-# include <boost/shared_ptr.hpp>
-# include <boost/python/object/make_ptr_instance.hpp>
-# include <memory>
-
-namespace boost { namespace python {
-
-template <class T, class MakeHolder>
-struct to_python_indirect
-{
-    PyObject* operator()(T ptr) const;
- private:
-    static PyTypeObject* type();
-};
-
-//
-// implementations
-//
-namespace detail
-{
-  struct make_owning_holder
-  {
-      typedef PyObject* result_type;
-      template <class T>
-      static result_type execute(T* p)
-      {
-          // can't use auto_ptr with Intel 5 and VC6 Dinkum library
-          // for some reason. We get link errors against the auto_ptr
-          // copy constructor.
-# if defined(__ICL) && __ICL < 600 
-          typedef boost::shared_ptr<T> smart_pointer;
-# else 
-          typedef std::auto_ptr<T> smart_pointer;
-# endif
-          typedef objects::pointer_holder<smart_pointer, T> holder_t;
-
-          smart_pointer ptr(p);
-          return objects::make_ptr_instance<T, holder_t>::execute(ptr);
-      }
-  };
-
-  struct make_reference_holder
-  {
-      typedef PyObject* result_type;
-      template <class T>
-      static result_type execute(T* p)
-      {
-          typedef objects::pointer_holder<T*, T> holder_t;
-          return objects::make_ptr_instance<T, holder_t>::execute(p);
-      }
-  };
-
-  struct get_pointer_class
-  {
-      typedef PyTypeObject* result_type;
-      template <class T>
-      static result_type execute(T* p)
-      {
-          BOOST_STATIC_ASSERT(is_class<T>::value);
-          return converter::registered<T>::converters.class_object;
-      }
-  };
-
-  // null_pointer_to_none -- return none() for null pointers and 0 for all other types/values
-  // 
-  // Uses simulated partial ordering
-  template <class T>
-  inline PyObject* null_pointer_to_none(T&, int)
-  {
-      return 0;
-  }
-
-  // overload for pointers
-  template <class T>
-  inline PyObject* null_pointer_to_none(T* x, long)
-  {
-      return x == 0 ? python::detail::none() : 0;
-  }
-}
-
-template <class T, class MakeHolder>
-inline PyObject* to_python_indirect<T,MakeHolder>::operator()(T x) const
-{
-    BOOST_STATIC_ASSERT(is_pointer<T>::value || is_reference<T>::value);
-        
-    PyObject* const null_result = detail::null_pointer_to_none(x, 1L);
-    if (null_result != 0)
-        return null_result;
-
-    return detail::unwind_type<MakeHolder>(x);
-}
-
-template <class T, class MakeHolder>
-inline PyTypeObject* to_python_indirect<T,MakeHolder>::type()
-{
-    return detail::unwind_type<detail::get_pointer_class,T>();
-}
-
-}} // namespace boost::python
-
-#endif // TO_PYTHON_INDIRECT_DWA200221_HPP
diff --git a/include/boost/python/to_python_value.hpp b/include/boost/python/to_python_value.hpp
deleted file mode 100644
index f726ec9e..00000000
--- a/include/boost/python/to_python_value.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef TO_PYTHON_VALUE_DWA200221_HPP
-# define TO_PYTHON_VALUE_DWA200221_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/refcount.hpp>
-# include <boost/python/tag.hpp>
-
-# include <boost/python/converter/registry.hpp>
-# include <boost/python/converter/registered.hpp>
-# include <boost/python/converter/builtin_converters.hpp>
-# include <boost/python/converter/object_manager.hpp>
-# include <boost/python/converter/object_manager.hpp>
-# include <boost/python/converter/shared_ptr_to_python.hpp>
-
-# include <boost/python/detail/value_is_shared_ptr.hpp>
-
-# include <boost/type_traits/transform_traits.hpp>
-
-# include <boost/mpl/if.hpp>
-# include <boost/mpl/or.hpp>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  template <class T>
-  struct object_manager_to_python_value
-  {
-      typedef typename add_reference<
-          typename add_const<T>::type
-      >::type argument_type;
-    
-      PyObject* operator()(argument_type) const;
-
-      // This information helps make_getter() decide whether to try to
-      // return an internal reference or not. I don't like it much,
-      // but it will have to serve for now.
-      BOOST_STATIC_CONSTANT(bool, uses_registry = false);
-  };
-
-  
-  template <class T>
-  struct registry_to_python_value
-  {
-      typedef typename add_reference<
-          typename add_const<T>::type
-      >::type argument_type;
-    
-      PyObject* operator()(argument_type) const;
-
-      // This information helps make_getter() decide whether to try to
-      // return an internal reference or not. I don't like it much,
-      // but it will have to serve for now.
-      BOOST_STATIC_CONSTANT(bool, uses_registry = true);
-  };
-
-  template <class T>
-  struct shared_ptr_to_python_value
-  {
-      typedef typename add_reference<
-          typename add_const<T>::type
-      >::type argument_type;
-    
-      PyObject* operator()(argument_type) const;
-
-      // This information helps make_getter() decide whether to try to
-      // return an internal reference or not. I don't like it much,
-      // but it will have to serve for now.
-      BOOST_STATIC_CONSTANT(bool, uses_registry = false);
-  };
-}
-
-template <class T>
-struct to_python_value
-    : mpl::if_<
-          detail::value_is_shared_ptr<T>
-        , detail::shared_ptr_to_python_value<T>
-        , typename mpl::if_<
-              mpl::or_<
-                  converter::is_object_manager<T>
-                , converter::is_reference_to_object_manager<T>
-              >
-            , detail::object_manager_to_python_value<T>
-            , detail::registry_to_python_value<T>
-          >::type
-      >::type
-{
-};
-
-//
-// implementation 
-//
-namespace detail
-{
-  template <class T>
-  inline PyObject* registry_to_python_value<T>::operator()(argument_type x) const
-  {
-      typedef converter::registered<argument_type> r;
-# if BOOST_WORKAROUND(__GNUC__, < 3)
-      // suppresses an ICE, somehow
-      (void)r::converters;
-# endif 
-      return converter::registered<argument_type>::converters.to_python(&x);
-  }
-
-  template <class T>
-  inline PyObject* object_manager_to_python_value<T>::operator()(argument_type x) const
-  {
-      return python::upcast<PyObject>(
-          python::xincref(
-              get_managed_object(x, tag))
-          );
-  }
-
-  template <class T>
-  inline PyObject* shared_ptr_to_python_value<T>::operator()(argument_type x) const
-  {
-      return converter::shared_ptr_to_python(x);
-  }
-}
-
-}} // namespace boost::python
-
-#endif // TO_PYTHON_VALUE_DWA200221_HPP
diff --git a/include/boost/python/tuple.hpp b/include/boost/python/tuple.hpp
deleted file mode 100644
index ce2fa96f..00000000
--- a/include/boost/python/tuple.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef TUPLE_20020706_HPP
-#define TUPLE_20020706_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-#include <boost/python/object.hpp>
-#include <boost/python/converter/pytype_object_mgr_traits.hpp>
-#include <boost/preprocessor/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  struct BOOST_PYTHON_DECL tuple_base : object
-  {
-   protected:
-      tuple_base();
-      tuple_base(object_cref sequence);
-      
-      BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(tuple_base, object)
-
-   private:
-      static detail::new_reference call(object const&);
-  };
-}
-
-class tuple : public detail::tuple_base
-{
-    typedef detail::tuple_base base;
- public:
-    tuple() {}
-
-    template <class T>
-    explicit tuple(T const& sequence)
-        : base(object(sequence))
-    {
-    }
-
- public: // implementation detail -- for internal use only
-    BOOST_PYTHON_FORWARD_OBJECT_CONSTRUCTORS(tuple, base)
-};
-
-//
-// Converter Specializations    // $$$ JDG $$$ moved here to prevent
-//                              // G++ bug complaining specialization
-                                // provided after instantiation
-namespace converter
-{
-  template <>
-  struct object_manager_traits<tuple>
-      : pytype_object_manager_traits<&PyTuple_Type,tuple>
-  {
-  };
-}
-
-// for completeness
-inline tuple make_tuple() { return tuple(); }
-
-# define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PYTHON_MAX_ARITY, <boost/python/detail/make_tuple.hpp>))
-# include BOOST_PP_ITERATE()
-
-}}  // namespace boost::python
-
-#endif
-
diff --git a/include/boost/python/type_id.hpp b/include/boost/python/type_id.hpp
deleted file mode 100755
index 2aa006de..00000000
--- a/include/boost/python/type_id.hpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef TYPE_ID_DWA2002517_HPP
-# define TYPE_ID_DWA2002517_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/detail/msvc_typeinfo.hpp>
-# include <boost/operators.hpp>
-# include <typeinfo>
-# include <cstring>
-# include <boost/static_assert.hpp>
-# include <boost/detail/workaround.hpp>
-# include <boost/type_traits/same_traits.hpp>
-
-#  ifndef BOOST_PYTHON_HAVE_GCC_CP_DEMANGLE
-#   if defined(__GNUC__) \
-    && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
-#    define BOOST_PYTHON_HAVE_GCC_CP_DEMANGLE
-#   endif
-#  endif
-
-namespace boost { namespace python { 
-
-// for this compiler at least, cross-shared-library type_info
-// comparisons don't work, so use typeid(x).name() instead. It's not
-// yet clear what the best default strategy is.
-# if (defined(__GNUC__) && __GNUC__ >= 3) \
- || defined(_AIX) \
- || (   defined(__sgi) && defined(__host_mips))
-#  define BOOST_PYTHON_TYPE_ID_NAME
-# endif 
-
-// type ids which represent the same information as std::type_info
-// (i.e. the top-level reference and cv-qualifiers are stripped), but
-// which works across shared libraries.
-struct type_info : private totally_ordered<type_info>
-{
-    inline type_info(std::type_info const& = typeid(void));
-    
-    inline bool operator<(type_info const& rhs) const;
-    inline bool operator==(type_info const& rhs) const;
-
-    char const* name() const;
-    friend BOOST_PYTHON_DECL std::ostream& operator<<(
-        std::ostream&, type_info const&);
-    
- private: // data members
-#  ifdef BOOST_PYTHON_TYPE_ID_NAME
-    typedef char const* base_id_t;
-#  else
-    typedef std::type_info const* base_id_t;
-#  endif
-    
-    base_id_t m_base_type;
-};
-
-#  ifdef BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS
-#   define BOOST_PYTHON_EXPLICIT_TT_DEF(T) ::boost::type<T>*
-#  else
-#   define BOOST_PYTHON_EXPLICIT_TT_DEF(T)
-#  endif
-
-template <class T>
-inline type_info type_id(BOOST_EXPLICIT_TEMPLATE_TYPE(T))
-{
-    return type_info(
-#  if !defined(_MSC_VER)                                       \
-      || (!BOOST_WORKAROUND(BOOST_MSVC, <= 1300)                \
-          && !BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, <= 700))
-        typeid(T)
-#  else // strip the decoration which msvc and Intel mistakenly leave in
-        python::detail::msvc_typeid((boost::type<T>*)0)
-#  endif 
-        );
-}
-
-#  if defined(__EDG_VERSION__) && __EDG_VERSION__ < 245
-// Older EDG-based compilers seems to mistakenly distinguish "int" from
-// "signed int", etc., but only in typeid() expressions. However
-// though int == signed int, the "signed" decoration is propagated
-// down into template instantiations. Explicit specialization stops
-// that from taking hold.
-
-#   define BOOST_PYTHON_SIGNED_INTEGRAL_TYPE_ID(T)              \
-template <>                                                     \
-inline type_info type_id<T>(BOOST_PYTHON_EXPLICIT_TT_DEF(T))    \
-{                                                               \
-    return type_info(typeid(T));                                \
-}
-
-BOOST_PYTHON_SIGNED_INTEGRAL_TYPE_ID(short)
-BOOST_PYTHON_SIGNED_INTEGRAL_TYPE_ID(int)
-BOOST_PYTHON_SIGNED_INTEGRAL_TYPE_ID(long)
-// using Python's macro instead of Boost's - we don't seem to get the
-// config right all the time.
-#   ifdef HAVE_LONG_LONG
-BOOST_PYTHON_SIGNED_INTEGRAL_TYPE_ID(long long)
-#   endif
-#   undef BOOST_PYTHON_SIGNED_INTEGRAL_TYPE_ID
-#  endif
-
-//
-inline type_info::type_info(std::type_info const& id)
-    : m_base_type(
-#  ifdef BOOST_PYTHON_TYPE_ID_NAME
-        id.name()
-#  else
-        &id
-#  endif
-        )
-{
-}
-
-inline bool type_info::operator<(type_info const& rhs) const
-{
-#  ifdef BOOST_PYTHON_TYPE_ID_NAME
-    return std::strcmp(m_base_type, rhs.m_base_type) < 0;
-#  else
-    return m_base_type->before(*rhs.m_base_type);
-#  endif 
-}
-
-inline bool type_info::operator==(type_info const& rhs) const
-{
-#  ifdef BOOST_PYTHON_TYPE_ID_NAME
-    return !std::strcmp(m_base_type, rhs.m_base_type);
-#  else
-    return *m_base_type == *rhs.m_base_type;
-#  endif 
-}
-
-#  ifdef BOOST_PYTHON_HAVE_GCC_CP_DEMANGLE
-namespace detail
-{
-  BOOST_PYTHON_DECL char const* gcc_demangle(char const*);
-}
-#  endif
-    
-inline char const* type_info::name() const
-{
-    char const* raw_name
-        = m_base_type
-#  ifndef BOOST_PYTHON_TYPE_ID_NAME
-          ->name()
-#  endif
-        ;
-    
-#  ifdef BOOST_PYTHON_HAVE_GCC_CP_DEMANGLE
-    return detail::gcc_demangle(raw_name);
-#  else
-    return raw_name;
-#  endif 
-}
-
-
-BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream&, type_info const&);
-
-}} // namespace boost::python
-
-#endif // TYPE_ID_DWA2002517_HPP
diff --git a/include/boost/python/with_custodian_and_ward.hpp b/include/boost/python/with_custodian_and_ward.hpp
deleted file mode 100644
index cf6727ca..00000000
--- a/include/boost/python/with_custodian_and_ward.hpp
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef WITH_CUSTODIAN_AND_WARD_DWA2002131_HPP
-# define WITH_CUSTODIAN_AND_WARD_DWA2002131_HPP
-
-# include <boost/python/detail/prefix.hpp>
-
-# include <boost/python/default_call_policies.hpp>
-# include <boost/python/object/life_support.hpp>
-# include <algorithm>
-
-namespace boost { namespace python { 
-
-namespace detail
-{
-  template <unsigned N>
-  struct get_prev
-  {
-      template <class ArgumentPackage>
-      static PyObject* execute(ArgumentPackage const& args, PyObject*)
-      {
-          return get<(N-1)>(args);
-      }
-  };
-  template <>
-  struct get_prev<0>
-  {
-      template <class ArgumentPackage>
-      static PyObject* execute(ArgumentPackage const&, PyObject* zeroth)
-      {
-          return zeroth;
-      }
-  };
-}
-template <
-    std::size_t custodian
-  , std::size_t ward
-  , class BasePolicy_ = default_call_policies
->
-struct with_custodian_and_ward : BasePolicy_
-{
-    BOOST_STATIC_ASSERT(custodian != ward);
-    BOOST_STATIC_ASSERT(custodian > 0);
-    BOOST_STATIC_ASSERT(ward > 0);
-
-    template <class ArgumentPackage>
-    static bool precall(ArgumentPackage const& args_)
-    {
-        unsigned arity_ = detail::arity(args_);
-        if (custodian > arity_ || ward > arity_)
-        {
-            PyErr_SetString(
-                PyExc_IndexError
-              , "boost::python::with_custodian_and_ward: argument index out of range"
-            );
-            return false;
-        }
-
-# if 0 // argpkg
-        PyObject* patient = detail::get(mpl::int_<(ward-1)>(), args_);
-        PyObject* nurse = detail::get(mpl::int_<(custodian-1)>(), args_);
-# else
-        PyObject* patient = detail::get<(ward-1)>(args_);
-        PyObject* nurse = detail::get<(custodian-1)>(args_);
-# endif 
-        PyObject* life_support = python::objects::make_nurse_and_patient(nurse, patient);
-        if (life_support == 0)
-            return false;
-    
-        bool result = BasePolicy_::precall(args_);
-
-        if (!result)
-            Py_DECREF(life_support);
-    
-        return result;
-    }
-};
-
-template <std::size_t custodian, std::size_t ward, class BasePolicy_ = default_call_policies>
-struct with_custodian_and_ward_postcall : BasePolicy_
-{
-    BOOST_STATIC_ASSERT(custodian != ward);
-    
-    template <class ArgumentPackage>
-    static PyObject* postcall(ArgumentPackage const& args_, PyObject* result)
-    {
-        unsigned arity_ = detail::arity(args_);
-        if ( custodian > arity_ || ward > arity_ )
-        {
-            PyErr_SetString(
-                PyExc_IndexError
-              , "boost::python::with_custodian_and_ward_postcall: argument index out of range"
-            );
-            return 0;
-        }
-        
-# if 0 // argpkg
-        PyObject* patient = ward > 0 ? detail::get(mpl::int_<(ward-1)>(),args_) : result;
-        PyObject* nurse = custodian > 0 ? detail::get(mpl::int_<(custodian-1)>(),args_) : result;
-# else 
-        PyObject* patient = detail::get_prev<ward>::execute(args_, result);
-        PyObject* nurse = detail::get_prev<custodian>::execute(args_, result);
-# endif 
-        if (nurse == 0) return 0;
-    
-        result = BasePolicy_::postcall(args_, result);
-        if (result == 0)
-            return 0;
-            
-        if (python::objects::make_nurse_and_patient(nurse, patient) == 0)
-        {
-            Py_XDECREF(result);
-            return 0;
-        }
-        return result;
-    }
-};
-
-
-}} // namespace boost::python
-
-#endif // WITH_CUSTODIAN_AND_WARD_DWA2002131_HPP
diff --git a/index.html b/index.html
deleted file mode 100644
index 40f1ae14..00000000
--- a/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<meta http-equiv="refresh" content="0; URL=doc/index.html">
-</head>
-<body>
-Automatically loading index page... if nothing happens, please go to
-<a href="doc/index.html">doc/index.html</a>.
-</body>
-</html>
diff --git a/pyste/README b/pyste/README
deleted file mode 100644
index b0cc7d36..00000000
--- a/pyste/README
+++ /dev/null
@@ -1,31 +0,0 @@
-Pyste - Python Semi-Automatic Exporter
-======================================
-
-Pyste is a Boost.Python code generator. The user specifies the classes and
-functions to be exported using a simple interface file, which following the
-Boost.Python's philosophy, is simple Python code. Pyste then uses GCCXML to
-parse all the headers and extract the necessary information to automatically
-generate C++ code.
-
-The documentation can be found in the file index.html accompaning this README.
-
-Enjoy!
-Bruno da Silva de Oliveira (nicodemus@globalite.com.br)
-
-Thanks
-======
-
-- David Abrahams, creator of Boost.Python, for tips on the syntax of the interface
-  file and support.
-- Marcelo Camelo, for design tips, support and inspiration for this project.
-  Also, the name was his idea. 8)
-- Brad King, creator of the excellent GCCXML (http://www.gccxml.org)
-- Fredrik Lundh, creator of the elementtree library (http://effbot.org)
-
-Bugs
-====
-
-Pyste is a young tool, so please help it to get better! Send bug reports to
-nicodemus@globalite.com.br, accompaining the stack trace in case of exceptions.
-If possible, run pyste with --debug, and send the resulting xmls too (pyste
-will output a xml file with the same of each header it parsed).
diff --git a/pyste/TODO b/pyste/TODO
deleted file mode 100644
index ef8623f7..00000000
--- a/pyste/TODO
+++ /dev/null
@@ -1,15 +0,0 @@
-- Make Pyste accept already-generated xml files
-
-- throw() declaration in virtual wrapper's member functions
-
-- Allow protected methods to be overriden in Python
-
-- Expose programmability to the Pyste files (listing members of a class, for
-  instance)
-
-- Virtual operators  
-
-- args() support
-
-- --file-list, allowing the user to pass the filename of a file with the pyste
-  files
diff --git a/pyste/dist/.cvsignore b/pyste/dist/.cvsignore
deleted file mode 100644
index 13329052..00000000
--- a/pyste/dist/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.zip
-*.pyc
diff --git a/pyste/dist/create_build.py b/pyste/dist/create_build.py
deleted file mode 100644
index 506426f0..00000000
--- a/pyste/dist/create_build.py
+++ /dev/null
@@ -1,51 +0,0 @@
-import os
-import sys
-import shutil
-import fnmatch
-from zipfile import ZipFile, ZIP_DEFLATED
-
-def findfiles(directory, mask):
-    def visit(files, dir, names):
-        for name in names:
-            if fnmatch.fnmatch(name, mask):
-                files.append(os.path.join(dir, name))
-    files = []
-    os.path.walk(directory, visit, files)
-    return files
-                
-        
-def main():
-    # test if PyXML is installed
-    try:
-        import _xmlplus.parsers.expat
-        pyxml = '--includes _xmlplus.parsers.expat'
-    except ImportError:
-        pyxml = ''
-    # create exe
-    status = os.system('python setup.py py2exe %s >& build.log' % pyxml)
-    if status != 0:
-        raise RuntimeError, 'Error creating EXE'
-
-    # create distribution
-    import pyste
-    version = pyste.__VERSION__
-    zip = ZipFile('pyste-%s.zip' % version, 'w', ZIP_DEFLATED)    
-    # include the base files
-    dist_dir = 'dist/pyste'
-    for basefile in os.listdir(dist_dir):
-        zip.write(os.path.join(dist_dir, basefile), os.path.join('pyste', basefile))
-    # include documentation
-    for doc_file in findfiles('../doc', '*.*'):
-        dest_name = os.path.join('pyste/doc', doc_file[3:])
-        zip.write(doc_file, dest_name)
-    zip.write('../index.html', 'pyste/doc/index.html')
-    zip.close()
-    # cleanup
-    os.remove('build.log')
-    shutil.rmtree('build')
-    shutil.rmtree('dist')
-    
-
-if __name__ == '__main__':
-    sys.path.append('../src')
-    main()
diff --git a/pyste/dist/setup.py b/pyste/dist/setup.py
deleted file mode 100644
index eea2751f..00000000
--- a/pyste/dist/setup.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from distutils.core import setup
-import py2exe
-import sys
-
-sys.path.append('../src')
-setup(name='pyste', scripts=['../src/pyste.py'])
diff --git a/pyste/doc/adding_new_methods.html b/pyste/doc/adding_new_methods.html
deleted file mode 100644
index 5bf2b1e0..00000000
--- a/pyste/doc/adding_new_methods.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Adding New Methods</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="global_variables.html">
-<link rel="next" href="inserting_code.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Adding New Methods</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="global_variables.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="inserting_code.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Suppose that you want to add a function to a class, turning it into a member
-function:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>World
-    </span><span class=special>{
-        </span><span class=keyword>void </span><span class=identifier>set</span><span class=special>(</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>) { </span><span class=keyword>this</span><span class=special>-&gt;</span><span class=identifier>msg </span><span class=special>= </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>;
-    };
-
-    </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>greet</span><span class=special>(</span><span class=identifier>World</span><span class=special>&amp; </span><span class=identifier>w</span><span class=special>)
-    {
-        </span><span class=keyword>return </span><span class=identifier>w</span><span class=special>.</span><span class=identifier>msg</span><span class=special>;
-    }
-</span></pre></code>
-<p>
-Here, we want to make <tt>greet</tt> work as a member function of the class <tt>World</tt>. We do
-that using the <tt>add_method</tt> construct:</p>
-<code><pre>
-    <span class=identifier>W </span><span class=special>= </span><span class=identifier>Class</span><span class=special>(</span><span class=string>&quot;World&quot;</span><span class=special>, </span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-    </span><span class=identifier>add_method</span><span class=special>(</span><span class=identifier>W</span><span class=special>, </span><span class=string>&quot;greet&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-Notice also that then you can rename it, set its policy, just like a regular
-member function:</p>
-<code><pre>
-    <span class=identifier>rename</span><span class=special>(</span><span class=identifier>W</span><span class=special>.</span><span class=identifier>greet</span><span class=special>, </span><span class=literal>'Greet'</span><span class=special>)
-</span></pre></code>
-<p>
-Now from Python:</p>
-<code><pre>
-    <span class=special>&gt;&gt;&gt; </span><span class=identifier>import </span><span class=identifier>hello
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>w </span><span class=special>= </span><span class=identifier>hello</span><span class=special>.</span><span class=identifier>World</span><span class=special>()
-    &gt;&gt;&gt; </span><span class=identifier>w</span><span class=special>.</span><span class=identifier>set</span><span class=special>(</span><span class=literal>'Ni'</span><span class=special>)
-    &gt;&gt;&gt; </span><span class=identifier>w</span><span class=special>.</span><span class=identifier>greet</span><span class=special>()
-    </span><span class=literal>'Ni'
-    </span><span class=special>&gt;&gt;&gt; </span><span class=identifier>print </span><span class=literal>'Oh no! The knights who say Ni!'
-    </span><span class=identifier>Oh </span><span class=identifier>no</span><span class=special>! </span><span class=identifier>The </span><span class=identifier>knights </span><span class=identifier>who </span><span class=identifier>say </span><span class=identifier>Ni</span><span class=special>!
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="global_variables.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="inserting_code.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/exporting_an_entire_header.html b/pyste/doc/exporting_an_entire_header.html
deleted file mode 100644
index c33bd6f9..00000000
--- a/pyste/doc/exporting_an_entire_header.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Exporting An Entire Header</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="wrappers.html">
-<link rel="next" href="smart_pointers.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Exporting An Entire Header</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="wrappers.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="smart_pointers.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Pyste also supports a mechanism to export all declarations found in a header
-file. Suppose again our file, <tt>hello.h</tt>:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>World
-    </span><span class=special>{
-        </span><span class=identifier>World</span><span class=special>(</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>): </span><span class=identifier>msg</span><span class=special>(</span><span class=identifier>msg</span><span class=special>) {} 
-        </span><span class=keyword>void </span><span class=identifier>set</span><span class=special>(</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>) { </span><span class=keyword>this</span><span class=special>-&gt;</span><span class=identifier>msg </span><span class=special>= </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>greet</span><span class=special>() { </span><span class=keyword>return </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>;
-    };
-
-    </span><span class=keyword>enum </span><span class=identifier>choice </span><span class=special>{ </span><span class=identifier>red</span><span class=special>, </span><span class=identifier>blue </span><span class=special>};
-    
-    </span><span class=keyword>void </span><span class=identifier>show</span><span class=special>(</span><span class=identifier>choice </span><span class=identifier>c</span><span class=special>) { </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>cout </span><span class=special>&lt;&lt; </span><span class=string>&quot;value: &quot; </span><span class=special>&lt;&lt; (</span><span class=keyword>int</span><span class=special>)</span><span class=identifier>c </span><span class=special>&lt;&lt; </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>endl</span><span class=special>; } 
-</span></pre></code>
-<p>
-You can just use the <tt>AllFromHeader</tt> construct:</p>
-<code><pre>
-    <span class=identifier>hello </span><span class=special>= </span><span class=identifier>AllFromHeader</span><span class=special>(</span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-this will export all the declarations found in <tt>hello.h</tt>, which is equivalent
-to write:</p>
-<code><pre>
-    <span class=identifier>Class</span><span class=special>(</span><span class=string>&quot;World&quot;</span><span class=special>, </span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-    </span><span class=identifier>Enum</span><span class=special>(</span><span class=string>&quot;choice&quot;</span><span class=special>, </span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-    </span><span class=identifier>Function</span><span class=special>(</span><span class=string>&quot;show&quot;</span><span class=special>, </span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-Note that you can still use the functions <tt>rename</tt>, <tt>set_policy</tt>, <tt>exclude</tt>, etc. Just access
-the members of the header object like this:</p>
-<code><pre>
-    <span class=identifier>rename</span><span class=special>(</span><span class=identifier>hello</span><span class=special>.</span><span class=identifier>World</span><span class=special>.</span><span class=identifier>greet</span><span class=special>, </span><span class=string>&quot;Greet&quot;</span><span class=special>)
-    </span><span class=identifier>exclude</span><span class=special>(</span><span class=identifier>hello</span><span class=special>.</span><span class=identifier>World</span><span class=special>.</span><span class=identifier>set</span><span class=special>, </span><span class=string>&quot;Set&quot;</span><span class=special>)
-</span></pre></code>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-
-<img src="theme/note.gif"></img> <b>AllFromHeader is broken</b> in some cases. Until it is fixed,
-use at you own risk.
-    </td>
-  </tr>
-</table>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="wrappers.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="smart_pointers.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/global_variables.html b/pyste/doc/global_variables.html
deleted file mode 100644
index 59d8c477..00000000
--- a/pyste/doc/global_variables.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Global Variables</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="smart_pointers.html">
-<link rel="next" href="adding_new_methods.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Global Variables</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="smart_pointers.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="adding_new_methods.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-To export global variables, use the <tt>Var</tt> construct:</p>
-<code><pre>
-    <span class=identifier>Var</span><span class=special>(</span><span class=string>&quot;myglobal&quot;</span><span class=special>, </span><span class=string>&quot;foo.h&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-Beware of non-const global variables: changes in Python won't reflect in C++!
-If you really must change them in Python, you will have to write some accessor
-functions, and export those.</p>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="smart_pointers.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="adding_new_methods.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/inserting_code.html b/pyste/doc/inserting_code.html
deleted file mode 100644
index c834dc55..00000000
--- a/pyste/doc/inserting_code.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Inserting Code</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="adding_new_methods.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Inserting Code</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="adding_new_methods.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><img src="theme/r_arr_disabled.gif" border="0"></td>
-   </tr>
-</table>
-<p>
-You can insert arbitrary code in the generated cpps, just use the functions
-<tt>declaration_code</tt> and <tt>module_code</tt>. This will insert the given string in the
-respective sections. Example:</p>
-<code><pre>
-    ##<span class=identifier>file </span><span class=identifier>A</span><span class=special>.</span><span class=identifier>pyste
-    </span><span class=identifier>Class</span><span class=special>(</span><span class=string>&quot;A&quot;</span><span class=special>, </span><span class=string>&quot;A.h&quot;</span><span class=special>)
-    </span><span class=identifier>declaration_code</span><span class=special>(</span><span class=string>&quot;/* declaration_code() comes here */\n&quot;</span><span class=special>)
-    </span><span class=identifier>module_code</span><span class=special>(</span><span class=string>&quot;/* module_code() comes here */\n&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-Will generate:</p>
-<code><pre>
-    <span class=comment>// Includes ====================================================================
-    </span><span class=preprocessor>#include </span><span class=special>&lt;</span><span class=identifier>boost</span><span class=special>/</span><span class=identifier>python</span><span class=special>.</span><span class=identifier>hpp</span><span class=special>&gt;
-
-    // </span><span class=identifier>Using </span><span class=special>=======================================================================
-    </span><span class=keyword>using </span><span class=keyword>namespace </span><span class=identifier>boost</span><span class=special>::</span><span class=identifier>python</span><span class=special>;
-
-    // </span><span class=identifier>Declarations </span><span class=special>================================================================
-
-    /* </span><span class=identifier>declaration_code</span><span class=special>() </span><span class=identifier>comes </span><span class=identifier>here </span><span class=special>*/
-
-    // </span><span class=identifier>Module </span><span class=special>======================================================================
-    </span><span class=identifier>BOOST_PYTHON_MODULE</span><span class=special>(</span><span class=identifier>A</span><span class=special>)
-    {
-        </span><span class=identifier>class_</span><span class=special>&lt; </span><span class=identifier>A </span><span class=special>&gt;(</span><span class=string>&quot;A&quot;</span><span class=special>, </span><span class=identifier>init</span><span class=special>&lt;  &gt;())
-            .</span><span class=identifier>def</span><span class=special>(</span><span class=identifier>init</span><span class=special>&lt; </span><span class=keyword>const </span><span class=identifier>A</span><span class=special>&amp; &gt;())
-        ;
-
-    /* </span><span class=identifier>module_code</span><span class=special>() </span><span class=identifier>comes </span><span class=identifier>here </span><span class=special>*/
-    }
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="adding_new_methods.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><img src="theme/r_arr_disabled.gif" border="0"></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/introduction.html b/pyste/doc/introduction.html
deleted file mode 100644
index ccbbda4d..00000000
--- a/pyste/doc/introduction.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Introduction</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="next" href="running_pyste.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Introduction</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><img src="theme/l_arr_disabled.gif" border="0"></td>
-    <td width="20"><a href="running_pyste.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<a name="what_is_pyste_"></a><h2>What is Pyste?</h2><p>
-Pyste is a <a href="../../index.html">
-Boost.Python</a> code generator. The user specifies the classes and
-functions to be exported using a simple <i>interface file</i>, which following the
-<a href="../../index.html">
-Boost.Python</a>'s philosophy, is simple Python code. Pyste then uses <a href="http://www.gccxml.org">
-GCCXML</a> to
-parse all the headers and extract the necessary information to automatically
-generate C++ code.</p>
-<a name="example"></a><h2>Example</h2><p>
-Let's borrow the class <tt>World</tt> from the <a href="../../doc/tutorial/doc/exposing_classes.html">
-tutorial</a>: </p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>World
-    </span><span class=special>{
-        </span><span class=keyword>void </span><span class=identifier>set</span><span class=special>(</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>) { </span><span class=keyword>this</span><span class=special>-&gt;</span><span class=identifier>msg </span><span class=special>= </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>greet</span><span class=special>() { </span><span class=keyword>return </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>;
-    };
-</span></pre></code>
-<p>
-Here's the interface file for it, named <tt>world.pyste</tt>:</p>
-<code><pre>
-    <span class=identifier>Class</span><span class=special>(</span><span class=string>&quot;World&quot;</span><span class=special>, </span><span class=string>&quot;world.h&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-and that's it!</p>
-<p>
-The next step is invoke Pyste in the command-line:</p>
-<code><pre>python pyste.py --module=hello world.pyste</pre></code><p>
-this will create a file &quot;<tt>hello.cpp</tt>&quot; in the directory where the command was
-run. </p>
-<p>
-Pyste supports the following features:</p>
-<ul><li>Functions</li><li>Classes</li><li>Class Templates</li><li>Virtual Methods</li><li>Overloading</li><li>Attributes </li><li>Enums (both &quot;free&quot; enums and class enums)</li><li>Nested Classes</li><li>Support for <tt>boost::shared_ptr</tt> and <tt>std::auto_ptr</tt></li><li>Global Variables</li></ul><table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><img src="theme/l_arr_disabled.gif" border="0"></td>
-    <td width="20"><a href="running_pyste.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/policies.html b/pyste/doc/policies.html
deleted file mode 100644
index f4af9df5..00000000
--- a/pyste/doc/policies.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Policies</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="renaming_and_excluding.html">
-<link rel="next" href="templates.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Policies</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="renaming_and_excluding.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="templates.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Even thought Pyste can identify various elements in the C++ code, like virtual
-member functions, attributes, and so on, one thing that it can't do is to
-guess the semantics of functions that return pointers or references. In this
-case, the user must manually specify the policy. Policies are explained in the
-<a href="../../doc/tutorial/doc/call_policies.html">
-tutorial</a>.</p>
-<p>
-The policies in Pyste are named exactly as in <a href="../../index.html">
-Boost.Python</a>, only the syntax is
-slightly different. For instance, this policy:</p>
-<code><pre>
-    <span class=identifier>return_internal_reference</span><span class=special>&lt;</span><span class=number>1</span><span class=special>, </span><span class=identifier>with_custodian_and_ward</span><span class=special>&lt;</span><span class=number>1</span><span class=special>, </span><span class=number>2</span><span class=special>&gt; &gt;()
-</span></pre></code>
-<p>
-becomes in Pyste:    </p>
-<code><pre>
-    <span class=identifier>return_internal_reference</span><span class=special>(</span><span class=number>1</span><span class=special>, </span><span class=identifier>with_custodian_and_ward</span><span class=special>(</span><span class=number>1</span><span class=special>, </span><span class=number>2</span><span class=special>))
-</span></pre></code>
-<p>
-The user can specify policies for functions and virtual member functions with
-the <tt>set_policy</tt> function:</p>
-<code><pre>
-    <span class=identifier>set_policy</span><span class=special>(</span><span class=identifier>f</span><span class=special>, </span><span class=identifier>return_internal_reference</span><span class=special>())
-    </span><span class=identifier>set_policy</span><span class=special>(</span><span class=identifier>C</span><span class=special>.</span><span class=identifier>foo</span><span class=special>, </span><span class=identifier>return_value_policy</span><span class=special>(</span><span class=identifier>manage_new_object</span><span class=special>))
-</span></pre></code>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-
-<img src="theme/note.gif"></img> <b>What if a function or member function needs a policy and
-the user doesn't set one?</b><br><br> If a function needs a policy and one
-was not set, Pyste will issue a error.  The user should then go in the
-interface file and set the policy for it, otherwise the generated cpp won't
-compile.
-    </td>
-  </tr>
-</table>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-
-<img src="theme/note.gif"></img> 
-Note that for functions that return <tt>const T&amp;</tt>, the policy
-<tt>return_value_policy&lt;copy_const_reference&gt;()</tt> wil be used by default, because
-that's normally what you want. You can change it to something else if you need
-to, though.
-    </td>
-  </tr>
-</table>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="renaming_and_excluding.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="templates.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/pyste.txt b/pyste/doc/pyste.txt
deleted file mode 100644
index 08eda4aa..00000000
--- a/pyste/doc/pyste.txt
+++ /dev/null
@@ -1,659 +0,0 @@
-[doc Pyste Documentation]
-
-[def GCCXML             [@http://www.gccxml.org GCCXML]]
-[def Boost.Python       [@../../index.html Boost.Python]]
-
-[page Introduction]
-
-[h2 What is Pyste?]
-
-Pyste is a Boost.Python code generator. The user specifies the classes and
-functions to be exported using a simple ['interface file], which following the
-Boost.Python's philosophy, is simple Python code. Pyste then uses GCCXML to
-parse all the headers and extract the necessary information to automatically
-generate C++ code.
-
-[h2 Example]
-
-Let's borrow the class [^World] from the [@../../doc/tutorial/doc/exposing_classes.html tutorial]: 
-
-    struct World
-    {
-        void set(std::string msg) { this->msg = msg; }
-        std::string greet() { return msg; }
-        std::string msg;
-    };
-
-Here's the interface file for it, named [^world.pyste]:
-
-    Class("World", "world.h")
-
-and that's it!
-
-The next step is invoke Pyste in the command-line:
-
-[pre python pyste.py --module=hello world.pyste]
-
-this will create a file "[^hello.cpp]" in the directory where the command was
-run. 
-
-Pyste supports the following features:
-
-* Functions
-* Classes
-* Class Templates
-* Virtual Methods
-* Overloading
-* Attributes 
-* Enums (both "free" enums and class enums)
-* Nested Classes
-* Support for [^boost::shared_ptr] and [^std::auto_ptr]
-* Global Variables
-
-[page Running Pyste]
-
-To run Pyste, you will need:
-
-* Python 2.2, available at [@http://www.python.org python's website].
-* The great [@http://effbot.org elementtree] library, from Fredrik Lundh.
-* The excellent GCCXML, from Brad King.
-
-Installation for the tools is available in their respective webpages.
-
-[blurb 
-[$theme/note.gif] GCCXML must be accessible in the PATH environment variable, so
-that Pyste can call it. How to do this varies from platform to platform.
-]
-
-[h2 Ok, now what?]
-
-Well, now let's fire it up:
-
-[pre 
-'''
->python pyste.py
-
-Pyste version 0.9.26
-
-Usage:
-    pyste [options] interface-files
-
-where options are:
-    --module=<name>         The name of the module that will be generated;
-                            defaults to the first interface filename, without
-                            the extension.
-    -I <path>               Add an include path
-    -D <symbol>             Define symbol
-    --multiple              Create various cpps, instead of only one
-                            (useful during development)
-    --out=<name>            Specify output filename (default: <module>.cpp)
-                            in --multiple mode, this will be a directory
-    --no-using              Do not declare "using namespace boost";
-                            use explicit declarations instead
-    --pyste-ns=<name>       Set the namespace where new types will be declared;
-                            default is the empty namespace
-    --debug                 Writes the xml for each file parsed in the current
-                            directory
-    --cache-dir=<dir>       Directory for cache files (speeds up future runs)
-    --only-create-cache     Recreates all caches (doesn't generate code).
-    --generate-main         Generates the _main.cpp file (in multiple mode)
-    --file-list             A file with one pyste file per line. Use as a 
-                            substitute for passing the files in the command
-                            line.
-    -h, --help              Print this help and exit
-    -v, --version           Print version information
-  
-'''                        
-]
-
-Options explained:
-
-The [^-I] and [^-D] are preprocessor flags, which are needed by GCCXML to parse
-the header files correctly and by Pyste to find the header files declared in the
-interface files.
-
-[^--out] names the output file (default: [^<module>.cpp]), or in multiple mode,
-names a output directory for the files (default: [^<module>]).
-
-[^--no-using] tells Pyste to don't declare "[^using namespace boost;]" in the
-generated cpp, using the namespace boost::python explicitly in all declarations.
-Use only if you're having a name conflict in one of the files.
-
-Use [^--pyste-ns] to change the namespace where new types are declared (for
-instance, the virtual wrappers). Use only if you are having any problems. By
-default, Pyste uses the empty namespace.
-
-[^--debug] will write in the current directory a xml file as outputted by GCCXML
-for each header parsed. Useful for bug reports.
-
-[^--file-list] names a file where each line points to a Pyste file. Use this instead 
-to pass the pyste files if you have a lot of them and your shell has some command line
-size limit.
-
-The other options are explained below, in [@#multiple_mode [*Multiple Mode]] and
-[@#cache [*Cache]].
-
-[^-h, --help, -v, --version] are self-explaining, I believe. ;)
-
-So, the usage is simple enough:
-
-[pre >python pyste.py --module=mymodule file.pyste file2.pyste ...]
-
-will generate a file [^mymodule.cpp] in the same dir where the command was
-executed. Now you can compile the file using the same instructions of the
-[@../../doc/tutorial/doc/building_hello_world.html tutorial]. 
-
-[h2 Wait... how do I set those I and D flags?]
-
-Don't worry: normally GCCXML is already configured correctly for your plataform, 
-so the search path to the standard libraries and the standard defines should 
-already be set. You only have to set the paths to other libraries that your code 
-needs, like Boost, for example.
-
-Plus, Pyste automatically uses the contents of the environment variable
-[^INCLUDE] if it exists. Visual C++ users should run the [^Vcvars32.bat] file,
-which for Visual C++ 6 is normally located at:
-
-    C:\Program Files\Microsoft Visual Studio\VC98\bin\Vcvars32.bat
-
-with that, you should have little trouble setting up the flags.
-
-[blurb [$theme/note.gif][*A note about Psyco][br][br]
-Although you don't have to install [@http://psyco.sourceforge.net/ Psyco] to
-use Pyste, if you do, Pyste will make use of it to speed up the wrapper
-generation. Speed ups of 30% can be achieved, so it's highly recommended.
-]
-
-
-[h2 Multiple Mode]
-
-The multiple mode is useful in large projects, where the presence of multiple
-classes in a single file makes the compilation unpractical (excessive memory
-usage, mostly). 
-
-The solution is make Pyste generate multiple files, more specifically one cpp
-file for each Pyste file. This files will contain a function named after the
-file, for instance Export_MyPysteFile, which will contain all the code to export
-the classes, enums, etc. You can pass as much files as you want this way:
-
-[pre >python pyste.py --module=mymodule file1.pyste file2.pyste]
-
-This will create the files [^mymodule/file1.cpp] and [^mymodule/file2.cpp]. You
-can then later do:
-
-[pre >python pyste.py --module=mymodule file3.pyste]
-
-and [^mymodule/file3.cpp] will be generated.
-
-But compiling and linking this files won't be sufficient to generate your
-extension. You have to also generate a file named [^main.cpp]; call pyste with
-[*all] the Pyste files of your extension, and use the [^--generate-main] option:
-
-[pre >python pyste.py --module=mymodule --generate-main file1.pyste file2.pyste file3.pyste]
-
-Now compile and link all this files together and your extension is ready for
-use.
-
-[h2 Cache]
-
-Pyste now supports a form of cache, which is a way to speed up the code
-generation. Most of the time that Pyste takes to generate the code comes from
-having to execute GCCXML (since being a front-end to GCC, it has to compile the
-header files) and reading back the XML generated. 
-
-When you use the [^--cache-dir=<dir>] option, Pyste will dump in the specified
-directory the generated XMLs to a file named after the Pyste file, with the
-extension [^.pystec].  The next time you run with this option, Pyste will use
-the cache, instead of calling GCCXML again:
-
-[pre >python pyste.py --module=mymodule --cache-dir=cache file1.pyste]
-
-Will generate [^file1.cpp] and [^cache/file1.pystec]. Next time you execute
-this command, the cache file will be used. Note that Pyste doesn't do any check
-to ensure that the cache is up to date, but you can configure your build system to do that for you.
-
-When you run Pyste with [^--only-create-cache], all the cache files will be
-created again, but no code will be generated.
-
-[page The Interface Files]
-
-The interface files are the heart of Pyste. The user creates one or more
-interface files declaring the classes and functions he wants to export, and then
-invokes Pyste passing the interface files to it. Pyste then generates a single
-cpp file with Boost.Python code, with all the classes and functions exported.
-
-Besides declaring the classes and functions, the user has a number of other
-options, like renaming e excluding classes and member functionis. Those are
-explained later on.
-
-[h2 Basics]
-
-Suppose we have a class and some functions that we want to expose to Python
-declared in the header [^hello.h]:
-
-    struct World
-    {
-        World(std::string msg): msg(msg) {} 
-        void set(std::string msg) { this->msg = msg; }
-        std::string greet() { return msg; }
-        std::string msg;
-    };
-
-    enum choice { red, blue };
-    
-    namespace test {
-    
-    void show(choice c) { std::cout << "value: " << (int)c << std::endl; }
-    
-    }
-
-We create a file named [^hello.pyste] and create instances of the classes
-[^Function], [^Class] and [^Enum]:
-
-    Function("test::show", "hello.h")
-    Class("World", "hello.h")
-    Enum("choice", "hello.h")
-
-That will expose the class, the free function and the enum found in [^hello.h]. 
-
-[h2 Inheritance]
-
-Pyste automatically generates the correct code (specifying [^bases<>] in the
-[^class_] declaration) [*if] the Class() function that exports the base classes
-and their children are in the same Pyste file. If that's not the case, you have
-to indicate that there's a relationship between the Pyste files using the
-[^Import] function specifying the other Pyste file.
-
-Suppose we have two classes, [^A] and [^B], and A is a base class for B. We
-create two Pyste files:
-
-[^A.pyste]:
-
-    Class("A", "A.h")
-
-[^B.pyste]:
-
-    Import("A.pyste")
-    Class("B", "B.h")
-
-Note that we specify that [^B] needs to know about [^A] to be properly exported.
-
-[page:1 Renaming and Excluding]
-
-You can easily rename functions, classes, member functions, attributes, etc. Just use the
-function [^rename], like this:
-
-    World = Class("World", "hello.h")
-    rename(World, "IWorld")
-    show = Function("choice", "hello.h")
-    rename(show, "Show")
-
-You can rename member functions and attributes using this syntax:
-
-    rename(World.greet, "Greet")
-    rename(World.set, "Set")
-    choice = Enum("choice", "hello.h")
-    rename(choice.red, "Red")
-    rename(choice.blue, "Blue")
-
-You can exclude functions, classes, member functions, attributes, etc, in the same way,
-with the function [^exclude]:
-
-    exclude(World.greet)
-    exclude(World.msg)
-
-To access the operators of a class, access the member [^operator] like this
-(supposing that [^C] is a class being exported):
-
-    exclude(C.operator['+'])
-    exclude(C.operator['*'])
-    exclude(C.operator['<<'])
-
-The string inside the brackets is the same as the name of the operator in C++.[br]
-
-[h2 Virtual Member Functions]
-
-Pyste automatically generates wrappers for virtual member functions, but you may
-want to disable this behaviour (for performance reasons, for instance) if you do
-not plan to override the functions in Python. To do this, use the function
-[^final]:
-
-    C = Class('C', 'C.h')
-    final(C.foo) # C::foo is a virtual member function
-
-No virtual wrapper code will be generated for the virtual member function
-C::foo that way.
-
-[page:1 Policies]
-
-Even thought Pyste can identify various elements in the C++ code, like virtual
-member functions, attributes, and so on, one thing that it can't do is to
-guess the semantics of functions that return pointers or references. In this
-case, the user must manually specify the policy. Policies are explained in the
-[@../../doc/tutorial/doc/call_policies.html tutorial].
-
-The policies in Pyste are named exactly as in Boost.Python, only the syntax is
-slightly different. For instance, this policy:
-
-    return_internal_reference<1, with_custodian_and_ward<1, 2> >()
-
-becomes in Pyste:    
-
-    return_internal_reference(1, with_custodian_and_ward(1, 2))
-
-The user can specify policies for functions and virtual member functions with
-the [^set_policy] function:
-
-    set_policy(f, return_internal_reference())
-    set_policy(C.foo, return_value_policy(manage_new_object))
-
-[blurb 
-[$theme/note.gif] [*What if a function or member function needs a policy and
-the user doesn't set one?][br][br] If a function needs a policy and one
-was not set, Pyste will issue a error.  The user should then go in the
-interface file and set the policy for it, otherwise the generated cpp won't
-compile.
-]
-
-[blurb
-[$theme/note.gif] 
-Note that for functions that return [^const T&], the policy
-[^return_value_policy<copy_const_reference>()] wil be used by default, because
-that's normally what you want. You can change it to something else if you need
-to, though.
-]
-
-[page:1 Templates]
-
-Template classes can easily be exported too, but you can't export the template
-itself... you have to export instantiations of it! So, if you want to export a
-[^std::vector], you will have to export vectors of int, doubles, etc.
-
-Suppose we have this code:
-
-    template <class T>
-    struct Point
-    {
-        T x;
-        T y;
-    };
-
-And we want to export [^Point]s of int and double:
-
-    Point = Template("Point", "point.h")
-    Point("int")
-    Point("double")
-
-Pyste will assign default names for each instantiation. In this example, those
-would be "[^Point_int]" and "[^Point_double]", but most of the time users will want to
-rename the instantiations:
-
-    Point("int", "IPoint")         // renames the instantiation
-    double_inst = Point("double")  // another way to do the same
-    rename(double_inst, "DPoint")
-
-Note that you can rename, exclude, set policies, etc, in the [^Template] object
-like you would do with a [^Function] or a [^Class]. This changes affect all
-[*future] instantiations:
-
-    Point = Template("Point", "point.h")
-    Point("float", "FPoint")        // will have x and y as data members
-    rename(Point.x, "X")
-    rename(Point.y, "Y")
-    Point("int", "IPoint")          // will have X and Y as data members
-    Point("double", "DPoint")       // also will have X and Y as data member
-
-If you want to change a option of a particular instantiation, you can do so:
-
-    Point = Template("Point", "point.h")
-    Point("int", "IPoint")          
-    d_inst = Point("double", "DPoint")       
-    rename(d_inst.x, "X")           // only DPoint is affect by this renames,
-    rename(d_inst.y, "Y")           // IPoint stays intact
-
-[blurb [$theme/note.gif] [*What if my template accepts more than one type?]
-[br][br]
-When you want to instantiate a template with more than one type, you can pass
-either a string with the types separated by whitespace, or a list of strings
-'''("int double" or ["int", "double"]''' would both work).
-]
-
-[page:1 Wrappers]
-
-Suppose you have this function:
-
-    std::vector<std::string> names();
-
-But you don't want to [@../../doc/v2/faq.html#question2 to export std::vector<std::string>], 
-you want this function to return a python list of strings. Boost.Python has
-excellent support for things like that:
-
-    list names_wrapper()
-    {
-        list result;
-        // call original function
-        vector<string> v = names();
-        // put all the strings inside the python list
-        vector<string>::iterator it;
-        for (it = v.begin(); it != v.end(); ++it){
-            result.append(*it);    
-        }
-        return result;
-    }
-    
-    BOOST_PYTHON_MODULE(test)
-    {
-        def("names", &names_wrapper);
-    }
-
-Nice heh? Pyste supports this mechanism too. You declare the [^names_wrapper]
-function in a header named "[^test_wrappers.h]" and in the interface file:
-
-    Include("test_wrappers.h")
-    names = Function("names", "test.h")
-    set_wrapper(names, "names_wrapper")
-
-You can optionally declare the function in the interface file itself:
-
-    names_wrapper = Wrapper("names_wrapper",
-    """
-    list names_wrapper()
-    {
-        // code to call name() and convert the vector to a list...
-    }
-    """)
-    names = Function("names", "test.h")
-    set_wrapper(names, names_wrapper)
-
-The same mechanism can be used with member functions too. Just remember that
-the first parameter of wrappers for member functions is a pointer to the
-class, as in:
-
-    struct C
-    {
-        std::vector<std::string> names();
-    }
-
-    list names_wrapper(C* c)
-    {
-        // same as before, calling c->names() and converting result to a list 
-    }
-
-And then in the interface file:
-
-    C = Class("C", "test.h")
-    set_wrapper(C.names, "names_wrapper")
-
-[blurb 
-[$theme/note.gif]Even though Boost.Python accepts either a pointer or a
-reference to the class in wrappers for member functions as the first parameter,
-Pyste expects them to be a [*pointer]. Doing otherwise will prevent your
-code to compile when you set a wrapper for a virtual member function.
-]
-
-[page:1 Exporting An Entire Header]
-
-Pyste also supports a mechanism to export all declarations found in a header
-file. Suppose again our file, [^hello.h]:
-
-    struct World
-    {
-        World(std::string msg): msg(msg) {} 
-        void set(std::string msg) { this->msg = msg; }
-        std::string greet() { return msg; }
-        std::string msg;
-    };
-
-    enum choice { red, blue };
-    
-    void show(choice c) { std::cout << "value: " << (int)c << std::endl; } 
-
-You can just use the [^AllFromHeader] construct:
-
-    hello = AllFromHeader("hello.h")
-
-this will export all the declarations found in [^hello.h], which is equivalent
-to write:
-
-    Class("World", "hello.h")
-    Enum("choice", "hello.h")
-    Function("show", "hello.h")
-
-Note that you can still use the functions [^rename], [^set_policy], [^exclude], etc. Just access
-the members of the header object like this:
-
-    rename(hello.World.greet, "Greet")
-    exclude(hello.World.set, "Set")
-
-[blurb    
-[$theme/note.gif] [*AllFromHeader is broken] in some cases. Until it is fixed,
-use at you own risk.
-]
-
-
-[page:1 Smart Pointers]
-
-Pyste for now has manual support for smart pointers. Suppose:
-
-    struct C
-    {
-        int value;
-    };
-
-    boost::shared_ptr<C> newC(int value)
-    {
-        boost::shared_ptr<C> c( new C() );
-        c->value = value;
-        return c;
-    }
-
-    void printC(boost::shared_ptr<C> c)
-    {
-        std::cout << c->value << std::endl;
-    }
-
-To make [^newC] and [^printC] work correctly, you have to tell Pyste that a
-convertor for [^boost::shared_ptr<C>] is needed.
-
-    C = Class('C', 'C.h')
-    use_shared_ptr(C)
-    Function('newC', 'C.h')
-    Function('printC', 'C.h')
-
-For [^std::auto_ptr]'s, use the function [^use_auto_ptr].
-
-This system is temporary, and in the future the converters will automatically be
-exported if needed, without the need to tell Pyste about them explicitly.
-
-[h2 Holders]
-
-If only the converter for the smart pointers is not enough and you need to
-specify the smart pointer as the holder for a class, use the functions
-[^hold_with_shared_ptr] and [^hold_with_auto_ptr]:
-
-    C = Class('C', 'C.h')
-    hold_with_shared_ptr(C)
-    Function('newC', 'C.h')
-    Function('printC', 'C.h') 
-
-[page:1 Global Variables]
-
-To export global variables, use the [^Var] construct:
-
-    Var("myglobal", "foo.h")
-
-Beware of non-const global variables: changes in Python won't reflect in C++!
-If you really must change them in Python, you will have to write some accessor
-functions, and export those.
-
-
-[page:1 Adding New Methods]
-
-Suppose that you want to add a function to a class, turning it into a member
-function:
-
-    struct World
-    {
-        void set(std::string msg) { this->msg = msg; }
-        std::string msg;
-    };
-
-    std::string greet(World& w)
-    {
-        return w.msg;
-    }
-
-Here, we want to make [^greet] work as a member function of the class [^World]. We do
-that using the [^add_method] construct:
-
-    W = Class("World", "hello.h")
-    add_method(W, "greet")
-
-Notice also that then you can rename it, set its policy, just like a regular
-member function:
-
-    rename(W.greet, 'Greet')
-
-Now from Python:
-
-    >>> import hello
-    >>> w = hello.World()
-    >>> w.set('Ni')
-    >>> w.greet()
-    'Ni'
-    >>> print 'Oh no! The knights who say Ni!'
-    Oh no! The knights who say Ni!
-
-
-[page:1 Inserting Code]
-
-You can insert arbitrary code in the generated cpps, just use the functions
-[^declaration_code] and [^module_code]. This will insert the given string in the
-respective sections. Example:
-
-    # file A.pyste
-    Class("A", "A.h")
-    declaration_code("/* declaration_code() comes here */\n")
-    module_code("/* module_code() comes here */\n")
-
-Will generate:
-
-    // Includes ====================================================================
-    #include <boost/python.hpp>
-
-    // Using =======================================================================
-    using namespace boost::python;
-
-    // Declarations ================================================================
-
-    /* declaration_code() comes here */
-
-    // Module ======================================================================
-    BOOST_PYTHON_MODULE(A)
-    {
-        class_< A >("A", init<  >())
-            .def(init< const A& >())
-        ;
-
-    /* module_code() comes here */
-    }
diff --git a/pyste/doc/renaming_and_excluding.html b/pyste/doc/renaming_and_excluding.html
deleted file mode 100644
index 79fd4dee..00000000
--- a/pyste/doc/renaming_and_excluding.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Renaming and Excluding</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="the_interface_files.html">
-<link rel="next" href="policies.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Renaming and Excluding</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="the_interface_files.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="policies.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-You can easily rename functions, classes, member functions, attributes, etc. Just use the
-function <tt>rename</tt>, like this:</p>
-<code><pre>
-    <span class=identifier>World </span><span class=special>= </span><span class=identifier>Class</span><span class=special>(</span><span class=string>&quot;World&quot;</span><span class=special>, </span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-    </span><span class=identifier>rename</span><span class=special>(</span><span class=identifier>World</span><span class=special>, </span><span class=string>&quot;IWorld&quot;</span><span class=special>)
-    </span><span class=identifier>show </span><span class=special>= </span><span class=identifier>Function</span><span class=special>(</span><span class=string>&quot;choice&quot;</span><span class=special>, </span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-    </span><span class=identifier>rename</span><span class=special>(</span><span class=identifier>show</span><span class=special>, </span><span class=string>&quot;Show&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-You can rename member functions and attributes using this syntax:</p>
-<code><pre>
-    <span class=identifier>rename</span><span class=special>(</span><span class=identifier>World</span><span class=special>.</span><span class=identifier>greet</span><span class=special>, </span><span class=string>&quot;Greet&quot;</span><span class=special>)
-    </span><span class=identifier>rename</span><span class=special>(</span><span class=identifier>World</span><span class=special>.</span><span class=identifier>set</span><span class=special>, </span><span class=string>&quot;Set&quot;</span><span class=special>)
-    </span><span class=identifier>choice </span><span class=special>= </span><span class=identifier>Enum</span><span class=special>(</span><span class=string>&quot;choice&quot;</span><span class=special>, </span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-    </span><span class=identifier>rename</span><span class=special>(</span><span class=identifier>choice</span><span class=special>.</span><span class=identifier>red</span><span class=special>, </span><span class=string>&quot;Red&quot;</span><span class=special>)
-    </span><span class=identifier>rename</span><span class=special>(</span><span class=identifier>choice</span><span class=special>.</span><span class=identifier>blue</span><span class=special>, </span><span class=string>&quot;Blue&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-You can exclude functions, classes, member functions, attributes, etc, in the same way,
-with the function <tt>exclude</tt>:</p>
-<code><pre>
-    <span class=identifier>exclude</span><span class=special>(</span><span class=identifier>World</span><span class=special>.</span><span class=identifier>greet</span><span class=special>)
-    </span><span class=identifier>exclude</span><span class=special>(</span><span class=identifier>World</span><span class=special>.</span><span class=identifier>msg</span><span class=special>)
-</span></pre></code>
-<p>
-To access the operators of a class, access the member <tt>operator</tt> like this
-(supposing that <tt>C</tt> is a class being exported):</p>
-<code><pre>
-    <span class=identifier>exclude</span><span class=special>(</span><span class=identifier>C</span><span class=special>.</span><span class=keyword>operator</span><span class=special>[</span><span class=literal>'+'</span><span class=special>])
-    </span><span class=identifier>exclude</span><span class=special>(</span><span class=identifier>C</span><span class=special>.</span><span class=keyword>operator</span><span class=special>[</span><span class=literal>'*'</span><span class=special>])
-    </span><span class=identifier>exclude</span><span class=special>(</span><span class=identifier>C</span><span class=special>.</span><span class=keyword>operator</span><span class=special>[</span><span class=literal>'&lt;&lt;'</span><span class=special>])
-</span></pre></code>
-<p>
-The string inside the brackets is the same as the name of the operator in C++.<br></p>
-<a name="virtual_member_functions"></a><h2>Virtual Member Functions</h2><p>
-Pyste automatically generates wrappers for virtual member functions, but you may
-want to disable this behaviour (for performance reasons, for instance) if you do
-not plan to override the functions in Python. To do this, use the function
-<tt>final</tt>:</p>
-<code><pre>
-    <span class=identifier>C </span><span class=special>= </span><span class=identifier>Class</span><span class=special>(</span><span class=literal>'C'</span><span class=special>, </span><span class=literal>'C.h'</span><span class=special>)
-    </span><span class=identifier>final</span><span class=special>(</span><span class=identifier>C</span><span class=special>.</span><span class=identifier>foo</span><span class=special>) </span>##<span class=identifier>C</span><span class=special>::</span><span class=identifier>foo </span><span class=identifier>is </span><span class=identifier>a </span><span class=keyword>virtual </span><span class=identifier>member </span><span class=identifier>function
-</span></pre></code>
-<p>
-No virtual wrapper code will be generated for the virtual member function
-C::foo that way.</p>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="the_interface_files.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="policies.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/running_pyste.html b/pyste/doc/running_pyste.html
deleted file mode 100644
index 46bb7f46..00000000
--- a/pyste/doc/running_pyste.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Running Pyste</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="introduction.html">
-<link rel="next" href="the_interface_files.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Running Pyste</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="introduction.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="the_interface_files.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-To run Pyste, you will need:</p>
-<ul><li>Python 2.2, available at <a href="http://www.python.org">
-python's website</a>.</li><li>The great <a href="http://effbot.org">
-elementtree</a> library, from Fredrik Lundh.</li><li>The excellent <a href="http://www.gccxml.org">
-GCCXML</a>, from Brad King.</li></ul><p>
-Installation for the tools is available in their respective webpages.</p>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-
-<img src="theme/note.gif"></img> <a href="http://www.gccxml.org">
-GCCXML</a> must be accessible in the PATH environment variable, so
-that Pyste can call it. How to do this varies from platform to platform.
-    </td>
-  </tr>
-</table>
-<a name="ok__now_what_"></a><h2>Ok, now what?</h2><p>
-Well, now let's fire it up:</p>
-<code><pre>
-
-&gt;python pyste.py
-
-Pyste version 0.9.26
-
-Usage:
-    pyste [options] interface-files
-
-where options are:
-    --module=&lt;name&gt;         The name of the module that will be generated;
-                            defaults to the first interface filename, without
-                            the extension.
-    -I &lt;path&gt;               Add an include path
-    -D &lt;symbol&gt;             Define symbol
-    --multiple              Create various cpps, instead of only one
-                            (useful during development)
-    --out=&lt;name&gt;            Specify output filename (default: &lt;module&gt;.cpp)
-                            in --multiple mode, this will be a directory
-    --no-using              Do not declare &quot;using namespace boost&quot;;
-                            use explicit declarations instead
-    --pyste-ns=&lt;name&gt;       Set the namespace where new types will be declared;
-                            default is the empty namespace
-    --debug                 Writes the xml for each file parsed in the current
-                            directory
-    --cache-dir=&lt;dir&gt;       Directory for cache files (speeds up future runs)
-    --only-create-cache     Recreates all caches (doesn't generate code).
-    --generate-main         Generates the _main.cpp file (in multiple mode)
-    --file-list             A file with one pyste file per line. Use as a 
-                            substitute for passing the files in the command
-                            line.
-    -h, --help              Print this help and exit
-    -v, --version           Print version information
-  
-                        
-</pre></code><p>
-Options explained:</p>
-<p>
-The <tt>-I</tt> and <tt>-D</tt> are preprocessor flags, which are needed by <a href="http://www.gccxml.org">
-GCCXML</a> to parse
-the header files correctly and by Pyste to find the header files declared in the
-interface files.</p>
-<p>
-<tt>--out</tt> names the output file (default: <tt>&lt;module&gt;.cpp</tt>), or in multiple mode,
-names a output directory for the files (default: <tt>&lt;module&gt;</tt>).</p>
-<p>
-<tt>--no-using</tt> tells Pyste to don't declare &quot;<tt>using namespace boost;</tt>&quot; in the
-generated cpp, using the namespace boost::python explicitly in all declarations.
-Use only if you're having a name conflict in one of the files.</p>
-<p>
-Use <tt>--pyste-ns</tt> to change the namespace where new types are declared (for
-instance, the virtual wrappers). Use only if you are having any problems. By
-default, Pyste uses the empty namespace.</p>
-<p>
-<tt>--debug</tt> will write in the current directory a xml file as outputted by <a href="http://www.gccxml.org">
-GCCXML</a>
-for each header parsed. Useful for bug reports.</p>
-<p>
-<tt>--file-list</tt> names a file where each line points to a Pyste file. Use this instead 
-to pass the pyste files if you have a lot of them and your shell has some command line
-size limit.</p>
-<p>
-The other options are explained below, in <a href="#multiple_mode">
-<b>Multiple Mode</b></a> and
-<a href="#cache">
-<b>Cache</b></a>.</p>
-<p>
-<tt>-h, --help, -v, --version</tt> are self-explaining, I believe. ;)</p>
-<p>
-So, the usage is simple enough:</p>
-<code><pre>&gt;python pyste.py --module=mymodule file.pyste file2.pyste ...</pre></code><p>
-will generate a file <tt>mymodule.cpp</tt> in the same dir where the command was
-executed. Now you can compile the file using the same instructions of the
-<a href="../../doc/tutorial/doc/building_hello_world.html">
-tutorial</a>. </p>
-<a name="wait____how_do_i_set_those_i_and_d_flags_"></a><h2>Wait... how do I set those I and D flags?</h2><p>
-Don't worry: normally <a href="http://www.gccxml.org">
-GCCXML</a> is already configured correctly for your plataform, 
-so the search path to the standard libraries and the standard defines should 
-already be set. You only have to set the paths to other libraries that your code 
-needs, like Boost, for example.</p>
-<p>
-Plus, Pyste automatically uses the contents of the environment variable
-<tt>INCLUDE</tt> if it exists. Visual C++ users should run the <tt>Vcvars32.bat</tt> file,
-which for Visual C++ 6 is normally located at:</p>
-<code><pre>
-    <span class=identifier>C</span><span class=special>:\</span><span class=identifier>Program </span><span class=identifier>Files</span><span class=special>\</span><span class=identifier>Microsoft </span><span class=identifier>Visual </span><span class=identifier>Studio</span><span class=special>\</span><span class=identifier>VC98</span><span class=special>\</span><span class=identifier>bin</span><span class=special>\</span><span class=identifier>Vcvars32</span><span class=special>.</span><span class=identifier>bat
-</span></pre></code>
-<p>
-with that, you should have little trouble setting up the flags.</p>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-<img src="theme/note.gif"></img><b>A note about Psyco</b><br><br>
-Although you don't have to install <a href="http://psyco.sourceforge.net/">
-Psyco</a> to
-use Pyste, if you do, Pyste will make use of it to speed up the wrapper
-generation. Speed ups of 30% can be achieved, so it's highly recommended.
-    </td>
-  </tr>
-</table>
-<a name="multiple_mode"></a><h2>Multiple Mode</h2><p>
-The multiple mode is useful in large projects, where the presence of multiple
-classes in a single file makes the compilation unpractical (excessive memory
-usage, mostly). </p>
-<p>
-The solution is make Pyste generate multiple files, more specifically one cpp
-file for each Pyste file. This files will contain a function named after the
-file, for instance Export_MyPysteFile, which will contain all the code to export
-the classes, enums, etc. You can pass as much files as you want this way:</p>
-<code><pre>&gt;python pyste.py --module=mymodule file1.pyste file2.pyste</pre></code><p>
-This will create the files <tt>mymodule/file1.cpp</tt> and <tt>mymodule/file2.cpp</tt>. You
-can then later do:</p>
-<code><pre>&gt;python pyste.py --module=mymodule file3.pyste</pre></code><p>
-and <tt>mymodule/file3.cpp</tt> will be generated.</p>
-<p>
-But compiling and linking this files won't be sufficient to generate your
-extension. You have to also generate a file named <tt>main.cpp</tt>; call pyste with
-<b>all</b> the Pyste files of your extension, and use the <tt>--generate-main</tt> option:</p>
-<code><pre>&gt;python pyste.py --module=mymodule --generate-main file1.pyste file2.pyste file3.pyste</pre></code><p>
-Now compile and link all this files together and your extension is ready for
-use.</p>
-<a name="cache"></a><h2>Cache</h2><p>
-Pyste now supports a form of cache, which is a way to speed up the code
-generation. Most of the time that Pyste takes to generate the code comes from
-having to execute <a href="http://www.gccxml.org">
-GCCXML</a> (since being a front-end to GCC, it has to compile the
-header files) and reading back the XML generated. </p>
-<p>
-When you use the <tt>--cache-dir=&lt;dir&gt;</tt> option, Pyste will dump in the specified
-directory the generated XMLs to a file named after the Pyste file, with the
-extension <tt>.pystec</tt>.  The next time you run with this option, Pyste will use
-the cache, instead of calling <a href="http://www.gccxml.org">
-GCCXML</a> again:</p>
-<code><pre>&gt;python pyste.py --module=mymodule --cache-dir=cache file1.pyste</pre></code><p>
-Will generate <tt>file1.cpp</tt> and <tt>cache/file1.pystec</tt>. Next time you execute
-this command, the cache file will be used. Note that Pyste doesn't do any check
-to ensure that the cache is up to date, but you can configure your build system to do that for you.</p>
-<p>
-When you run Pyste with <tt>--only-create-cache</tt>, all the cache files will be
-created again, but no code will be generated.</p>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="introduction.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="the_interface_files.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/smart_pointers.html b/pyste/doc/smart_pointers.html
deleted file mode 100644
index 2b77a429..00000000
--- a/pyste/doc/smart_pointers.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Smart Pointers</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="exporting_an_entire_header.html">
-<link rel="next" href="global_variables.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Smart Pointers</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="exporting_an_entire_header.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="global_variables.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Pyste for now has manual support for smart pointers. Suppose:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>C
-    </span><span class=special>{
-        </span><span class=keyword>int </span><span class=identifier>value</span><span class=special>;
-    };
-
-    </span><span class=identifier>boost</span><span class=special>::</span><span class=identifier>shared_ptr</span><span class=special>&lt;</span><span class=identifier>C</span><span class=special>&gt; </span><span class=identifier>newC</span><span class=special>(</span><span class=keyword>int </span><span class=identifier>value</span><span class=special>)
-    {
-        </span><span class=identifier>boost</span><span class=special>::</span><span class=identifier>shared_ptr</span><span class=special>&lt;</span><span class=identifier>C</span><span class=special>&gt; </span><span class=identifier>c</span><span class=special>( </span><span class=keyword>new </span><span class=identifier>C</span><span class=special>() );
-        </span><span class=identifier>c</span><span class=special>-&gt;</span><span class=identifier>value </span><span class=special>= </span><span class=identifier>value</span><span class=special>;
-        </span><span class=keyword>return </span><span class=identifier>c</span><span class=special>;
-    }
-
-    </span><span class=keyword>void </span><span class=identifier>printC</span><span class=special>(</span><span class=identifier>boost</span><span class=special>::</span><span class=identifier>shared_ptr</span><span class=special>&lt;</span><span class=identifier>C</span><span class=special>&gt; </span><span class=identifier>c</span><span class=special>)
-    {
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>cout </span><span class=special>&lt;&lt; </span><span class=identifier>c</span><span class=special>-&gt;</span><span class=identifier>value </span><span class=special>&lt;&lt; </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>endl</span><span class=special>;
-    }
-</span></pre></code>
-<p>
-To make <tt>newC</tt> and <tt>printC</tt> work correctly, you have to tell Pyste that a
-convertor for <tt>boost::shared_ptr&lt;C&gt;</tt> is needed.</p>
-<code><pre>
-    <span class=identifier>C </span><span class=special>= </span><span class=identifier>Class</span><span class=special>(</span><span class=literal>'C'</span><span class=special>, </span><span class=literal>'C.h'</span><span class=special>)
-    </span><span class=identifier>use_shared_ptr</span><span class=special>(</span><span class=identifier>C</span><span class=special>)
-    </span><span class=identifier>Function</span><span class=special>(</span><span class=literal>'newC'</span><span class=special>, </span><span class=literal>'C.h'</span><span class=special>)
-    </span><span class=identifier>Function</span><span class=special>(</span><span class=literal>'printC'</span><span class=special>, </span><span class=literal>'C.h'</span><span class=special>)
-</span></pre></code>
-<p>
-For <tt>std::auto_ptr</tt>'s, use the function <tt>use_auto_ptr</tt>.</p>
-<p>
-This system is temporary, and in the future the converters will automatically be
-exported if needed, without the need to tell Pyste about them explicitly.</p>
-<a name="holders"></a><h2>Holders</h2><p>
-If only the converter for the smart pointers is not enough and you need to
-specify the smart pointer as the holder for a class, use the functions
-<tt>hold_with_shared_ptr</tt> and <tt>hold_with_auto_ptr</tt>:</p>
-<code><pre>
-    <span class=identifier>C </span><span class=special>= </span><span class=identifier>Class</span><span class=special>(</span><span class=literal>'C'</span><span class=special>, </span><span class=literal>'C.h'</span><span class=special>)
-    </span><span class=identifier>hold_with_shared_ptr</span><span class=special>(</span><span class=identifier>C</span><span class=special>)
-    </span><span class=identifier>Function</span><span class=special>(</span><span class=literal>'newC'</span><span class=special>, </span><span class=literal>'C.h'</span><span class=special>)
-    </span><span class=identifier>Function</span><span class=special>(</span><span class=literal>'printC'</span><span class=special>, </span><span class=literal>'C.h'</span><span class=special>) 
-</span></pre></code>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="exporting_an_entire_header.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="global_variables.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/templates.html b/pyste/doc/templates.html
deleted file mode 100644
index 81dfa1e9..00000000
--- a/pyste/doc/templates.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Templates</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="policies.html">
-<link rel="next" href="wrappers.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Templates</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="policies.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="wrappers.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Template classes can easily be exported too, but you can't export the template
-itself... you have to export instantiations of it! So, if you want to export a
-<tt>std::vector</tt>, you will have to export vectors of int, doubles, etc.</p>
-<p>
-Suppose we have this code:</p>
-<code><pre>
-    <span class=keyword>template </span><span class=special>&lt;</span><span class=keyword>class </span><span class=identifier>T</span><span class=special>&gt;
-    </span><span class=keyword>struct </span><span class=identifier>Point
-    </span><span class=special>{
-        </span><span class=identifier>T </span><span class=identifier>x</span><span class=special>;
-        </span><span class=identifier>T </span><span class=identifier>y</span><span class=special>;
-    };
-</span></pre></code>
-<p>
-And we want to export <tt>Point</tt>s of int and double:</p>
-<code><pre>
-    <span class=identifier>Point </span><span class=special>= </span><span class=identifier>Template</span><span class=special>(</span><span class=string>&quot;Point&quot;</span><span class=special>, </span><span class=string>&quot;point.h&quot;</span><span class=special>)
-    </span><span class=identifier>Point</span><span class=special>(</span><span class=string>&quot;int&quot;</span><span class=special>)
-    </span><span class=identifier>Point</span><span class=special>(</span><span class=string>&quot;double&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-Pyste will assign default names for each instantiation. In this example, those
-would be &quot;<tt>Point_int</tt>&quot; and &quot;<tt>Point_double</tt>&quot;, but most of the time users will want to
-rename the instantiations:</p>
-<code><pre>
-    <span class=identifier>Point</span><span class=special>(</span><span class=string>&quot;int&quot;</span><span class=special>, </span><span class=string>&quot;IPoint&quot;</span><span class=special>)         // </span><span class=identifier>renames </span><span class=identifier>the </span><span class=identifier>instantiation
-    </span><span class=identifier>double_inst </span><span class=special>= </span><span class=identifier>Point</span><span class=special>(</span><span class=string>&quot;double&quot;</span><span class=special>)  // </span><span class=identifier>another </span><span class=identifier>way </span><span class=identifier>to </span><span class=keyword>do </span><span class=identifier>the </span><span class=identifier>same
-    </span><span class=identifier>rename</span><span class=special>(</span><span class=identifier>double_inst</span><span class=special>, </span><span class=string>&quot;DPoint&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-Note that you can rename, exclude, set policies, etc, in the <tt>Template</tt> object
-like you would do with a <tt>Function</tt> or a <tt>Class</tt>. This changes affect all
-<b>future</b> instantiations:</p>
-<code><pre>
-    <span class=identifier>Point </span><span class=special>= </span><span class=identifier>Template</span><span class=special>(</span><span class=string>&quot;Point&quot;</span><span class=special>, </span><span class=string>&quot;point.h&quot;</span><span class=special>)
-    </span><span class=identifier>Point</span><span class=special>(</span><span class=string>&quot;float&quot;</span><span class=special>, </span><span class=string>&quot;FPoint&quot;</span><span class=special>)        // </span><span class=identifier>will </span><span class=identifier>have </span><span class=identifier>x </span><span class=keyword>and </span><span class=identifier>y </span><span class=identifier>as </span><span class=identifier>data </span><span class=identifier>members
-    </span><span class=identifier>rename</span><span class=special>(</span><span class=identifier>Point</span><span class=special>.</span><span class=identifier>x</span><span class=special>, </span><span class=string>&quot;X&quot;</span><span class=special>)
-    </span><span class=identifier>rename</span><span class=special>(</span><span class=identifier>Point</span><span class=special>.</span><span class=identifier>y</span><span class=special>, </span><span class=string>&quot;Y&quot;</span><span class=special>)
-    </span><span class=identifier>Point</span><span class=special>(</span><span class=string>&quot;int&quot;</span><span class=special>, </span><span class=string>&quot;IPoint&quot;</span><span class=special>)          // </span><span class=identifier>will </span><span class=identifier>have </span><span class=identifier>X </span><span class=keyword>and </span><span class=identifier>Y </span><span class=identifier>as </span><span class=identifier>data </span><span class=identifier>members
-    </span><span class=identifier>Point</span><span class=special>(</span><span class=string>&quot;double&quot;</span><span class=special>, </span><span class=string>&quot;DPoint&quot;</span><span class=special>)       // </span><span class=identifier>also </span><span class=identifier>will </span><span class=identifier>have </span><span class=identifier>X </span><span class=keyword>and </span><span class=identifier>Y </span><span class=identifier>as </span><span class=identifier>data </span><span class=identifier>member
-</span></pre></code>
-<p>
-If you want to change a option of a particular instantiation, you can do so:</p>
-<code><pre>
-    <span class=identifier>Point </span><span class=special>= </span><span class=identifier>Template</span><span class=special>(</span><span class=string>&quot;Point&quot;</span><span class=special>, </span><span class=string>&quot;point.h&quot;</span><span class=special>)
-    </span><span class=identifier>Point</span><span class=special>(</span><span class=string>&quot;int&quot;</span><span class=special>, </span><span class=string>&quot;IPoint&quot;</span><span class=special>)          
-    </span><span class=identifier>d_inst </span><span class=special>= </span><span class=identifier>Point</span><span class=special>(</span><span class=string>&quot;double&quot;</span><span class=special>, </span><span class=string>&quot;DPoint&quot;</span><span class=special>)       
-    </span><span class=identifier>rename</span><span class=special>(</span><span class=identifier>d_inst</span><span class=special>.</span><span class=identifier>x</span><span class=special>, </span><span class=string>&quot;X&quot;</span><span class=special>)           // </span><span class=identifier>only </span><span class=identifier>DPoint </span><span class=identifier>is </span><span class=identifier>affect </span><span class=identifier>by </span><span class=keyword>this </span><span class=identifier>renames</span><span class=special>,
-    </span><span class=identifier>rename</span><span class=special>(</span><span class=identifier>d_inst</span><span class=special>.</span><span class=identifier>y</span><span class=special>, </span><span class=string>&quot;Y&quot;</span><span class=special>)           // </span><span class=identifier>IPoint </span><span class=identifier>stays </span><span class=identifier>intact
-</span></pre></code>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-<img src="theme/note.gif"></img> <b>What if my template accepts more than one type?</b>
-<br><br>
-When you want to instantiate a template with more than one type, you can pass
-either a string with the types separated by whitespace, or a list of strings
-(&quot;int double&quot; or [&quot;int&quot;, &quot;double&quot;] would both work).
-    </td>
-  </tr>
-</table>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="policies.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="wrappers.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/the_interface_files.html b/pyste/doc/the_interface_files.html
deleted file mode 100644
index 029e4302..00000000
--- a/pyste/doc/the_interface_files.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>The Interface Files</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="running_pyste.html">
-<link rel="next" href="renaming_and_excluding.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>The Interface Files</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="running_pyste.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="renaming_and_excluding.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-The interface files are the heart of Pyste. The user creates one or more
-interface files declaring the classes and functions he wants to export, and then
-invokes Pyste passing the interface files to it. Pyste then generates a single
-cpp file with <a href="../../index.html">
-Boost.Python</a> code, with all the classes and functions exported.</p>
-<p>
-Besides declaring the classes and functions, the user has a number of other
-options, like renaming e excluding classes and member functionis. Those are
-explained later on.</p>
-<a name="basics"></a><h2>Basics</h2><p>
-Suppose we have a class and some functions that we want to expose to Python
-declared in the header <tt>hello.h</tt>:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>World
-    </span><span class=special>{
-        </span><span class=identifier>World</span><span class=special>(</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>): </span><span class=identifier>msg</span><span class=special>(</span><span class=identifier>msg</span><span class=special>) {} 
-        </span><span class=keyword>void </span><span class=identifier>set</span><span class=special>(</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>) { </span><span class=keyword>this</span><span class=special>-&gt;</span><span class=identifier>msg </span><span class=special>= </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>greet</span><span class=special>() { </span><span class=keyword>return </span><span class=identifier>msg</span><span class=special>; }
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string </span><span class=identifier>msg</span><span class=special>;
-    };
-
-    </span><span class=keyword>enum </span><span class=identifier>choice </span><span class=special>{ </span><span class=identifier>red</span><span class=special>, </span><span class=identifier>blue </span><span class=special>};
-    
-    </span><span class=keyword>namespace </span><span class=identifier>test </span><span class=special>{
-    
-    </span><span class=keyword>void </span><span class=identifier>show</span><span class=special>(</span><span class=identifier>choice </span><span class=identifier>c</span><span class=special>) { </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>cout </span><span class=special>&lt;&lt; </span><span class=string>&quot;value: &quot; </span><span class=special>&lt;&lt; (</span><span class=keyword>int</span><span class=special>)</span><span class=identifier>c </span><span class=special>&lt;&lt; </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>endl</span><span class=special>; }
-    
-    }
-</span></pre></code>
-<p>
-We create a file named <tt>hello.pyste</tt> and create instances of the classes
-<tt>Function</tt>, <tt>Class</tt> and <tt>Enum</tt>:</p>
-<code><pre>
-    <span class=identifier>Function</span><span class=special>(</span><span class=string>&quot;test::show&quot;</span><span class=special>, </span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-    </span><span class=identifier>Class</span><span class=special>(</span><span class=string>&quot;World&quot;</span><span class=special>, </span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-    </span><span class=identifier>Enum</span><span class=special>(</span><span class=string>&quot;choice&quot;</span><span class=special>, </span><span class=string>&quot;hello.h&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-That will expose the class, the free function and the enum found in <tt>hello.h</tt>. </p>
-<a name="inheritance"></a><h2>Inheritance</h2><p>
-Pyste automatically generates the correct code (specifying <tt>bases&lt;&gt;</tt> in the
-<tt>class_</tt> declaration) <b>if</b> the Class() function that exports the base classes
-and their children are in the same Pyste file. If that's not the case, you have
-to indicate that there's a relationship between the Pyste files using the
-<tt>Import</tt> function specifying the other Pyste file.</p>
-<p>
-Suppose we have two classes, <tt>A</tt> and <tt>B</tt>, and A is a base class for B. We
-create two Pyste files:</p>
-<p>
-<tt>A.pyste</tt>:</p>
-<code><pre>
-    <span class=identifier>Class</span><span class=special>(</span><span class=string>&quot;A&quot;</span><span class=special>, </span><span class=string>&quot;A.h&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-<tt>B.pyste</tt>:</p>
-<code><pre>
-    <span class=identifier>Import</span><span class=special>(</span><span class=string>&quot;A.pyste&quot;</span><span class=special>)
-    </span><span class=identifier>Class</span><span class=special>(</span><span class=string>&quot;B&quot;</span><span class=special>, </span><span class=string>&quot;B.h&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-Note that we specify that <tt>B</tt> needs to know about <tt>A</tt> to be properly exported.</p>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="running_pyste.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="renaming_and_excluding.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/doc/theme/alert.gif b/pyste/doc/theme/alert.gif
deleted file mode 100644
index 270764cc..00000000
Binary files a/pyste/doc/theme/alert.gif and /dev/null differ
diff --git a/pyste/doc/theme/arrow.gif b/pyste/doc/theme/arrow.gif
deleted file mode 100644
index e33db0fb..00000000
Binary files a/pyste/doc/theme/arrow.gif and /dev/null differ
diff --git a/pyste/doc/theme/bkd.gif b/pyste/doc/theme/bkd.gif
deleted file mode 100644
index dcabcb80..00000000
Binary files a/pyste/doc/theme/bkd.gif and /dev/null differ
diff --git a/pyste/doc/theme/bkd2.gif b/pyste/doc/theme/bkd2.gif
deleted file mode 100644
index b03d9ba9..00000000
Binary files a/pyste/doc/theme/bkd2.gif and /dev/null differ
diff --git a/pyste/doc/theme/bulb.gif b/pyste/doc/theme/bulb.gif
deleted file mode 100644
index 74f3baac..00000000
Binary files a/pyste/doc/theme/bulb.gif and /dev/null differ
diff --git a/pyste/doc/theme/bullet.gif b/pyste/doc/theme/bullet.gif
deleted file mode 100644
index da787e2e..00000000
Binary files a/pyste/doc/theme/bullet.gif and /dev/null differ
diff --git a/pyste/doc/theme/c++boost.gif b/pyste/doc/theme/c++boost.gif
deleted file mode 100644
index 58be431a..00000000
Binary files a/pyste/doc/theme/c++boost.gif and /dev/null differ
diff --git a/pyste/doc/theme/l_arr.gif b/pyste/doc/theme/l_arr.gif
deleted file mode 100644
index 5b3cb1cb..00000000
Binary files a/pyste/doc/theme/l_arr.gif and /dev/null differ
diff --git a/pyste/doc/theme/l_arr_disabled.gif b/pyste/doc/theme/l_arr_disabled.gif
deleted file mode 100644
index ed58a605..00000000
Binary files a/pyste/doc/theme/l_arr_disabled.gif and /dev/null differ
diff --git a/pyste/doc/theme/note.gif b/pyste/doc/theme/note.gif
deleted file mode 100644
index bd92f075..00000000
Binary files a/pyste/doc/theme/note.gif and /dev/null differ
diff --git a/pyste/doc/theme/r_arr.gif b/pyste/doc/theme/r_arr.gif
deleted file mode 100644
index 2dcdad11..00000000
Binary files a/pyste/doc/theme/r_arr.gif and /dev/null differ
diff --git a/pyste/doc/theme/r_arr_disabled.gif b/pyste/doc/theme/r_arr_disabled.gif
deleted file mode 100644
index 2100f78b..00000000
Binary files a/pyste/doc/theme/r_arr_disabled.gif and /dev/null differ
diff --git a/pyste/doc/theme/smiley.gif b/pyste/doc/theme/smiley.gif
deleted file mode 100644
index 4c848f8f..00000000
Binary files a/pyste/doc/theme/smiley.gif and /dev/null differ
diff --git a/pyste/doc/theme/style.css b/pyste/doc/theme/style.css
deleted file mode 100644
index 53a6205e..00000000
--- a/pyste/doc/theme/style.css
+++ /dev/null
@@ -1,170 +0,0 @@
-body
-{
-    background-image: url(bkd.gif);
-    background-color: #FFFFFF;
-    margin: 1em 2em 1em 2em;
-}
-
-h1 { font-family: Verdana, Arial, Helvetica, sans-serif; font-weight: bold; text-align: left;  }
-h2 { font: 140% sans-serif; font-weight: bold; text-align: left;  }
-h3 { font: 120% sans-serif; font-weight: bold; text-align: left;  }
-h4 { font: bold 100% sans-serif; font-weight: bold; text-align: left;  }
-h5 { font: italic 100% sans-serif; font-weight: bold; text-align: left;  }
-h6 { font: small-caps 100% sans-serif; font-weight: bold; text-align: left;  }
-
-pre
-{
-    border-top: gray 1pt solid;
-    border-right: gray 1pt solid;
-    border-left: gray 1pt solid;
-    border-bottom: gray 1pt solid;
-
-    padding-top: 2pt;
-    padding-right: 2pt;
-    padding-left: 2pt;
-    padding-bottom: 2pt;
-
-    display: block;
-    font-family: "courier new", courier, mono;
-    background-color: #eeeeee; font-size: small
-}
-
-code
-{
-    font-family: "Courier New", Courier, mono;
-    font-size: small
-}
-
-tt
-{
-    display: inline;
-    font-family: "Courier New", Courier, mono;
-    color: #000099;
-    font-size: small
-}
-
-p
-{
-    text-align: justify;
-    font-family: Georgia, "Times New Roman", Times, serif
-}
-
-ul
-{
-    list-style-image: url(bullet.gif);
-    font-family: Georgia, "Times New Roman", Times, serif
-}
-
-ol
-{
-    font-family: Georgia, "Times New Roman", Times, serif
-}
-
-a
-{
-    font-weight: bold;
-    color: #003366;
-    text-decoration: none;
-}
-
-a:hover { color: #8080FF; }
-
-.literal        {  color: #666666; font-style: italic}
-.keyword        {  color: #000099}
-.identifier     {}
-.comment        {  font-style: italic; color: #990000}
-.special        {  color: #800040}
-.preprocessor   {  color: #FF0000}
-.string         {  font-style: italic; color: #666666}
-.copyright      {  color: #666666; font-size: small}
-.white_bkd      {  background-color: #FFFFFF}
-.dk_grey_bkd    {  background-color: #999999}
-.quotes         {  color: #666666; font-style: italic; font-weight: bold}
-
-.note_box
-{
-    display: block;
-
-    border-top: gray 1pt solid;
-    border-right: gray 1pt solid;
-    border-left: gray 1pt solid;
-    border-bottom: gray 1pt solid;
-
-    padding-right: 12pt;
-    padding-left: 12pt;
-    padding-bottom: 12pt;
-    padding-top: 12pt;
-
-    font-family: Arial, Helvetica, sans-serif;
-    background-color: #E2E9EF;
-    font-size: small; text-align: justify
-}
-
-.table_title
-{
-    background-color: #648CCA;
-
-    font-family: Verdana, Arial, Helvetica, sans-serif; color: #FFFFFF;
-    font-weight: bold
-; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 4px
-}
-
-.table_cells
-{
-    background-color: #E2E9EF;
-
-    font-family: Geneva, Arial, Helvetica, san-serif;
-    font-size: small
-; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 4px
-}
-
-.toc
-{
-    DISPLAY: block;
-    background-color: #E2E9EF
-    font-family: Arial, Helvetica, sans-serif;
-
-    border-top: gray 1pt solid;
-    border-left: gray 1pt solid;
-    border-bottom: gray 1pt solid;
-    border-right: gray 1pt solid;
-
-    padding-top: 24pt;
-    padding-right: 24pt;
-    padding-left: 24pt;
-    padding-bottom: 24pt;
-}
-
-.toc_title
-{
-    background-color: #648CCA;
-    padding-top: 4px;
-    padding-right: 4px;
-    padding-bottom: 4px;
-    padding-left: 4px;
-    font-family: Geneva, Arial, Helvetica, san-serif;
-    color: #FFFFFF;
-    font-weight: bold
-}
-
-.toc_cells
-{
-    background-color: #E2E9EF;
-    padding-top: 4px;
-    padding-right: 4px;
-    padding-bottom: 4px;
-    padding-left: 4px;
-    font-family: Geneva, Arial, Helvetica, san-serif;
-    font-size: small
-}
-
-div.logo
-{
-	float: right;
-}
-
-.toc_cells_L0 { background-color: #E2E9EF; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 4px; font-family: Geneva, Arial, Helvetica, san-serif; font-size: small }
-.toc_cells_L1 { background-color: #E2E9EF; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 44px; font-family: Geneva, Arial, Helvetica, san-serif; font-size: small }
-.toc_cells_L2 { background-color: #E2E9EF; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 88px; font-family: Geneva, Arial, Helvetica, san-serif; font-size: small }
-.toc_cells_L3 { background-color: #E2E9EF; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 122px; font-family: Geneva, Arial, Helvetica, san-serif; font-size: small }
-.toc_cells_L4 { background-color: #E2E9EF; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 166px; font-family: Geneva, Arial, Helvetica, san-serif; font-size: small }
diff --git a/pyste/doc/theme/u_arr.gif b/pyste/doc/theme/u_arr.gif
deleted file mode 100644
index ada3d6e0..00000000
Binary files a/pyste/doc/theme/u_arr.gif and /dev/null differ
diff --git a/pyste/doc/wrappers.html b/pyste/doc/wrappers.html
deleted file mode 100644
index bb4057d1..00000000
--- a/pyste/doc/wrappers.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Wrappers</title>
-<link rel="stylesheet" href="theme/style.css" type="text/css">
-<link rel="prev" href="templates.html">
-<link rel="next" href="exporting_an_entire_header.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Wrappers</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="templates.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="exporting_an_entire_header.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<p>
-Suppose you have this function:</p>
-<code><pre>
-    <span class=identifier>std</span><span class=special>::</span><span class=identifier>vector</span><span class=special>&lt;</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string</span><span class=special>&gt; </span><span class=identifier>names</span><span class=special>();
-</span></pre></code>
-<p>
-But you don't want to <a href="../../doc/v2/faq.html#question2">
-to export std::vector&lt;std::string&gt;</a>, 
-you want this function to return a python list of strings. <a href="../../index.html">
-Boost.Python</a> has
-excellent support for things like that:</p>
-<code><pre>
-    <span class=identifier>list </span><span class=identifier>names_wrapper</span><span class=special>()
-    {
-        </span><span class=identifier>list </span><span class=identifier>result</span><span class=special>;
-        // </span><span class=identifier>call </span><span class=identifier>original </span><span class=identifier>function
-        </span><span class=identifier>vector</span><span class=special>&lt;</span><span class=identifier>string</span><span class=special>&gt; </span><span class=identifier>v </span><span class=special>= </span><span class=identifier>names</span><span class=special>();
-        // </span><span class=identifier>put </span><span class=identifier>all </span><span class=identifier>the </span><span class=identifier>strings </span><span class=identifier>inside </span><span class=identifier>the </span><span class=identifier>python </span><span class=identifier>list
-        </span><span class=identifier>vector</span><span class=special>&lt;</span><span class=identifier>string</span><span class=special>&gt;::</span><span class=identifier>iterator </span><span class=identifier>it</span><span class=special>;
-        </span><span class=keyword>for </span><span class=special>(</span><span class=identifier>it </span><span class=special>= </span><span class=identifier>v</span><span class=special>.</span><span class=identifier>begin</span><span class=special>(); </span><span class=identifier>it </span><span class=special>!= </span><span class=identifier>v</span><span class=special>.</span><span class=identifier>end</span><span class=special>(); ++</span><span class=identifier>it</span><span class=special>){
-            </span><span class=identifier>result</span><span class=special>.</span><span class=identifier>append</span><span class=special>(*</span><span class=identifier>it</span><span class=special>);    
-        }
-        </span><span class=keyword>return </span><span class=identifier>result</span><span class=special>;
-    }
-    
-    </span><span class=identifier>BOOST_PYTHON_MODULE</span><span class=special>(</span><span class=identifier>test</span><span class=special>)
-    {
-        </span><span class=identifier>def</span><span class=special>(</span><span class=string>&quot;names&quot;</span><span class=special>, &amp;</span><span class=identifier>names_wrapper</span><span class=special>);
-    }
-</span></pre></code>
-<p>
-Nice heh? Pyste supports this mechanism too. You declare the <tt>names_wrapper</tt>
-function in a header named &quot;<tt>test_wrappers.h</tt>&quot; and in the interface file:</p>
-<code><pre>
-    <span class=identifier>Include</span><span class=special>(</span><span class=string>&quot;test_wrappers.h&quot;</span><span class=special>)
-    </span><span class=identifier>names </span><span class=special>= </span><span class=identifier>Function</span><span class=special>(</span><span class=string>&quot;names&quot;</span><span class=special>, </span><span class=string>&quot;test.h&quot;</span><span class=special>)
-    </span><span class=identifier>set_wrapper</span><span class=special>(</span><span class=identifier>names</span><span class=special>, </span><span class=string>&quot;names_wrapper&quot;</span><span class=special>)
-</span></pre></code>
-<p>
-You can optionally declare the function in the interface file itself:</p>
-<code><pre>
-    <span class=identifier>names_wrapper </span><span class=special>= </span><span class=identifier>Wrapper</span><span class=special>(</span><span class=string>&quot;names_wrapper&quot;</span><span class=special>,
-    </span><span class=string>&quot;&quot;</span><span class=string>&quot;
-    list names_wrapper()
-    {
-        // code to call name() and convert the vector to a list...
-    }
-    &quot;</span><span class=string>&quot;&quot;</span><span class=special>)
-    </span><span class=identifier>names </span><span class=special>= </span><span class=identifier>Function</span><span class=special>(</span><span class=string>&quot;names&quot;</span><span class=special>, </span><span class=string>&quot;test.h&quot;</span><span class=special>)
-    </span><span class=identifier>set_wrapper</span><span class=special>(</span><span class=identifier>names</span><span class=special>, </span><span class=identifier>names_wrapper</span><span class=special>)
-</span></pre></code>
-<p>
-The same mechanism can be used with member functions too. Just remember that
-the first parameter of wrappers for member functions is a pointer to the
-class, as in:</p>
-<code><pre>
-    <span class=keyword>struct </span><span class=identifier>C
-    </span><span class=special>{
-        </span><span class=identifier>std</span><span class=special>::</span><span class=identifier>vector</span><span class=special>&lt;</span><span class=identifier>std</span><span class=special>::</span><span class=identifier>string</span><span class=special>&gt; </span><span class=identifier>names</span><span class=special>();
-    }
-
-    </span><span class=identifier>list </span><span class=identifier>names_wrapper</span><span class=special>(</span><span class=identifier>C</span><span class=special>* </span><span class=identifier>c</span><span class=special>)
-    {
-        // </span><span class=identifier>same </span><span class=identifier>as </span><span class=identifier>before</span><span class=special>, </span><span class=identifier>calling </span><span class=identifier>c</span><span class=special>-&gt;</span><span class=identifier>names</span><span class=special>() </span><span class=keyword>and </span><span class=identifier>converting </span><span class=identifier>result </span><span class=identifier>to </span><span class=identifier>a </span><span class=identifier>list 
-    </span><span class=special>}
-</span></pre></code>
-<p>
-And then in the interface file:</p>
-<code><pre>
-    <span class=identifier>C </span><span class=special>= </span><span class=identifier>Class</span><span class=special>(</span><span class=string>&quot;C&quot;</span><span class=special>, </span><span class=string>&quot;test.h&quot;</span><span class=special>)
-    </span><span class=identifier>set_wrapper</span><span class=special>(</span><span class=identifier>C</span><span class=special>.</span><span class=identifier>names</span><span class=special>, </span><span class=string>&quot;names_wrapper&quot;</span><span class=special>)
-</span></pre></code>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="note_box">
-
-<img src="theme/note.gif"></img>Even though <a href="../../index.html">
-Boost.Python</a> accepts either a pointer or a
-reference to the class in wrappers for member functions as the first parameter,
-Pyste expects them to be a <b>pointer</b>. Doing otherwise will prevent your
-code to compile when you set a wrapper for a virtual member function.
-    </td>
-  </tr>
-</table>
-<table border="0">
-  <tr>
-    <td width="30"><a href="../index.html"><img src="theme/u_arr.gif" border="0"></a></td>
-    <td width="30"><a href="templates.html"><img src="theme/l_arr.gif" border="0"></a></td>
-    <td width="20"><a href="exporting_an_entire_header.html"><img src="theme/r_arr.gif" border="0"></a></td>
-   </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/index.html b/pyste/index.html
deleted file mode 100644
index 5a781362..00000000
--- a/pyste/index.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<html>
-<head>
-<!-- Generated by the Spirit (http://spirit.sf.net) QuickDoc -->
-<title>Pyste Documentation</title>
-<link rel="stylesheet" href="doc/theme/style.css" type="text/css">
-<link rel="next" href="introduction.html">
-</head>
-<body>
-<table width="100%" height="48" border="0" cellspacing="2">
-  <tr>
-    <td><img src="doc/theme/c%2B%2Bboost.gif">
-    </td>
-    <td width="85%">
-      <font size="6" face="Verdana, Arial, Helvetica, sans-serif"><b>Pyste Documentation</b></font>
-    </td>
-  </tr>
-</table>
-<br>
-<table width="80%" border="0" align="center">
-  <tr>
-    <td class="toc_title">Table of contents</td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/introduction.html">Introduction</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/running_pyste.html">Running Pyste</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L0">
-        <a href="doc/the_interface_files.html">The Interface Files</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/renaming_and_excluding.html">Renaming and Excluding</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/policies.html">Policies</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/templates.html">Templates</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/wrappers.html">Wrappers</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/exporting_an_entire_header.html">Exporting An Entire Header</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/smart_pointers.html">Smart Pointers</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/global_variables.html">Global Variables</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/adding_new_methods.html">Adding New Methods</a>
-    </td>
-  </tr>
-  <tr>
-    <td class="toc_cells_L1">
-        <a href="doc/inserting_code.html">Inserting Code</a>
-    </td>
-  </tr>
-</table>
-<br>
-<hr size="1"><p class="copyright">Copyright &copy; 2003 Bruno da Silva de Oliveira<br>Copyright &copy; 2002-2003 Joel de Guzman<br><br>
-<font size="2">Permission to copy, use, modify, sell and distribute this document
- is granted provided this copyright notice appears in all copies. This document
- is provided &quot;as is&quot; without express or implied warranty, and with
- no claim as to its suitability for any purpose. </font> </p>
-</body>
-</html>
diff --git a/pyste/install/pyste.py b/pyste/install/pyste.py
deleted file mode 100644
index 9547d5f7..00000000
--- a/pyste/install/pyste.py
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env python
-
-from Pyste import pyste
-pyste.main()
diff --git a/pyste/install/setup.py b/pyste/install/setup.py
deleted file mode 100644
index 6c156536..00000000
--- a/pyste/install/setup.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# contributed by Prabhu Ramachandran
-
-from distutils.core import setup
-import sys
-
-setup (name              = "Pyste",
-       version           = "0.9.10",
-       description       = "Pyste - Python Semi-Automatic Exporter",
-       maintainer        = "Bruno da Silva de Oliveira",
-       maintainer_email  = "nicodemus@globalite.com.br",
-       licence           = "Boost License",
-       long_description  = "Pyste is a Boost.Python code generator",
-       url               = "http://www.boost.org/libs/python/pyste/index.html",
-       platforms         = ['Any'],
-       packages          = ['Pyste'],
-       scripts           = ['pyste.py'],
-       package_dir       = {'Pyste': '../src/Pyste'},
-       )
diff --git a/pyste/src/Pyste/.cvsignore b/pyste/src/Pyste/.cvsignore
deleted file mode 100644
index 0d20b648..00000000
--- a/pyste/src/Pyste/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pyc
diff --git a/pyste/src/Pyste/ClassExporter.py b/pyste/src/Pyste/ClassExporter.py
deleted file mode 100644
index 32dcef58..00000000
--- a/pyste/src/Pyste/ClassExporter.py
+++ /dev/null
@@ -1,897 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-import exporters
-from Exporter import Exporter
-from declarations import *
-from settings import *
-from policies import *
-from SingleCodeUnit import SingleCodeUnit
-from EnumExporter import EnumExporter
-from utils import makeid, enumerate
-import copy
-import exporterutils
-import re
-
-#==============================================================================
-# ClassExporter
-#==============================================================================
-class ClassExporter(Exporter):
-    'Generates boost.python code to export a class declaration'
- 
-    def __init__(self, info, parser_tail=None):
-        Exporter.__init__(self, info, parser_tail)
-        # sections of code
-        self.sections = {}
-        # template: each item in the list is an item into the class_<...> 
-        # section.
-        self.sections['template'] = []  
-        # constructor: each item in the list is a parameter to the class_ 
-        # constructor, like class_<C>(...)
-        self.sections['constructor'] = []
-        # inside: everything within the class_<> statement        
-        self.sections['inside'] = []        
-        # scope: items outside the class statement but within its scope.
-        # scope* s = new scope(class<>());
-        # ...
-        # delete s;
-        self.sections['scope'] = []
-        # declarations: outside the BOOST_PYTHON_MODULE macro
-        self.sections['declaration'] = []
-        self.sections['declaration-outside'] = []
-        self.sections['include'] = []
-        # a list of Constructor instances
-        self.constructors = []
-        # a list of code units, generated by nested declarations
-        self.nested_codeunits = []
-
-
-    def ScopeName(self):
-        return makeid(self.class_.FullName()) + '_scope'
-
-
-    def Name(self):
-        return self.info.name
-
-
-    def SetDeclarations(self, declarations):
-        Exporter.SetDeclarations(self, declarations)
-        if self.declarations:
-            decl = self.GetDeclaration(self.info.name)
-            if isinstance(decl, Typedef):
-                self.class_ = self.GetDeclaration(decl.type.name)
-                if not self.info.rename:
-                    self.info.rename = decl.name
-            else:
-                self.class_ = decl
-            self.class_ = copy.deepcopy(self.class_)
-        else:
-            self.class_ = None
-        
-        
-    def ClassBases(self):
-        all_bases = []       
-        for level in self.class_.hierarchy:
-            for base in level:
-                all_bases.append(base)
-        return [self.GetDeclaration(x.name) for x in all_bases] 
-
-    
-    def Order(self):
-        '''Return the TOTAL number of bases that this class has, including the
-        bases' bases.  Do this because base classes must be instantialized
-        before the derived classes in the module definition.  
-        '''
-        num_bases = len(self.ClassBases())
-        return num_bases, self.class_.FullName()
-        
-    
-    def Export(self, codeunit, exported_names):
-        self.InheritMethods(exported_names)
-        self.MakeNonVirtual()
-        if not self.info.exclude:
-            self.ExportBasics()
-            self.ExportBases(exported_names)
-            self.ExportConstructors()
-            self.ExportVariables()
-            self.ExportVirtualMethods(codeunit)
-            self.ExportMethods()
-            self.ExportOperators()
-            self.ExportNestedClasses(exported_names)
-            self.ExportNestedEnums(exported_names)
-            self.ExportSmartPointer()
-            self.ExportOpaquePointerPolicies()
-            self.Write(codeunit)
-            exported_names[self.Name()] = 1
-
-
-    def InheritMethods(self, exported_names):
-        '''Go up in the class hierarchy looking for classes that were not
-        exported yet, and then add their public members to this classes
-        members, as if they were members of this class. This allows the user to
-        just export one type and automatically get all the members from the
-        base classes.
-        '''
-        valid_members = (Method, ClassVariable, NestedClass, ClassEnumeration)
-        fullnames = [x.FullName() for x in self.class_]
-        pointers = [x.PointerDeclaration(True) for x in self.class_ if isinstance(x, Method)]
-        fullnames = dict([(x, None) for x in fullnames])
-        pointers = dict([(x, None) for x in pointers])
-        for level in self.class_.hierarchy:
-            level_exported = False
-            for base in level:
-                base = self.GetDeclaration(base.name)
-                if base.FullName() not in exported_names:
-                    for member in base:
-                        if type(member) in valid_members:
-                            member_copy = copy.deepcopy(member)   
-                            member_copy.class_ = self.class_.FullName()
-                            if isinstance(member_copy, Method):
-                                pointer = member_copy.PointerDeclaration(True)
-                                if pointer not in pointers:
-                                    self.class_.AddMember(member)
-                                    pointers[pointer] = None
-                            elif member_copy.FullName() not in fullnames:
-                                self.class_.AddMember(member)        
-                else:
-                    level_exported = True
-            if level_exported:
-                break
-        def IsValid(member):
-            return isinstance(member, valid_members) and member.visibility == Scope.public
-        self.public_members = [x for x in self.class_ if IsValid(x)] 
-
-
-    def Write(self, codeunit):
-        indent = self.INDENT
-        boost_ns = namespaces.python
-        pyste_ns = namespaces.pyste
-        code = ''
-        # begin a scope for this class if needed
-        nested_codeunits = self.nested_codeunits
-        needs_scope = self.sections['scope'] or nested_codeunits
-        if needs_scope:
-            scope_name = self.ScopeName()
-            code += indent + boost_ns + 'scope* %s = new %sscope(\n' %\
-                (scope_name, boost_ns)
-        # export the template section
-        template_params = ', '.join(self.sections['template'])
-        code += indent + boost_ns + 'class_< %s >' % template_params
-        # export the constructor section
-        constructor_params = ', '.join(self.sections['constructor'])
-        code += '(%s)\n' % constructor_params
-        # export the inside section
-        in_indent = indent*2
-        for line in self.sections['inside']:
-            code += in_indent + line + '\n' 
-        # write the scope section and end it
-        if not needs_scope:
-            code += indent + ';\n'
-        else:
-            code += indent + ');\n'
-            for line in self.sections['scope']:
-                code += indent + line + '\n'
-            # write the contents of the nested classes
-            for nested_unit in nested_codeunits:
-                code += '\n' + nested_unit.Section('module')
-            # close the scope
-            code += indent + 'delete %s;\n' % scope_name
-            
-        # write the code to the module section in the codeunit        
-        codeunit.Write('module', code + '\n')
-        
-        # write the declarations to the codeunit        
-        declarations = '\n'.join(self.sections['declaration'])
-        for nested_unit in nested_codeunits:
-            declarations += nested_unit.Section('declaration')
-        if declarations:
-            codeunit.Write('declaration', declarations + '\n')
-        declarations_outside = '\n'.join(self.sections['declaration-outside'])
-        if declarations_outside:
-            codeunit.Write('declaration-outside', declarations_outside + '\n')
-
-        # write the includes to the codeunit
-        includes = '\n'.join(self.sections['include'])
-        for nested_unit in nested_codeunits:
-            includes += nested_unit.Section('include')
-        if includes:
-            codeunit.Write('include', includes)
-
-
-    def Add(self, section, item):
-        'Add the item into the corresponding section'
-        self.sections[section].append(item)
-
-        
-    def ExportBasics(self):
-        '''Export the name of the class and its class_ statement.'''
-        class_name = self.class_.FullName()
-        self.Add('template', class_name)
-        name = self.info.rename or self.class_.name
-        self.Add('constructor', '"%s"' % name)
-        
-        
-    def ExportBases(self, exported_names):
-        'Expose the bases of the class into the template section'        
-        hierarchy = self.class_.hierarchy
-        exported = []
-        for level in hierarchy:
-            for base in level:
-                if base.visibility == Scope.public and base.name in exported_names:
-                    exported.append(base.name)
-            if exported:
-                break
-        if exported:
-            code = namespaces.python + 'bases< %s > ' %  (', '.join(exported))
-            self.Add('template', code)         
-
-
-    def ExportConstructors(self):
-        '''Exports all the public contructors of the class, plus indicates if the 
-        class is noncopyable.
-        '''
-        py_ns = namespaces.python
-        indent = self.INDENT
-        
-        def init_code(cons):
-            'return the init<>() code for the given contructor'
-            param_list = [p.FullName() for p in cons.parameters]
-            min_params_list = param_list[:cons.minArgs]
-            max_params_list = param_list[cons.minArgs:]
-            min_params = ', '.join(min_params_list)
-            max_params = ', '.join(max_params_list)
-            init = py_ns + 'init< '
-            init += min_params
-            if max_params:
-                if min_params:
-                    init += ', '
-                init += py_ns + ('optional< %s >' % max_params)
-            init += ' >()'    
-            return init
-        
-        constructors = [x for x in self.public_members if isinstance(x, Constructor)]
-        self.constructors = constructors[:]
-        # don't export the copy constructor if the class is abstract
-        if self.class_.abstract:
-            for cons in constructors:
-                if cons.IsCopy():
-                    constructors.remove(cons)
-                    break
-        if not constructors:
-            # declare no_init
-            self.Add('constructor', py_ns + 'no_init') 
-        else:
-            # write the constructor with less parameters to the constructor section
-            smaller = None
-            for cons in constructors:
-                if smaller is None or len(cons.parameters) < len(smaller.parameters):
-                    smaller = cons
-            assert smaller is not None
-            self.Add('constructor', init_code(smaller))
-            constructors.remove(smaller)
-            # write the rest to the inside section, using def()
-            for cons in constructors:
-                code = '.def(%s)' % init_code(cons) 
-                self.Add('inside', code)
-        # check if the class is copyable
-        if not self.class_.HasCopyConstructor() or self.class_.abstract:
-            self.Add('template', namespaces.boost + 'noncopyable')
-            
-        
-    def ExportVariables(self):
-        'Export the variables of the class, both static and simple variables'
-        vars = [x for x in self.public_members if isinstance(x, Variable)]
-        for var in vars:
-            if self.info[var.name].exclude: 
-                continue
-            name = self.info[var.name].rename or var.name
-            fullname = var.FullName() 
-            if var.type.const:
-                def_ = '.def_readonly'
-            else:
-                def_ = '.def_readwrite'
-            code = '%s("%s", &%s)' % (def_, name, fullname)
-            self.Add('inside', code)
-
-    
-    def OverloadName(self, method):
-        'Returns the name of the overloads struct for the given method'
-        name = makeid(method.FullName())
-        overloads = '_overloads_%i_%i' % (method.minArgs, method.maxArgs)    
-        return name + overloads
-
-    
-    def GetAddedMethods(self):
-        added_methods = self.info.__added__
-        result = []
-        if added_methods:
-            for name, rename in added_methods:
-                decl = self.GetDeclaration(name)
-                self.info[name].rename = rename
-                result.append(decl)
-        return result
-
-                
-    def ExportMethods(self):
-        '''Export all the non-virtual methods of this class, plus any function
-        that is to be exported as a method'''
-            
-        declared = {}
-        def DeclareOverloads(m):
-            'Declares the macro for the generation of the overloads'
-            if (isinstance(m, Method) and m.static) or type(m) == Function:
-                func = m.FullName()
-                macro = 'BOOST_PYTHON_FUNCTION_OVERLOADS'
-            else:
-                func = m.name
-                macro = 'BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS' 
-            code = '%s(%s, %s, %i, %i)\n' % (macro, self.OverloadName(m), func, m.minArgs, m.maxArgs)
-            if code not in declared:
-                declared[code] = True
-                self.Add('declaration', code)
-
-
-        def Pointer(m):
-            'returns the correct pointer declaration for the method m'
-            # check if this method has a wrapper set for him
-            wrapper = self.info[m.name].wrapper
-            if wrapper:
-                return '&' + wrapper.FullName()
-            else:
-                return m.PointerDeclaration() 
-
-        def IsExportable(m):
-            'Returns true if the given method is exportable by this routine'
-            ignore = (Constructor, ClassOperator, Destructor)
-            return isinstance(m, Function) and not isinstance(m, ignore) and not m.virtual        
-        
-        methods = [x for x in self.public_members if IsExportable(x)]        
-        methods.extend(self.GetAddedMethods())
-        
-        staticmethods = {}
-        
-        for method in methods:
-            method_info = self.info[method.name]
-            
-            # skip this method if it was excluded by the user
-            if method_info.exclude:
-                continue 
-
-            # rename the method if the user requested
-            name = method_info.rename or method.name
-            
-            # warn the user if this method needs a policy and doesn't have one
-            method_info.policy = exporterutils.HandlePolicy(method, method_info.policy)
-            
-            # check for policies
-            policy = method_info.policy or ''
-            if policy:
-                policy = ', %s%s()' % (namespaces.python, policy.Code())
-            # check for overloads
-            overload = ''
-            if method.minArgs != method.maxArgs:
-                # add the overloads for this method
-                DeclareOverloads(method)
-                overload_name = self.OverloadName(method)
-                overload = ', %s%s()' % (namespaces.pyste, overload_name)
-        
-            # build the .def string to export the method
-            pointer = Pointer(method)
-            code = '.def("%s", %s' % (name, pointer)
-            code += policy
-            code += overload
-            code += ')'
-            self.Add('inside', code)
-            # static method
-            if isinstance(method, Method) and method.static:
-                staticmethods[name] = 1
-            # add wrapper code if this method has one
-            wrapper = method_info.wrapper
-            if wrapper and wrapper.code:
-                self.Add('declaration-outside', wrapper.code)
-        
-        # export staticmethod statements
-        for name in staticmethods:
-            code = '.staticmethod("%s")' % name
-            self.Add('inside', code) 
-
-
-                
-    def MakeNonVirtual(self):
-        '''Make all methods that the user indicated to no_override no more virtual, delegating their
-        export to the ExportMethods routine'''
-        for member in self.class_:
-            if type(member) == Method and member.virtual:
-                member.virtual = not self.info[member.name].no_override 
-
-
-    def ExportVirtualMethods(self, codeunit):        
-        # check if this class has any virtual methods
-        has_virtual_methods = False
-        for member in self.class_:
-            if type(member) == Method and member.virtual:
-                has_virtual_methods = True
-                break
-
-        holder = self.info.holder
-        if has_virtual_methods:
-            generator = _VirtualWrapperGenerator(self.class_, self.ClassBases(), self.info, codeunit)
-            if holder:
-                self.Add('template', holder(generator.FullName()))
-            else:
-                self.Add('template', generator.FullName())
-            for definition in generator.GenerateDefinitions():
-                self.Add('inside', definition)
-            self.Add('declaration', generator.GenerateVirtualWrapper(self.INDENT))
-        else:
-            if holder:
-                self.Add('template', holder(self.class_.FullName()))
-
-    # operators natively supported by boost
-    BOOST_SUPPORTED_OPERATORS = '+ - * / % ^ & ! ~ | < > == != <= >= << >> && || += -= '\
-        '*= /= %= ^= &= |= <<= >>='.split()
-    # create a map for faster lookup
-    BOOST_SUPPORTED_OPERATORS = dict(zip(BOOST_SUPPORTED_OPERATORS, range(len(BOOST_SUPPORTED_OPERATORS))))
-
-    # a dict of operators that are not directly supported by boost, but can be exposed
-    # simply as a function with a special name
-    BOOST_RENAME_OPERATORS = {
-        '()' : '__call__',
-    }
-
-    # converters which have a special name in python
-    # it's a map of a regular expression of the converter's result to the
-    # appropriate python name
-    SPECIAL_CONVERTERS = {
-        re.compile(r'(const)?\s*double$') : '__float__',
-        re.compile(r'(const)?\s*float$') : '__float__',
-        re.compile(r'(const)?\s*int$') : '__int__',
-        re.compile(r'(const)?\s*long$') : '__long__',
-        re.compile(r'(const)?\s*char\s*\*?$') : '__str__',
-        re.compile(r'(const)?.*::basic_string<.*>\s*(\*|\&)?$') : '__str__',
-    }
-        
-    
-    def ExportOperators(self):
-        'Export all member operators and free operators related to this class'
-        
-        def GetFreeOperators():
-            'Get all the free (global) operators related to this class'
-            operators = []
-            for decl in self.declarations:
-                if isinstance(decl, Operator):
-                    # check if one of the params is this class
-                    for param in decl.parameters:
-                        if param.name == self.class_.FullName():
-                            operators.append(decl)
-                            break
-            return operators
-
-        def GetOperand(param):
-            'Returns the operand of this parameter (either "self", or "other<type>")'
-            if param.name == self.class_.FullName():
-                return namespaces.python + 'self'
-            else:
-                return namespaces.python + ('other< %s >()' % param.name)
-
-
-        def HandleSpecialOperator(operator):
-            # gatter information about the operator and its parameters
-            result_name = operator.result.name                        
-            param1_name = ''
-            if operator.parameters:
-                param1_name = operator.parameters[0].name
-                
-            # check for str
-            ostream = 'basic_ostream'
-            is_str = result_name.find(ostream) != -1 and param1_name.find(ostream) != -1
-            if is_str:
-                namespace = namespaces.python + 'self_ns::'
-                self_ = namespaces.python + 'self'
-                return '.def(%sstr(%s))' % (namespace, self_)
-
-            # is not a special operator
-            return None
-                
-
-        
-        frees = GetFreeOperators()
-        members = [x for x in self.public_members if type(x) == ClassOperator]
-        all_operators = frees + members
-        operators = [x for x in all_operators if not self.info['operator'][x.name].exclude]
-        
-        for operator in operators:
-            # gatter information about the operator, for use later
-            wrapper = self.info['operator'][operator.name].wrapper
-            if wrapper:
-                pointer = '&' + wrapper.FullName()
-                if wrapper.code:
-                    self.Add('declaration-outside', wrapper.code)
-            else:
-                pointer = operator.PointerDeclaration()                 
-            rename = self.info['operator'][operator.name].rename
-
-            # check if this operator will be exported as a method
-            export_as_method = wrapper or rename or operator.name in self.BOOST_RENAME_OPERATORS
-            
-            # check if this operator has a special representation in boost
-            special_code = HandleSpecialOperator(operator)
-            has_special_representation = special_code is not None
-            
-            if export_as_method:
-                # export this operator as a normal method, renaming or using the given wrapper
-                if not rename:
-                    if wrapper:
-                        rename = wrapper.name
-                    else:
-                        rename = self.BOOST_RENAME_OPERATORS[operator.name]
-                policy = ''
-                policy_obj = self.info['operator'][operator.name].policy
-                if policy_obj:
-                    policy = ', %s()' % policy_obj.Code() 
-                self.Add('inside', '.def("%s", %s%s)' % (rename, pointer, policy))
-            
-            elif has_special_representation:
-                self.Add('inside', special_code)
-                
-            elif operator.name in self.BOOST_SUPPORTED_OPERATORS:
-                # export this operator using boost's facilities
-                op = operator
-                is_unary = isinstance(op, Operator) and len(op.parameters) == 1 or\
-                           isinstance(op, ClassOperator) and len(op.parameters) == 0
-                if is_unary:
-                    self.Add('inside', '.def( %s%sself )' % \
-                        (operator.name, namespaces.python))
-                else:
-                    # binary operator
-                    if len(operator.parameters) == 2:
-                        left_operand = GetOperand(operator.parameters[0])
-                        right_operand = GetOperand(operator.parameters[1])
-                    else:
-                        left_operand = namespaces.python + 'self'
-                        right_operand = GetOperand(operator.parameters[0])
-                    self.Add('inside', '.def( %s %s %s )' % \
-                        (left_operand, operator.name, right_operand))
-
-        # export the converters.
-        # export them as simple functions with a pre-determined name
-
-        converters = [x for x in self.public_members if type(x) == ConverterOperator]
-                
-        def ConverterMethodName(converter):
-            result_fullname = converter.result.FullName()
-            result_name = converter.result.name
-            for regex, method_name in self.SPECIAL_CONVERTERS.items():
-                if regex.match(result_fullname):
-                    return method_name
-            else:
-                # extract the last name from the full name
-                result_name = makeid(result_name)
-                return 'to_' + result_name
-            
-        for converter in converters:
-            info = self.info['operator'][converter.result.FullName()]
-            # check if this operator should be excluded
-            if info.exclude:
-                continue
-            
-            special_code = HandleSpecialOperator(converter)
-            if info.rename or not special_code:
-                # export as method
-                name = info.rename or ConverterMethodName(converter)
-                pointer = converter.PointerDeclaration()
-                policy_code = ''
-                if info.policy:
-                    policy_code = ', %s()' % info.policy.Code()
-                self.Add('inside', '.def("%s", %s%s)' % (name, pointer, policy_code))
-                    
-            elif special_code:
-                self.Add('inside', special_code)
-
-
-
-    def ExportNestedClasses(self, exported_names):
-        nested_classes = [x for x in self.public_members if isinstance(x, NestedClass)]
-        for nested_class in nested_classes:
-            nested_info = self.info[nested_class.name]
-            nested_info.include = self.info.include
-            nested_info.name = nested_class.FullName()
-            exporter = self.__class__(nested_info)
-            exporter.SetDeclarations(self.declarations)
-            codeunit = SingleCodeUnit(None, None)
-            exporter.Export(codeunit, exported_names)
-            self.nested_codeunits.append(codeunit)
-
-
-    def ExportNestedEnums(self, exported_names):
-        nested_enums = [x for x in self.public_members if isinstance(x, ClassEnumeration)]
-        for enum in nested_enums:
-            enum_info = self.info[enum.name]
-            enum_info.include = self.info.include
-            enum_info.name = enum.FullName()
-            exporter = EnumExporter(enum_info)
-            exporter.SetDeclarations(self.declarations)
-            codeunit = SingleCodeUnit(None, None)
-            exporter.Export(codeunit, exported_names)
-            self.nested_codeunits.append(codeunit)
-
-
-    def ExportSmartPointer(self):
-        smart_ptr = self.info.smart_ptr
-        if smart_ptr:
-            class_name = self.class_.FullName()
-            smart_ptr = smart_ptr % class_name
-            self.Add('scope', '%sregister_ptr_to_python< %s >();' % (namespaces.python, smart_ptr))
-            
-
-    def ExportOpaquePointerPolicies(self):
-        # check all methods for 'return_opaque_pointer' policies
-        methods = [x for x in self.public_members if isinstance(x, Method)]
-        for method in methods:
-            return_opaque_policy = return_value_policy(return_opaque_pointer)
-            if self.info[method.name].policy == return_opaque_policy:
-                macro = exporterutils.EspecializeTypeID(method.result.name) 
-                if macro:
-                    self.Add('declaration-outside', macro)
-
-
-#==============================================================================
-# Virtual Wrapper utils
-#==============================================================================
-
-def _ParamsInfo(m, count=None):
-    if count is None:
-        count = len(m.parameters)
-    param_names = ['p%i' % i for i in range(count)]
-    param_types = [x.FullName() for x in m.parameters[:count]]
-    params = ['%s %s' % (t, n) for t, n in zip(param_types, param_names)]
-    #for i, p in enumerate(m.parameters[:count]):
-    #    if p.default is not None:
-    #        #params[i] += '=%s' % p.default
-    #        params[i] += '=%s' % (p.name + '()')
-    params = ', '.join(params) 
-    return params, param_names, param_types
-
-            
-class _VirtualWrapperGenerator(object):
-    'Generates code to export the virtual methods of the given class'
-
-    def __init__(self, class_, bases, info, codeunit):
-        self.class_ = copy.deepcopy(class_)
-        self.bases = bases[:]
-        self.info = info
-        self.wrapper_name = makeid(class_.FullName()) + '_Wrapper'
-        self.virtual_methods = None
-        self._method_count = {}
-        self.codeunit = codeunit
-        self.GenerateVirtualMethods()
-
-
-    def DefaultImplementationNames(self, method):
-        '''Returns a list of default implementations for this method, one for each
-        number of default arguments. Always returns at least one name, and return from 
-        the one with most arguments to the one with the least.
-        '''
-        base_name = 'default_' + method.name 
-        minArgs = method.minArgs
-        maxArgs = method.maxArgs
-        if minArgs == maxArgs:
-            return [base_name]
-        else:
-            return [base_name + ('_%i' % i) for i in range(minArgs, maxArgs+1)]                
-
-
-    def Declaration(self, method, indent):
-        '''Returns a string with the declarations of the virtual wrapper and
-        its default implementations. This string must be put inside the Wrapper
-        body.        
-        '''
-        pyste = namespaces.pyste
-        python = namespaces.python
-        rename = self.info[method.name].rename or method.name
-        result = method.result.FullName()
-        return_str = 'return '
-        if result == 'void':
-            return_str = ''
-        params, param_names, param_types = _ParamsInfo(method)
-        constantness = ''
-        if method.const:
-            constantness = ' const'
-        
-        # call_method callback
-        decl  = indent + '%s %s(%s)%s%s {\n' % (result, method.name, params, constantness, method.Exceptions())
-        param_names_str = ', '.join(param_names)
-        if param_names_str:
-            param_names_str = ', ' + param_names_str
-        decl += indent*2 + '%s%scall_method< %s >(self, "%s"%s);\n' %\
-            (return_str, python, result, rename, param_names_str)
-        decl += indent + '}\n'
-
-        # default implementations (with overloading)
-        def DefaultImpl(method, param_names):
-            'Return the body of a default implementation wrapper'
-            indent2 = indent * 2
-            wrapper = self.info[method.name].wrapper
-            if not wrapper:
-                # return the default implementation of the class
-                return indent2 + '%s%s(%s);\n' % \
-                    (return_str, method.FullName(), ', '.join(param_names)) 
-            else:
-                if wrapper.code:
-                    self.codeunit.Write('declaration-outside', wrapper.code) 
-                # return a call for the wrapper
-                params = ', '.join(['this'] + param_names)
-                return indent2 + '%s%s(%s);\n' % (return_str, wrapper.FullName(), params)
-                
-        if not method.abstract and method.visibility != Scope.private:
-            minArgs = method.minArgs
-            maxArgs = method.maxArgs
-            impl_names = self.DefaultImplementationNames(method)
-            for impl_name, argNum in zip(impl_names, range(minArgs, maxArgs+1)): 
-                params, param_names, param_types = _ParamsInfo(method, argNum)            
-                decl += '\n'
-                decl += indent + '%s %s(%s)%s {\n' % (result, impl_name, params, constantness)
-                decl += DefaultImpl(method, param_names)
-                decl += indent + '}\n'                
-        return decl
-            
-
-    def MethodDefinition(self, method):
-        '''Returns a list of lines, which should be put inside the class_
-        statement to export this method.'''
-        # dont define abstract methods
-        pyste = namespaces.pyste
-        rename = self.info[method.name].rename or method.name
-        default_names = self.DefaultImplementationNames(method)
-        class_name = self.class_.FullName()
-        wrapper_name = pyste + self.wrapper_name
-        result = method.result.FullName()
-        is_method_unique = method.is_unique
-        constantness = ''
-        if method.const:
-            constantness = ' const'
-        
-        # create a list of default-impl pointers
-        minArgs = method.minArgs
-        maxArgs = method.maxArgs 
-        if method.abstract:
-            default_pointers = []
-        elif is_method_unique:
-            default_pointers = ['&%s::%s' % (wrapper_name, x) for x in default_names]
-        else:
-            default_pointers = []
-            for impl_name, argNum in zip(default_names, range(minArgs, maxArgs+1)):
-                param_list = [x.FullName() for x in method.parameters[:argNum]]
-                params = ', '.join(param_list)             
-                signature = '%s (%s::*)(%s)%s' % (result, wrapper_name, params, constantness)
-                default_pointer = '(%s)&%s::%s' % (signature, wrapper_name, impl_name)
-                default_pointers.append(default_pointer)
-            
-        # get the pointer of the method
-        pointer = method.PointerDeclaration()
-        if method.abstract:
-            pointer = namespaces.python + ('pure_virtual(%s)' % pointer)
-
-        # Add policy to overloaded methods also
-        policy = self.info[method.name].policy or ''
-        if policy:
-            policy = ', %s%s()' % (namespaces.python, policy.Code())
-
-        # generate the defs
-        definitions = []
-        # basic def
-        if default_pointers:
-            definitions.append('.def("%s", %s, %s%s)' % (rename, pointer, default_pointers[-1], policy))
-            for default_pointer in default_pointers[:-1]:
-                definitions.append('.def("%s", %s%s)' % (rename, default_pointer, policy))
-        else:
-            definitions.append('.def("%s", %s%s)' % (rename, pointer, policy))
-        return definitions
-
-    
-    def FullName(self):
-        return namespaces.pyste + self.wrapper_name
-
-
-    def GenerateVirtualMethods(self):
-        '''To correctly export all virtual methods, we must also make wrappers
-        for the virtual methods of the bases of this class, as if the methods
-        were from this class itself.
-        This method creates the instance variable self.virtual_methods.
-        '''        
-        def IsVirtual(m):
-            if type(m) is Method:
-                pure_virtual = m.abstract and m.virtual
-                virtual = m.virtual and m.visibility != Scope.private
-                return virtual or pure_virtual
-            else:
-                return False
-                
-        # extract the virtual methods, avoiding duplications. The duplication
-        # must take in account the full signature without the class name, so 
-        # that inherited members are correctly excluded if the subclass overrides
-        # them.
-        def MethodSig(method):
-            if method.const:
-                const = ' const'
-            else:
-                const = ''
-            if method.result:
-                result = method.result.FullName()
-            else:
-                result = ''
-            params = ', '.join([x.FullName() for x in method.parameters]) 
-            return '%s %s(%s)%s%s' % (
-                result, method.name, params, const, method.Exceptions())  
-
-        already_added = {}
-        self.virtual_methods = []
-        for member in self.class_:
-            if IsVirtual(member):
-                already_added[MethodSig(member)] = None
-                self.virtual_methods.append(member)
-
-        for base in self.bases:
-            base_methods = [copy.deepcopy(x) for x in base if IsVirtual(x)]
-            for base_method in base_methods:
-                self.class_.AddMember(base_method)
-                
-        all_methods = [x for x in self.class_ if IsVirtual(x)]
-        
-        for member in all_methods:
-            sig = MethodSig(member)
-            if IsVirtual(member) and not sig in already_added:
-                self.virtual_methods.append(member)
-                already_added[sig] = 0
-            
-    
-    def Constructors(self):
-        return self.class_.Constructors(publics_only=True)
-    
-        
-    def GenerateDefinitions(self):
-        defs = []
-        for method in self.virtual_methods:
-            exclude = self.info[method.name].exclude
-            # generate definitions only for public methods and non-abstract methods
-            if method.visibility == Scope.public and not exclude:
-                defs.extend(self.MethodDefinition(method))
-        return defs
-
-        
-    def GenerateVirtualWrapper(self, indent):
-        'Return the wrapper for this class'
-        
-        # generate the class code
-        class_name = self.class_.FullName()
-        code = 'struct %s: %s\n' % (self.wrapper_name, class_name)
-        code += '{\n'
-        # generate constructors (with the overloads for each one)
-        for cons in self.Constructors(): # only public constructors
-            minArgs = cons.minArgs
-            maxArgs = cons.maxArgs
-            # from the min number of arguments to the max number, generate
-            # all version of the given constructor
-            cons_code = ''
-            for argNum in range(minArgs, maxArgs+1):
-                params, param_names, param_types = _ParamsInfo(cons, argNum)
-                if params:
-                    params = ', ' + params
-                cons_code += indent + '%s(PyObject* self_%s):\n' % \
-                    (self.wrapper_name, params)
-                cons_code += indent*2 + '%s(%s), self(self_) {}\n\n' % \
-                    (class_name, ', '.join(param_names))
-            code += cons_code
-        # generate the body
-        body = []
-        for method in self.virtual_methods:
-            if not self.info[method.name].exclude:
-                body.append(self.Declaration(method, indent))            
-        body = '\n'.join(body) 
-        code += body + '\n'
-        # add the self member
-        code += indent + 'PyObject* self;\n'
-        code += '};\n'
-        return code 
diff --git a/pyste/src/Pyste/CodeExporter.py b/pyste/src/Pyste/CodeExporter.py
deleted file mode 100644
index 3680bb72..00000000
--- a/pyste/src/Pyste/CodeExporter.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-from Exporter import Exporter
-
-#==============================================================================
-# CodeExporter
-#==============================================================================
-class CodeExporter(Exporter):
-
-    def __init__(self, info):
-        Exporter.__init__(self, info)
-
-
-    def Name(self):
-        return self.info.code
-
-
-    def Export(self, codeunit, exported_names):
-        codeunit.Write(self.info.section, self.info.code)        
-
-
-    def WriteInclude(self, codeunit):
-        pass
diff --git a/pyste/src/Pyste/CppParser.py b/pyste/src/Pyste/CppParser.py
deleted file mode 100644
index eb5e32c3..00000000
--- a/pyste/src/Pyste/CppParser.py
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-from GCCXMLParser import ParseDeclarations
-import tempfile
-import shutil
-import os
-import sys
-import os.path
-import settings
-import shutil
-import shelve
-from cPickle import dump, load
-
-#==============================================================================
-# exceptions
-#==============================================================================
-class CppParserError(Exception): pass
-
-#==============================================================================
-# CppParser
-#==============================================================================
-class CppParser:
-    'Parses a header file and returns a list of declarations'
-    
-    def __init__(self, includes=None, defines=None, cache_dir=None, version=None):
-        'includes and defines ar the directives given to gcc'
-        if includes is None:
-            includes = []
-        if defines is None:
-            defines = []
-        self.includes = includes
-        self.defines = defines
-        self.version = version
-        #if cache_dir is None:
-        #    cache_dir = tempfile.mktemp()
-        #    self.delete_cache = True
-        #else:
-        #    self.delete_cache = False
-        self.delete_cache = False
-        self.cache_dir = cache_dir
-        self.cache_files = []
-        self.mem_cache = {}
-        # create the cache dir
-        if cache_dir:
-            try:
-                os.makedirs(cache_dir)
-            except OSError: pass  
-
-
-    def __del__(self):
-        self.Close()
-
-        
-    def _IncludeParams(self, filename):
-        includes = self.includes[:]
-        filedir = os.path.dirname(filename)
-        if not filedir:
-            filedir = '.'
-        includes.insert(0, filedir)
-        includes = ['-I "%s"' % self.Unixfy(x) for x in includes]
-        return ' '.join(includes)
-
-
-    def _DefineParams(self):
-        defines = ['-D "%s"' % x for x in self.defines]
-        return ' '.join(defines)
-    
-    
-    def FindHeader(self, header):
-        if os.path.isfile(header):
-            return header
-        for path in self.includes:
-            filename = os.path.join(path, header)  
-            if os.path.isfile(filename):
-                return filename
-        else:
-            name = os.path.basename(header)
-            raise RuntimeError, 'Header file "%s" not found!' % name
-    
-            
-    def AppendTail(self, filename, tail):
-        '''Creates a temporary file, appends the text tail to it, and returns
-        the filename of the file.
-        '''
-        temp = tempfile.mktemp('.h') 
-        shutil.copyfile(filename, temp)
-        f = file(temp, 'a')
-        f.write('\n\n'+tail)
-        f.close()   
-        return temp
-
-
-    def Unixfy(self, path):
-        return path.replace('\\', '/')
-
-
-    def ParseWithGCCXML(self, header, tail):
-        '''Parses the given header using gccxml and GCCXMLParser.
-        '''
-        header = self.FindHeader(header) 
-        if tail:
-            filename = self.AppendTail(header, tail)
-        else:
-            filename = header
-        xmlfile = tempfile.mktemp('.xml')
-        try:            
-            # get the params
-            includes = self._IncludeParams(filename)
-            defines = self._DefineParams()
-            # call gccxml
-            cmd = 'gccxml %s %s %s -fxml=%s'
-            filename = self.Unixfy(filename)
-            xmlfile = self.Unixfy(xmlfile)
-            status = os.system(cmd % (includes, defines, filename, xmlfile))
-            if status != 0 or not os.path.isfile(xmlfile):
-                raise CppParserError, 'Error executing gccxml'
-            # parse the resulting xml
-            declarations = ParseDeclarations(xmlfile)
-            # make the declarations' location to point to the original file
-            if tail:
-                for decl in declarations:
-                    decl_filename = os.path.normpath(os.path.normcase(decl.location[0]))
-                    filename = os.path.normpath(os.path.normcase(filename))
-                    if decl_filename == filename:
-                        decl.location = header, decl.location[1]
-            # return the declarations                         
-            return declarations
-        finally:
-            if settings.DEBUG and os.path.isfile(xmlfile):
-                filename = os.path.basename(header)
-                filename = os.path.splitext(filename)[0] + '.xml'
-                shutil.copy(xmlfile, filename)
-            # delete the temporary files
-            try:
-                os.remove(xmlfile)
-                if tail:
-                    os.remove(filename)
-            except OSError: pass                
-
-            
-    def Parse(self, header, interface, tail=None):
-        '''Parses the given filename related to the given interface and returns
-        the (declarations, headerfile). The header returned is normally the
-        same as the given to this method (except that it is the full path),
-        except if tail is not None: in this case, the header is copied to a temp
-        filename and the tail code is appended to it before being passed on to
-        gccxml.  This temp filename is then returned.
-        '''        
-        if tail is None:
-            tail = ''
-        tail.strip()
-        declarations = self.GetCache(header, interface, tail)
-        if declarations is None:
-            declarations = self.ParseWithGCCXML(header, tail)
-            self.CreateCache(header, interface, tail, declarations)
-        header_fullpath = os.path.abspath(self.FindHeader(header))
-        return declarations, header_fullpath
-
-
-    def CacheFileName(self, interface):
-        interface_name = os.path.basename(interface)
-        cache_file = os.path.splitext(interface_name)[0] + '.pystec'
-        cache_file = os.path.join(self.cache_dir, cache_file) 
-        return cache_file
-        
-
-    def GetCache(self, header, interface, tail):
-        key = (header, interface, tail)
-        # try memory cache first
-        if key in self.mem_cache:
-            return self.mem_cache[key]
-        
-        # get the cache from the disk
-        if self.cache_dir is None:
-            return None 
-        header = self.FindHeader(header) 
-        cache_file = self.CacheFileName(interface)    
-        if os.path.isfile(cache_file):
-            f = file(cache_file, 'rb')
-            try:
-                version = load(f)
-                if version != self.version:
-                    return None
-                cache = load(f)
-                if cache.has_key(key):
-                    self.cache_files.append(cache_file)
-                    return cache[key]
-                else:
-                    return None
-            finally:
-                f.close()
-        else:
-            return None
-
-
-    def CreateCache(self, header, interface, tail, declarations):
-        key = (header, interface, tail)
-        
-        # our memory cache only holds one item
-        self.mem_cache.clear() 
-        self.mem_cache[key] = declarations
-
-        # save the cache in the disk
-        if self.cache_dir is None:
-            return
-        header = self.FindHeader(header) 
-        cache_file = self.CacheFileName(interface)
-        if os.path.isfile(cache_file):
-            f = file(cache_file, 'rb')
-            try:
-                version = load(f)
-                cache = load(f)
-            finally:
-                f.close()
-        else:
-            cache = {}
-        cache[key] = declarations
-        self.cache_files.append(cache_file)
-        f = file(cache_file, 'wb')
-        try:
-            dump(self.version, f, 1)
-            dump(cache, f, 1)
-        finally:
-            f.close()
-        return cache_file 
-
-
-    def Close(self):
-        if self.delete_cache and self.cache_files:
-            for filename in self.cache_files:
-                try:
-                    os.remove(filename)
-                except OSError: 
-                    pass
-            self.cache_files = []
-            shutil.rmtree(self.cache_dir)
diff --git a/pyste/src/Pyste/EnumExporter.py b/pyste/src/Pyste/EnumExporter.py
deleted file mode 100644
index 3206ca32..00000000
--- a/pyste/src/Pyste/EnumExporter.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-from Exporter import Exporter
-from settings import *
-import utils
-
-#==============================================================================
-# EnumExporter 
-#==============================================================================
-class EnumExporter(Exporter):
-    'Exports enumerators'
-
-    def __init__(self, info):
-        Exporter.__init__(self, info)
-
-
-    def SetDeclarations(self, declarations):
-        Exporter.SetDeclarations(self, declarations)
-        if self.declarations:
-            self.enum = self.GetDeclaration(self.info.name)
-        else:
-            self.enum = None
-
-    TYPE_COUNT = 0
-    
-    def Export(self, codeunit, exported_names):
-        if not self.info.exclude:
-            indent = self.INDENT
-            in_indent = self.INDENT*2
-            rename = self.info.rename or self.enum.name
-            full_name = self.enum.FullName()
-            unnamed_enum = False
-            if rename.startswith('$_') or rename.startswith('._'):
-                unnamed_enum = True
-                self.ExportUniqueInt(codeunit)
-                full_name = namespaces.pyste + 'UniqueInt<%d>' % EnumExporter.TYPE_COUNT
-                EnumExporter.TYPE_COUNT += 1
-                rename = "unnamed"
-            code = indent + namespaces.python
-            code += 'enum_< %s >("%s")\n' % (full_name, rename)
-            for name in self.enum.values:         
-                rename = self.info[name].rename or name
-                value_fullname = self.enum.ValueFullName(name)
-                code += in_indent + '.value("%s", %s)\n' % (rename, value_fullname)
-            if self.info.export_values or unnamed_enum:
-                code += in_indent + '.export_values()\n'
-            code += indent + ';\n\n'
-            codeunit.Write('module', code)
-            exported_names[self.enum.FullName()] = 1
-
-
-    def ExportUniqueInt(self, codeunit):
-        write = lambda s: codeunit.Write('declaration', s)
-        write('// Unique type for unnamed enums\n')
-        write('#ifndef PYSTE_UNIQUE_INT_DEFINED\n')
-        write('#define PYSTE_UNIQUE_INT_DEFINED\n')
-        write('template<int num>\n')
-        write('struct UniqueInt {\n')
-        write('   int v;\n')
-        write('   enum { value=num };\n')
-        write('   UniqueInt(int v_):\n') 
-        write('       v(v_)\n')
-        write('   {}\n')
-        write('   operator int() const\n')
-        write('   { return v; }\n')
-        write('};\n')
-        write('#endif // PYSTE_UNIQUE_INT_DEFINED \n')
-            
-
-    def Name(self):
-        return self.info.name
diff --git a/pyste/src/Pyste/Exporter.py b/pyste/src/Pyste/Exporter.py
deleted file mode 100644
index 4de90693..00000000
--- a/pyste/src/Pyste/Exporter.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-import os.path
-
-#==============================================================================
-# Exporter
-#==============================================================================
-class Exporter(object):
-    'Base class for objects capable to generate boost.python code.'
-
-    INDENT = ' ' * 4
-    
-    def __init__(self, info, parser_tail=None):
-        self.info = info
-        self.parser_tail = parser_tail
-        self.interface_file = None
-        self.declarations = []
-    
-
-    def Name(self):
-        raise NotImplementedError(self.__class__.__name__)
-
-
-    def Tail(self):
-        return self.parser_tail
-
-        
-    def Parse(self, parser):
-        self.parser = parser
-        header = self.info.include
-        tail = self.parser_tail
-        declarations, parser_header = parser.parse(header, tail)
-        self.parser_header = parser_header
-        self.SetDeclarations(declarations)
-
-
-    def SetParsedHeader(self, parsed_header):
-        self.parser_header = parsed_header 
-
-
-    def SetDeclarations(self, declarations):
-        self.declarations = declarations
-
-        
-    def GenerateCode(self, codeunit, exported_names):
-        self.WriteInclude(codeunit)
-        self.Export(codeunit, exported_names)        
-
-
-    def WriteInclude(self, codeunit):
-        codeunit.Write('include', '#include <%s>\n' % self.info.include)
-        
-        
-    def Export(self, codeunit, exported_names):
-        'subclasses must override this to do the real work'
-        pass
-    
-                    
-    def GetDeclarations(self, fullname):
-        decls = []
-        for decl in self.declarations:
-            if decl.FullName() == fullname:
-                decls.append(decl)
-        if not decls:
-            raise RuntimeError, 'no %s declaration found!' % fullname
-        return decls
-
-
-    def GetDeclaration(self, fullname):
-        decls = self.GetDeclarations(fullname)
-        #assert len(decls) == 1
-        return decls[0]
-
-
-    def Order(self):
-        '''Returns a string that uniquely identifies this instance. All
-        exporters will be sorted by Order before being exported.
-        '''
-        return 0, self.info.name
-
-
-    def Header(self):
-        return self.info.include
-
-
-    def __eq__(self, other):
-        return type(self) is type(other) and self.Name() == other.Name() \
-            and self.interface_file == other.interface_file
-
-    def __ne__(self, other):
-        return not self == other
diff --git a/pyste/src/Pyste/FunctionExporter.py b/pyste/src/Pyste/FunctionExporter.py
deleted file mode 100644
index 05da6ec5..00000000
--- a/pyste/src/Pyste/FunctionExporter.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-from Exporter import Exporter
-from policies import *
-from declarations import *
-from settings import *
-import utils
-import exporterutils
-
-
-#==============================================================================
-# FunctionExporter
-#==============================================================================
-class FunctionExporter(Exporter):
-    'Generates boost.python code to export the given function.'
-    
-    def __init__(self, info, tail=None):
-        Exporter.__init__(self, info, tail)
-        
-
-    def Export(self, codeunit, exported_names):
-        if not self.info.exclude:
-            decls = self.GetDeclarations(self.info.name)
-            for decl in decls:
-                self.info.policy = exporterutils.HandlePolicy(decl, self.info.policy)
-                self.ExportDeclaration(decl, len(decls) == 1, codeunit)
-                self.ExportOpaquePointer(decl, codeunit)
-            self.GenerateOverloads(decls, codeunit)  
-            exported_names[self.Name()] = 1
-
-
-    def ExportDeclaration(self, decl, unique, codeunit):
-        name = self.info.rename or decl.name
-        defs = namespaces.python + 'def("%s", ' % name
-        wrapper = self.info.wrapper
-        if wrapper:
-            pointer = '&' + wrapper.FullName()
-        else:
-            pointer = decl.PointerDeclaration()
-        defs += pointer            
-        defs += self.PolicyCode()                            
-        overload = self.OverloadName(decl)
-        if overload:
-            defs += ', %s()' % (namespaces.pyste + overload)
-        defs += ');'
-        codeunit.Write('module', self.INDENT + defs + '\n')  
-        # add the code of the wrapper
-        if wrapper and wrapper.code:
-            codeunit.Write('declaration', wrapper.code + '\n')
-            
-
-    def OverloadName(self, decl):
-        if decl.minArgs != decl.maxArgs:
-            return '%s_overloads_%i_%i' % \
-                (decl.name, decl.minArgs, decl.maxArgs)
-        else:
-            return ''
-
-        
-    def GenerateOverloads(self, declarations, codeunit):
-        codes = {}
-        for decl in declarations:
-            overload = self.OverloadName(decl)
-            if overload and overload not in codes:
-                code = 'BOOST_PYTHON_FUNCTION_OVERLOADS(%s, %s, %i, %i)' %\
-                    (overload, decl.FullName(), decl.minArgs, decl.maxArgs)
-                codeunit.Write('declaration', code + '\n')
-                codes[overload] = None
-        
-
-    def PolicyCode(self):
-        policy = self.info.policy
-        if policy is not None:
-            assert isinstance(policy, Policy)
-            return ', %s()' % policy.Code() 
-        else:
-            return ''
-
-
-    def ExportOpaquePointer(self, function, codeunit):
-        if self.info.policy == return_value_policy(return_opaque_pointer):
-            typename = function.result.name
-            macro = exporterutils.EspecializeTypeID(typename)  
-            if macro:
-                codeunit.Write('declaration-outside', macro)
-
-
-    def Name(self):
-        return self.info.name
diff --git a/pyste/src/Pyste/GCCXMLParser.py b/pyste/src/Pyste/GCCXMLParser.py
deleted file mode 100644
index da3862aa..00000000
--- a/pyste/src/Pyste/GCCXMLParser.py
+++ /dev/null
@@ -1,472 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-from declarations import *
-from elementtree.ElementTree import ElementTree
-from xml.parsers.expat import ExpatError
-from copy import deepcopy
-from utils import enumerate
-
-
-#==============================================================================
-# Exceptions
-#==============================================================================
-class InvalidXMLError(Exception): pass
-
-class ParserError(Exception): pass
-
-class InvalidContextError(ParserError): pass
-
-
-#==============================================================================
-# GCCXMLParser
-#==============================================================================
-class GCCXMLParser(object):
-    'Parse a GCC_XML file and extract the top-level declarations.'
-    
-    interested_tags = {'Class':0, 'Function':0, 'Variable':0, 'Enumeration':0}
-    
-    def Parse(self, filename):
-        self.elements = self.GetElementsFromXML(filename)
-        # high level declarations
-        self.declarations = []
-        self._names = {}
-        # parse the elements
-        for id in self.elements:
-            element, decl = self.elements[id]
-            if decl is None: 
-                try:
-                    self.ParseElement(id, element)
-                except InvalidContextError:
-                    pass # ignore those nodes with invalid context 
-                         # (workaround gccxml bug)
-         
-
-    def Declarations(self):
-        return self.declarations
-
-
-    def AddDecl(self, decl):
-        if decl.FullName() in self._names:
-            decl.is_unique= False
-            for d in self.declarations:
-                if d.FullName() == decl.FullName():
-                    d.is_unique = False
-        self._names[decl.FullName()] = 0
-        self.declarations.append(decl)
-
-        
-    def ParseElement(self, id, element):
-        method = 'Parse' + element.tag
-        if hasattr(self, method):
-            func = getattr(self, method)
-            func(id, element)
-        else:
-            self.ParseUnknown(id, element)
-
-            
-    def GetElementsFromXML(self,filename):
-        'Extracts a dictionary of elements from the gcc_xml file.'
-        
-        tree = ElementTree()
-        try:
-            tree.parse(filename)
-        except ExpatError:
-            raise InvalidXMLError, 'Not a XML file: %s' % filename
-
-        root = tree.getroot()
-        if root.tag != 'GCC_XML':
-            raise InvalidXMLError, 'Not a valid GCC_XML file'
-
-        # build a dictionary of id -> element, None
-        elementlist = root.getchildren()
-        elements = {}
-        for element in elementlist:
-            id = element.get('id')
-            if id:
-                elements[id] = element, None
-        return elements
-
-
-    def GetDecl(self, id):
-        if id not in self.elements:
-            if id == '_0':
-                raise InvalidContextError, 'Invalid context found in the xml file.'
-            else: 
-                msg = 'ID not found in elements: %s' % id
-                raise ParserError, msg
-
-        elem, decl = self.elements[id]
-        if decl is None:
-            self.ParseElement(id, elem)
-            elem, decl = self.elements[id]
-            if decl is None:
-                raise ParserError, 'Could not parse element: %s' % elem.tag
-        return decl
-    
-
-    def GetType(self, id):
-        def Check(id, feature):
-            pos = id.find(feature)
-            if pos != -1:
-                id = id[:pos] + id[pos+1:]
-                return True, id
-            else:
-                return False, id
-        const, id = Check(id, 'c')
-        volatile, id = Check(id, 'v')
-        restricted, id = Check(id, 'r')
-        decl = self.GetDecl(id)
-        if isinstance(decl, Type):
-            res = deepcopy(decl)
-            if const:
-                res.const = const
-            if volatile: 
-                res.volatile = volatile
-            if restricted:
-                res.restricted = restricted
-        else:
-            res = Type(decl.FullName(), const)
-            res.volatile = volatile
-            res.restricted = restricted
-        return res            
-        
-                
-    def GetLocation(self, location):
-        file, line = location.split(':')
-        file = self.GetDecl(file)
-        return file, int(line)
-
-        
-    def Update(self, id, decl):
-        element, _ = self.elements[id]
-        self.elements[id] = element, decl
-
-        
-    def ParseUnknown(self, id, element):
-        name = '__Unknown_Element_%s' % id
-        decl = Unknown(name)
-        self.Update(id, decl)
-        
-        
-    def ParseNamespace(self, id, element):
-        namespace = element.get('name')
-        context = element.get('context')
-        if context:
-            outer = self.GetDecl(context)
-            if not outer.endswith('::'):
-                outer += '::'
-            namespace = outer + namespace
-        if namespace.startswith('::'):
-            namespace = namespace[2:]
-        self.Update(id, namespace)
-
-
-    def ParseFile(self, id, element):
-        filename = element.get('name')
-        self.Update(id, filename)
-
-        
-    def ParseVariable(self, id, element):
-        # in gcc_xml, a static Field is declared as a Variable, so we check
-        # this and call the Field parser.
-        context = self.GetDecl(element.get('context'))
-        if isinstance(context, Class):
-            self.ParseField(id, element)
-            elem, decl = self.elements[id]
-            decl.static = True
-        else:
-            namespace = context
-            name = element.get('name')                    
-            type_ = self.GetType(element.get('type'))
-            location = self.GetLocation(element.get('location'))
-            variable = Variable(type_, name, namespace)
-            variable.location = location
-            self.AddDecl(variable)
-            self.Update(id, variable)
-        
-
-    def GetArguments(self, element):
-        args = []
-        for child in element:
-            if child.tag == 'Argument':
-                type = self.GetType(child.get('type'))
-                type.default = child.get('default')                
-                args.append(type)
-        return args
-
-    
-    def GetExceptions(self, exception_list):
-        if exception_list is None:
-            return None
-
-        exceptions = []
-        for t in exception_list.split():
-            exceptions.append(self.GetType(t))
-
-        return exceptions
-
-
-    def ParseFunction(self, id, element, functionType=Function):
-        '''functionType is used because a Operator is identical to a normal 
-        function, only the type of the function changes.'''
-        name = element.get('name')
-        returns = self.GetType(element.get('returns'))
-        namespace = self.GetDecl(element.get('context'))
-        location = self.GetLocation(element.get('location'))
-        params = self.GetArguments(element)
-        incomplete = bool(int(element.get('incomplete', 0)))
-        throws = self.GetExceptions(element.get('throw', None))
-        function = functionType(name, namespace, returns, params, throws) 
-        function.location = location
-        self.AddDecl(function)
-        self.Update(id, function)
-
-
-    def ParseOperatorFunction(self, id, element):
-        self.ParseFunction(id, element, Operator)
-
-        
-    def GetHierarchy(self, bases):       
-        '''Parses the string "bases" from the xml into a list of tuples of Base
-        instances. The first tuple is the most direct inheritance, and then it
-        goes up in the hierarchy. 
-        '''
-
-        if bases is None:
-            return []
-        base_names = bases.split()
-        this_level = []      
-        next_levels = []
-        for base in base_names:
-            # get the visibility
-            split = base.split(':')
-            if len(split) == 2:
-                visib = split[0]
-                base = split[1]
-            else:
-                visib = Scope.public                            
-            decl = self.GetDecl(base) 
-            if not isinstance(decl, Class):
-                # on windows, there are some classes which "bases" points to an
-                # "Unimplemented" tag, but we are not interested in this classes
-                # anyway
-                continue
-            base = Base(decl.FullName(), visib)
-            this_level.append(base)
-            # normalize with the other levels
-            for index, level in enumerate(decl.hierarchy):
-                if index < len(next_levels):
-                    next_levels[index] = next_levels[index] + level
-                else:
-                    next_levels.append(level)
-        hierarchy = []
-        if this_level:
-            hierarchy.append(tuple(this_level))
-        if next_levels:
-            hierarchy.extend(next_levels)
-        return hierarchy
-
-        
-    def GetMembers(self, member_list):
-        # members must be a string with the ids of the members
-        if member_list is None:
-            return []
-        members = []
-        for member in member_list.split():
-            decl = self.GetDecl(member)
-            if type(decl) in Class.ValidMemberTypes():
-                if type(decl) is str:
-                    print decl
-                members.append(decl) 
-        return members
-
-
-    def ParseClass(self, id, element):
-        name = element.get('name')
-        abstract = bool(int(element.get('abstract', '0')))
-        location = self.GetLocation(element.get('location'))
-        context = self.GetDecl(element.get('context'))
-        incomplete = bool(int(element.get('incomplete', 0)))
-        if isinstance(context, str): 
-            class_ = Class(name, context, [], abstract)
-        else:
-            # a nested class
-            visib = element.get('access', Scope.public)
-            class_ = NestedClass(
-                name, context.FullName(), visib, [], abstract)
-        class_.incomplete = incomplete
-        # we have to add the declaration of the class before trying        
-        # to parse its members and bases, to avoid recursion.
-        self.AddDecl(class_)
-        class_.location = location
-        self.Update(id, class_)       
-        # now we can get the members and the bases
-        class_.hierarchy = self.GetHierarchy(element.get('bases'))        
-        if class_.hierarchy:
-            class_.bases = class_.hierarchy[0]
-        members = self.GetMembers(element.get('members'))
-        for member in members:
-            if type(member) is str:
-                print member
-            class_.AddMember(member)
-
-
-    def ParseStruct(self, id, element):
-        self.ParseClass(id, element)
-
-
-    FUNDAMENTAL_RENAME = {
-        'long long int' : 'boost::int64_t',
-        'long long unsigned int' : 'boost::uint64_t',
-    }
-
-    def ParseFundamentalType(self, id, element):
-        name = element.get('name')
-        name = self.FUNDAMENTAL_RENAME.get(name, name)
-        type_ = FundamentalType(name)
-        self.Update(id, type_)
-
-
-    def ParseArrayType(self, id, element):
-        type = self.GetType(element.get('type'))
-        min = element.get('min')
-        max = element.get('max')
-        array = ArrayType(type.name, type.const, min, max)
-        self.Update(id, array)
-
-        
-    def ParseReferenceType(self, id, element):
-        type = self.GetType(element.get('type'))
-        expand = not isinstance(type, FunctionType)
-        ref = ReferenceType(type.name, type.const, None, expand, type.suffix)
-        self.Update(id, ref)
-        
-        
-    def ParsePointerType(self, id, element):
-        type = self.GetType(element.get('type'))
-        expand = not isinstance(type, FunctionType)
-        ref = PointerType(type.name, type.const, None, expand, type.suffix)
-        self.Update(id, ref)
-        
-        
-    def ParseFunctionType(self, id, element):
-        result = self.GetType(element.get('returns'))
-        args = self.GetArguments(element)
-        func = FunctionType(result, args)
-        self.Update(id, func)
-
-
-    def ParseMethodType(self, id, element):
-        class_ = self.GetDecl(element.get('basetype')).FullName()
-        result = self.GetType(element.get('returns'))
-        args = self.GetArguments(element)
-        method = MethodType(result, args, class_)
-        self.Update(id, method)
-
-        
-    def ParseField(self, id, element):
-        name = element.get('name')
-        visib = element.get('access', Scope.public)
-        classname = self.GetDecl(element.get('context')).FullName()
-        type_ = self.GetType(element.get('type'))
-        static = bool(int(element.get('extern', '0')))
-        location = self.GetLocation(element.get('location'))
-        var = ClassVariable(type_, name, classname, visib, static)
-        var.location = location
-        self.Update(id, var)
-
-
-    def ParseMethod(self, id, element, methodType=Method):
-        name = element.get('name')
-        result = self.GetType(element.get('returns'))
-        classname = self.GetDecl(element.get('context')).FullName()
-        visib = element.get('access', Scope.public)
-        static = bool(int(element.get('static', '0')))
-        virtual = bool(int(element.get('virtual', '0')))
-        abstract = bool(int(element.get('pure_virtual', '0')))
-        const = bool(int(element.get('const', '0')))
-        location = self.GetLocation(element.get('location'))
-        throws = self.GetExceptions(element.get('throw', None)) 
-        params = self.GetArguments(element)
-        method = methodType(
-            name, classname, result, params, visib, virtual, abstract, static, const, throws)
-        method.location = location
-        self.Update(id, method)
-
-
-    def ParseOperatorMethod(self, id, element):
-        self.ParseMethod(id, element, ClassOperator)
-
-        
-    def ParseConstructor(self, id, element):
-        name = element.get('name')
-        visib = element.get('access', Scope.public)
-        classname = self.GetDecl(element.get('context')).FullName()
-        location = self.GetLocation(element.get('location'))
-        params = self.GetArguments(element)
-        ctor = Constructor(name, classname, params, visib)
-        ctor.location = location
-        self.Update(id, ctor)
-
-
-    def ParseDestructor(self, id, element):
-        name = element.get('name')
-        visib = element.get('access', Scope.public)
-        classname = self.GetDecl(element.get('context')).FullName()
-        virtual = bool(int(element.get('virtual', '0')))
-        location = self.GetLocation(element.get('location'))
-        des = Destructor(name, classname, visib, virtual)
-        des.location = location
-        self.Update(id, des)
-
-
-    def ParseConverter(self, id, element):
-        self.ParseMethod(id, element, ConverterOperator)
-
-
-    def ParseTypedef(self, id, element):
-        name = element.get('name')
-        type = self.GetType(element.get('type'))        
-        context = self.GetDecl(element.get('context'))
-        if isinstance(context, Class):
-            context = context.FullName()
-        typedef = Typedef(type, name, context)
-        self.Update(id, typedef)
-        self.AddDecl(typedef)
-
-
-    def ParseEnumeration(self, id, element):
-        name = element.get('name')
-        location = self.GetLocation(element.get('location'))
-        context = self.GetDecl(element.get('context'))
-        incomplete = bool(int(element.get('incomplete', 0))) 
-        if isinstance(context, str):
-            enum = Enumeration(name, context)
-        else:
-            visib = element.get('access', Scope.public)
-            enum = ClassEnumeration(name, context.FullName(), visib)
-        self.AddDecl(enum)
-        enum.location = location
-        for child in element:
-            if child.tag == 'EnumValue':
-                name = child.get('name')
-                value = int(child.get('init'))
-                enum.values[name] = value
-        enum.incomplete = incomplete
-        self.Update(id, enum)
-
-
-
-def ParseDeclarations(filename):
-    'Returns a list of the top declarations found in the gcc_xml file.'
-        
-    parser = GCCXMLParser() 
-    parser.Parse(filename)
-    return parser.Declarations()
-
-
-if __name__ == '__main__':
-    ParseDeclarations(r'D:\Programming\Libraries\boost-cvs\boost\libs\python\pyste\example\test.xml')
diff --git a/pyste/src/Pyste/HeaderExporter.py b/pyste/src/Pyste/HeaderExporter.py
deleted file mode 100644
index e1f20555..00000000
--- a/pyste/src/Pyste/HeaderExporter.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-from Exporter import Exporter
-from ClassExporter import ClassExporter
-from FunctionExporter import FunctionExporter
-from EnumExporter import EnumExporter
-from VarExporter import VarExporter
-from infos import *
-from declarations import *
-import os.path
-import exporters
-import MultipleCodeUnit
-
-#==============================================================================
-# HeaderExporter
-#==============================================================================
-class HeaderExporter(Exporter):
-    'Exports all declarations found in the given header'
-
-    def __init__(self, info, parser_tail=None):
-        Exporter.__init__(self, info, parser_tail)
-
-
-    def WriteInclude(self, codeunit):
-        pass
-
-
-    def IsInternalName(self, name):
-        '''Returns true if the given name looks like a internal compiler
-        structure'''
-        return name.startswith('_')
-        
-
-    def Export(self, codeunit, exported_names):
-        header = os.path.normpath(self.parser_header)
-        for decl in self.declarations:
-            # check if this declaration is in the header
-            location = os.path.abspath(decl.location[0])
-            if location == header and not self.IsInternalName(decl.name):
-                # ok, check the type of the declaration and export it accordingly
-                self.HandleDeclaration(decl, codeunit, exported_names)
-            
-
-    def HandleDeclaration(self, decl, codeunit, exported_names):
-        '''Dispatch the declaration to the appropriate method, that must create
-        a suitable info object for a Exporter, create a Exporter, set its
-        declarations and append it to the list of exporters.
-        ''' 
-        dispatch_table = {
-            Class : ClassExporter,
-            Enumeration : EnumExporter,
-            Function : FunctionExporter,
-            Variable : VarExporter,
-        }
-        
-        exporter_class = dispatch_table.get(type(decl))
-        if exporter_class is not None:
-            self.HandleExporter(decl, exporter_class, codeunit, exported_names)
-
-            
-    def HandleExporter(self, decl, exporter_type, codeunit, exported_names):
-        # only export complete declarations
-        if not decl.incomplete:
-            info = self.info[decl.name]
-            info.name = decl.FullName()
-            info.include = self.info.include
-            exporter = exporter_type(info)
-            exporter.SetDeclarations(self.declarations)
-            exporter.SetParsedHeader(self.parser_header)
-            if isinstance(codeunit, MultipleCodeUnit.MultipleCodeUnit):
-                codeunit.SetCurrent(self.interface_file, exporter.Name())
-            else:
-                codeunit.SetCurrent(exporter.Name())
-            exporter.GenerateCode(codeunit, exported_names)
-
-
-    def Name(self):
-        return self.info.include
diff --git a/pyste/src/Pyste/MultipleCodeUnit.py b/pyste/src/Pyste/MultipleCodeUnit.py
deleted file mode 100644
index 347268a7..00000000
--- a/pyste/src/Pyste/MultipleCodeUnit.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-from SingleCodeUnit import SingleCodeUnit
-import os
-import utils
-from SmartFile import SmartFile
-
-
-#==============================================================================
-# MultipleCodeUnit
-#==============================================================================
-class MultipleCodeUnit(object):
-    '''
-    Represents a bunch of cpp files, where each cpp file represents a header
-    to be exported by pyste. Another cpp, named <module>.cpp is created too.
-    '''
-
-    def __init__(self, modulename, outdir):
-        self.modulename = modulename
-        self.outdir = outdir
-        self.codeunits = {}  # maps from a (filename, function) to a SingleCodeUnit
-        self.functions = []
-        self._current = None
-        self.all = SingleCodeUnit(None, None)
-
-    
-    def _FunctionName(self, interface_file):
-        name = os.path.splitext(interface_file)[0]
-        return 'Export_%s' % utils.makeid(name)
-    
-
-    def _FileName(self, interface_file):
-        filename = os.path.basename(interface_file)
-        filename = '_%s.cpp' % os.path.splitext(filename)[0] 
-        return os.path.join(self.outdir, filename)
-
-    
-    def SetCurrent(self, interface_file, export_name):
-        'Changes the current code unit'
-        if export_name is None:
-            self._current = None
-        elif export_name is '__all__':
-            self._current = self.all
-        else:
-            filename = self._FileName(interface_file)
-            function = self._FunctionName(interface_file)
-            try:
-                codeunit = self.codeunits[filename]
-            except KeyError:
-                codeunit = SingleCodeUnit(None, filename)
-                codeunit.module_definition = 'void %s()' % function
-                self.codeunits[filename] = codeunit
-                if function not in self.functions:
-                    self.functions.append(function)
-            self._current = codeunit
-
-
-    def Current(self):
-        return self._current
-
-    current = property(Current, SetCurrent)
-        
-            
-    def Write(self, section, code):
-        if self._current is not None:
-            self.current.Write(section, code)
-
-
-    def Section(self, section):
-        if self._current is not None: 
-            return self.current.Section(section)
-
-
-    def _CreateOutputDir(self):
-        try:
-            os.mkdir(self.outdir)
-        except OSError: pass # already created
-
-        
-    def Save(self):
-        # create the directory where all the files will go
-        self._CreateOutputDir();
-        # order all code units by filename, and merge them all
-        codeunits = {} # filename => list of codeunits
-
-        # While ordering all code units by file name, the first code
-        # unit in the list of code units is used as the main unit
-        # which dumps all the include, declaration and
-        # declaration-outside sections at the top of the file.
-        for filename, codeunit in self.codeunits.items(): 
-            if filename not in codeunits:
-                # this codeunit is the main codeunit.
-                codeunits[filename] = [codeunit]
-                codeunit.Merge(self.all)
-            else:
-                main_unit = codeunits[filename][0]
-                for section in ('include', 'declaration', 'declaration-outside'):
-                    main_unit.code[section] = main_unit.code[section] + codeunit.code[section]
-                    codeunit.code[section] = ''
-                codeunits[filename].append(codeunit)
-
-        # Now write all the codeunits appending them correctly.
-        for file_units in codeunits.values():
-            append = False
-            for codeunit in file_units:
-                codeunit.Save(append)
-                if not append:
-                    append = True
-                    
-
-    def GenerateMain(self, interfaces):                    
-        # generate the main cpp
-        filename = os.path.join(self.outdir, '_main.cpp')
-        fout = SmartFile(filename, 'w')
-        fout.write(utils.left_equals('Include'))
-        fout.write('#include <boost/python/module.hpp>\n\n')
-        fout.write(utils.left_equals('Exports'))
-        functions = [self._FunctionName(x) for x in interfaces]
-        for function in functions:
-            fout.write('void %s();\n' % function)
-        fout.write('\n')
-        fout.write(utils.left_equals('Module'))
-        fout.write('BOOST_PYTHON_MODULE(%s)\n' % self.modulename)
-        fout.write('{\n')
-        indent = ' ' * 4
-        for function in functions:
-            fout.write(indent)
-            fout.write('%s();\n' % function)
-        fout.write('}\n')
-        
-    
-        
diff --git a/pyste/src/Pyste/SingleCodeUnit.py b/pyste/src/Pyste/SingleCodeUnit.py
deleted file mode 100644
index 19a689be..00000000
--- a/pyste/src/Pyste/SingleCodeUnit.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-from settings import namespaces
-import settings
-from utils import remove_duplicated_lines, left_equals
-from SmartFile import SmartFile
-
-
-#==============================================================================
-# SingleCodeUnit
-#==============================================================================
-class SingleCodeUnit:
-    '''
-    Represents a cpp file, where other objects can write in one of the     
-    predefined sections.
-    The avaiable sections are:
-        pchinclude - The pre-compiled header area
-        include - The include area of the cpp file
-        declaration - The part before the module definition
-        module - Inside the BOOST_PYTHON_MODULE macro
-    '''
-    
-    def __init__(self, modulename, filename):
-        self.modulename = modulename
-        self.filename = filename
-        # define the avaiable sections
-        self.code = {}
-        # include section
-        self.code['pchinclude'] = '' 
-        # include section
-        self.code['include'] = ''
-        # declaration section (inside namespace)        
-        self.code['declaration'] = ''
-        # declaration (outside namespace)
-        self.code['declaration-outside'] = ''
-        # inside BOOST_PYTHON_MACRO
-        self.code['module'] = ''
-        # create the default module definition
-        self.module_definition = 'BOOST_PYTHON_MODULE(%s)' % modulename
-
-
-    def Write(self, section, code):
-        'write the given code in the section of the code unit'
-        if section not in self.code:
-            raise RuntimeError, 'Invalid CodeUnit section: %s' % section
-        self.code[section] += code
-        
-
-    def Merge(self, other):
-        for section in ('include', 'declaration', 'declaration-outside', 'module'):
-            self.code[section] = self.code[section] + other.code[section]    
-
-        
-    def Section(self, section):
-        return self.code[section]
-
-
-    def SetCurrent(self, *args):
-        pass
-
-
-    def Current(self):
-        pass 
-
-    
-    def Save(self, append=False):
-        'Writes this code unit to the filename'
-        space = '\n\n'
-        if not append:
-            flag = 'w'
-        else:
-            flag = 'a'
-        fout = SmartFile(self.filename, flag)
-        fout.write('\n')
-        # includes
-        # boost.python header
-        if self.code['pchinclude']:
-            fout.write(left_equals('PCH'))        
-            fout.write(self.code['pchinclude']+'\n')
-            fout.write('#ifdef _MSC_VER\n')
-            fout.write('#pragma hdrstop\n')
-            fout.write('#endif\n') 
-        else:
-            fout.write(left_equals('Boost Includes'))        
-            fout.write('#include <boost/python.hpp>\n')
-            # include numerical boost for int64 definitions
-            fout.write('#include <boost/cstdint.hpp>\n') 
-        fout.write('\n')
-        # other includes        
-        if self.code['include']:
-            fout.write(left_equals('Includes'))        
-            includes = remove_duplicated_lines(self.code['include'])
-            fout.write(includes)
-            fout.write(space)
-        # using
-        if settings.USING_BOOST_NS and not append:
-            fout.write(left_equals('Using'))
-            fout.write('using namespace boost::python;\n\n')
-        # declarations
-        declaration = self.code['declaration']
-        declaration_outside = self.code['declaration-outside']
-        if declaration_outside or declaration:
-            fout.write(left_equals('Declarations'))
-            if declaration_outside:
-                fout.write(declaration_outside + '\n\n')
-            if declaration:
-                pyste_namespace = namespaces.pyste[:-2]            
-                fout.write('namespace %s {\n\n' % pyste_namespace)
-                fout.write(declaration) 
-                fout.write('\n}// namespace %s\n' % pyste_namespace)
-                fout.write(space)
-        # module
-        fout.write(left_equals('Module'))
-        fout.write(self.module_definition + '\n')
-        fout.write('{\n')
-        fout.write(self.code['module']) 
-        fout.write('}\n\n')
-        fout.close()
diff --git a/pyste/src/Pyste/SmartFile.py b/pyste/src/Pyste/SmartFile.py
deleted file mode 100644
index 1f9388a8..00000000
--- a/pyste/src/Pyste/SmartFile.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-import os
-import md5
-
-#==============================================================================
-# SmartFile
-#==============================================================================
-class SmartFile(object):
-    '''
-    A file-like object used for writing files. The given file will only be
-    actually written to disk if there's not a file with the same name, or if
-    the existing file is *different* from the file to be written.
-    '''
-
-    def __init__(self, filename, mode='w'):
-        self.filename = filename
-        self.mode = mode
-        self._contents = []
-        self._closed = False
-
-
-    def __del__(self):
-        if not self._closed:
-            self.close()
-
-
-    def write(self, string):
-        self._contents.append(string)
-
-
-    def _dowrite(self, contents):
-        f = file(self.filename, self.mode)
-        f.write(contents)
-        f.close()
-        
-        
-    def _GetMD5(self, string):
-        return md5.new(string).digest()
-        
-    
-    def close(self):
-        # if the filename doesn't exist, write the file right away
-        this_contents = ''.join(self._contents)
-        if not os.path.isfile(self.filename):
-            self._dowrite(this_contents)
-        else:
-            # read the contents of the file already in disk
-            f = file(self.filename)
-            other_contents = f.read()
-            f.close()
-            # test the md5 for both files 
-            this_md5 = self._GetMD5(this_contents)
-            other_md5 = self._GetMD5(other_contents)
-            if this_md5 != other_md5:
-                self._dowrite(this_contents)
-        self._closed = True
diff --git a/pyste/src/Pyste/VarExporter.py b/pyste/src/Pyste/VarExporter.py
deleted file mode 100644
index 91e3dd0e..00000000
--- a/pyste/src/Pyste/VarExporter.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-from Exporter import Exporter
-from settings import *
-import utils
-
-#==============================================================================
-# VarExporter
-#==============================================================================
-class VarExporter(Exporter):
-    '''Exports a global variable.
-    '''
-
-    def __init__(self, info):
-        Exporter.__init__(self, info)
-
-
-    def Export(self, codeunit, exported_names):
-        if self.info.exclude: return
-        decl = self.GetDeclaration(self.info.name)
-        if not decl.type.const: 
-            msg = '---> Warning: The global variable "%s" is non-const:\n' \
-                  '              changes in Python will not reflect in C++.'
-            print msg % self.info.name
-            print
-        rename = self.info.rename or self.info.name
-        code = self.INDENT + namespaces.python
-        code += 'scope().attr("%s") = %s;\n' % (rename, self.info.name)
-        codeunit.Write('module', code)
-
-
-    def Order(self):
-        return 0, self.info.name
-
-
-    def Name(self):
-        return self.info.name
diff --git a/pyste/src/Pyste/__init__.py b/pyste/src/Pyste/__init__.py
deleted file mode 100644
index c4025f34..00000000
--- a/pyste/src/Pyste/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-
diff --git a/pyste/src/Pyste/declarations.py b/pyste/src/Pyste/declarations.py
deleted file mode 100644
index 2d61e015..00000000
--- a/pyste/src/Pyste/declarations.py
+++ /dev/null
@@ -1,653 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-'''
-Defines classes that represent declarations found in C++ header files.
-    
-'''
-
-# version indicates the version of the declarations. Whenever a declaration
-# changes, this variable should be updated, so that the caches can be rebuilt
-# automatically
-version = '1.0'
-
-#==============================================================================
-# Declaration
-#==============================================================================
-class Declaration(object):
-    '''Base class for all declarations.
-    @ivar name: The name of the declaration.
-    @ivar namespace: The namespace of the declaration.
-    '''
-
-    def __init__(self, name, namespace):
-        '''
-        @type name: string
-        @param name: The name of this declaration
-        @type namespace: string
-        @param namespace: the full namespace where this declaration resides.
-        '''
-        self.name = name
-        self.namespace = namespace
-        self.location = '', -1  # (filename, line)
-        self.incomplete = False
-        self.is_unique = True
-
-
-    def FullName(self):
-        '''
-        Returns the full qualified name: "boost::inner::Test"
-        @rtype: string
-        @return: The full name of the declaration.
-        '''
-        namespace = self.namespace or ''
-        if namespace and not namespace.endswith('::'):
-            namespace += '::'
-        return namespace + self.name
-    
-    
-    def __repr__(self):        
-        return '<Declaration %s at %s>' % (self.FullName(), id(self))
-
-
-    def __str__(self):
-        return 'Declaration of %s' % self.FullName()
-    
-    
-#==============================================================================
-# Class
-#==============================================================================
-class Class(Declaration):
-    '''
-    Represents a C++ class or struct. Iteration through it yields its members.
-
-    @type abstract: bool
-    @ivar abstract: if the class has any abstract methods.
-
-    @type bases: tuple
-    @ivar bases: tuple with L{Base} instances, representing the most direct
-    inheritance.
-
-    @type hierarchy: list
-    @ivar hierarchy: a list of tuples of L{Base} instances, representing
-    the entire hierarchy tree of this object. The first tuple is the parent 
-    classes, and the other ones go up in the hierarchy.
-    '''
-
-    def __init__(self, name, namespace, members, abstract):
-        Declaration.__init__(self, name, namespace)
-        self.__members = members
-        self.__member_names = {}
-        self.abstract = abstract
-        self.bases = ()
-        self.hierarchy = ()
-        self.operator = {}
-
-
-    def __iter__(self):
-        '''iterates through the class' members.
-        '''
-        return iter(self.__members)            
-
-
-    def Constructors(self, publics_only=True):
-        '''Returns a list of the constructors for this class.
-        @rtype: list
-        '''
-        constructors = []
-        for member in self:
-            if isinstance(member, Constructor):
-                if publics_only and member.visibility != Scope.public:
-                    continue
-                constructors.append(member)
-        return constructors
-
-    
-    def HasCopyConstructor(self):
-        '''Returns true if this class has a public copy constructor.
-        @rtype: bool
-        '''
-        for cons in self.Constructors():
-            if cons.IsCopy():
-                return True
-        return False
-
-
-    def HasDefaultConstructor(self):
-        '''Returns true if this class has a public default constructor.
-        @rtype: bool
-        '''
-        for cons in self.Constructors():
-            if cons.IsDefault():
-                return True
-        return False
-
-
-    def AddMember(self, member):
-        if member.name in self.__member_names:
-            member.is_unique = False
-            for m in self:
-                if m.name == member.name:
-                    m.is_unique = False
-        else:
-            member.is_unique = True
-        self.__member_names[member.name] = 1
-        self.__members.append(member)
-        if isinstance(member, ClassOperator):
-            self.operator[member.name] = member
-
-
-    def ValidMemberTypes():
-        return (NestedClass, Method, Constructor, Destructor, ClassVariable, 
-                ClassOperator, ConverterOperator, ClassEnumeration)   
-    ValidMemberTypes = staticmethod(ValidMemberTypes)
-
-                          
-#==============================================================================
-# NestedClass
-#==============================================================================
-class NestedClass(Class):
-    '''The declaration of a class/struct inside another class/struct.
-    
-    @type class: string
-    @ivar class: fullname of the class where this class is contained.
-
-    @type visibility: L{Scope} 
-    @ivar visibility: the visibility of this class.
-    '''
-
-    def __init__(self, name, class_, visib, members, abstract):
-        Class.__init__(self, name, None, members, abstract)
-        self.class_ = class_
-        self.visibility = visib
-
-
-    def FullName(self):
-        '''The full name of this class, like ns::outer::inner.
-        @rtype: string
-        '''
-        return '%s::%s' % (self.class_, self.name)
-    
-
-#==============================================================================
-# Scope    
-#==============================================================================
-class Scope:    
-    '''Used to represent the visibility of various members inside a class.
-    @cvar public: public visibility
-    @cvar private: private visibility
-    @cvar protected: protected visibility
-    '''
-    public = 'public'
-    private = 'private'
-    protected = 'protected'
-    
- 
-#==============================================================================
-# Base    
-#==============================================================================
-class Base:
-    '''Represents a base class of another class.
-    @ivar _name: the full name of the base class.
-    @ivar _visibility: the visibility of the derivation.
-    '''
-
-    def __init__(self, name, visibility=Scope.public):
-        self.name = name
-        self.visibility = visibility
-
-    
-#==============================================================================
-# Function    
-#==============================================================================
-class Function(Declaration):
-    '''The declaration of a function.
-    @ivar _result: instance of L{Type} or None.
-    @ivar _parameters: list of L{Type} instances.
-    @ivar _throws: exception specifiers or None 
-    '''
-
-    def __init__(self, name, namespace, result, params, throws=None): 
-        Declaration.__init__(self, name, namespace)
-        # the result type: instance of Type, or None (constructors)            
-        self.result = result
-        # the parameters: instances of Type
-        self.parameters = params
-        # the exception specification
-        self.throws     = throws 
-
-
-    def Exceptions(self):
-        if self.throws is None:
-            return ""
-        else:
-            return " throw(%s)" % ', '.join (self.throws) 
-
-
-    def PointerDeclaration(self, force=False):
-        '''Returns a declaration of a pointer to this function.
-        @param force: If True, returns a complete pointer declaration regardless
-        if this function is unique or not.
-        '''
-        if self.is_unique and not force:
-            return '&%s' % self.FullName()
-        else:
-            result = self.result.FullName()
-            params = ', '.join([x.FullName() for x in self.parameters]) 
-            return '(%s (*)(%s))&%s' % (result, params, self.FullName())
-
-    
-    def MinArgs(self):
-        min = 0
-        for arg in self.parameters:
-            if arg.default is None:
-                min += 1
-        return min
-
-    minArgs = property(MinArgs)
-    
-
-    def MaxArgs(self):
-        return len(self.parameters)
-
-    maxArgs = property(MaxArgs)
-
-    
-    
-#==============================================================================
-# Operator
-#==============================================================================
-class Operator(Function):
-    '''The declaration of a custom operator. Its name is the same as the 
-    operator name in C++, ie, the name of the declaration "operator+(..)" is
-    "+".
-    '''
-    
-    def FullName(self):
-        namespace = self.namespace or ''
-        if not namespace.endswith('::'):
-            namespace += '::'
-        return namespace + 'operator' + self.name 
-
-
-#==============================================================================
-# Method
-#==============================================================================
-class Method(Function):
-    '''The declaration of a method.
-    
-    @ivar _visibility: the visibility of this method.
-    @ivar _virtual: if this method is declared as virtual.
-    @ivar _abstract: if this method is virtual but has no default implementation.
-    @ivar _static: if this method is static.
-    @ivar _class: the full name of the class where this method was declared.
-    @ivar _const: if this method is declared as const.
-    @ivar _throws: list of exception specificiers or None
-    '''
-
-    def __init__(self, name, class_, result, params, visib, virtual, abstract, static, const, throws=None): 
-        Function.__init__(self, name, None, result, params, throws)
-        self.visibility = visib
-        self.virtual = virtual
-        self.abstract = abstract
-        self.static = static
-        self.class_ = class_
-        self.const = const
-
-    
-    def FullName(self):
-        return self.class_ + '::' + self.name
-
-
-    def PointerDeclaration(self, force=False):
-        '''Returns a declaration of a pointer to this member function.
-        @param force: If True, returns a complete pointer declaration regardless
-        if this function is unique or not. 
-        '''
-        if self.static:
-            # static methods are like normal functions
-            return Function.PointerDeclaration(self, force)
-        if self.is_unique and not force:
-            return '&%s' % self.FullName()
-        else:
-            result = self.result.FullName()
-            params = ', '.join([x.FullName() for x in self.parameters]) 
-            const = ''
-            if self.const:
-                const = 'const'            
-            return '(%s (%s::*)(%s) %s%s)&%s' %\
-                (result, self.class_, params, const, self.Exceptions(), self.FullName())  
-
-
-#==============================================================================
-# Constructor
-#==============================================================================
-class Constructor(Method):
-    '''A class' constructor.
-    '''
-
-    def __init__(self, name, class_, params, visib):
-        Method.__init__(self, name, class_, None, params, visib, False, False, False, False)
-
-
-    def IsDefault(self):
-        '''Returns True if this constructor is a default constructor.
-        '''
-        return len(self.parameters) == 0 and self.visibility == Scope.public
-
-
-    def IsCopy(self):
-        '''Returns True if this constructor is a copy constructor.
-        '''
-        if len(self.parameters) != 1:
-            return False
-        param = self.parameters[0]
-        class_as_param = self.parameters[0].name == self.class_
-        param_reference = isinstance(param, ReferenceType) 
-        is_public = self.visibility = Scope.public
-        return param_reference and class_as_param and param.const and is_public
-        
-
-    def PointerDeclaration(self, force=False):
-        return ''
-
-
-#==============================================================================
-# Destructor
-#==============================================================================
-class Destructor(Method):
-    'The destructor of a class.'
-
-    def __init__(self, name, class_, visib, virtual):
-        Method.__init__(self, name, class_, None, [], visib, virtual, False, False, False)
-
-    def FullName(self):
-        return self.class_ + '::~' + self.name
-
-
-    def PointerDeclaration(self, force=False):
-        return ''
-
-
-
-#==============================================================================
-# ClassOperator
-#==============================================================================
-class ClassOperator(Method):
-    'A custom operator in a class.'
-    
-    def FullName(self):
-        return self.class_ + '::operator ' + self.name
-
-
-
-#==============================================================================
-# ConverterOperator
-#==============================================================================
-class ConverterOperator(ClassOperator):
-    'An operator in the form "operator OtherClass()".'
-    
-    def FullName(self):
-        return self.class_ + '::operator ' + self.result.FullName()
-
-    
-
-#==============================================================================
-# Type
-#==============================================================================
-class Type(Declaration):
-    '''Represents the type of a variable or parameter.
-    @ivar _const: if the type is constant.
-    @ivar _default: if this type has a default value associated with it.
-    @ivar _volatile: if this type was declared with the keyword volatile.
-    @ivar _restricted: if this type was declared with the keyword restricted.
-    @ivar _suffix: Suffix to get the full type name. '*' for pointers, for
-    example.
-    '''
-
-    def __init__(self, name, const=False, default=None, suffix=''):
-        Declaration.__init__(self, name, None)
-        # whatever the type is constant or not
-        self.const = const
-        # used when the Type is a function argument
-        self.default = default
-        self.volatile = False
-        self.restricted = False
-        self.suffix = suffix
-
-    def __repr__(self):
-        if self.const:
-            const = 'const '
-        else:
-            const = ''
-        return '<Type ' + const + self.name + '>'
-
-
-    def FullName(self):
-        if self.const:
-            const = 'const '
-        else:
-            const = ''
-        return const + self.name + self.suffix
-
-
-#==============================================================================
-# ArrayType
-#==============================================================================
-class ArrayType(Type):
-    '''Represents an array.
-    @ivar min: the lower bound of the array, usually 0. Can be None.
-    @ivar max: the upper bound of the array. Can be None.
-    '''
-
-    def __init__(self, name, const, min, max): 
-        'min and max can be None.'
-        Type.__init__(self, name, const)
-        self.min = min
-        self.max = max        
-
-
-
-#==============================================================================
-# ReferenceType    
-#==============================================================================
-class ReferenceType(Type): 
-    '''A reference type.'''
-
-    def __init__(self, name, const=False, default=None, expandRef=True, suffix=''):
-        Type.__init__(self, name, const, default)
-        if expandRef:
-            self.suffix = suffix + '&'
-        
-        
-#==============================================================================
-# PointerType
-#==============================================================================
-class PointerType(Type):
-    'A pointer type.'
-    
-    def __init__(self, name, const=False, default=None, expandPointer=False, suffix=''):
-        Type.__init__(self, name, const, default)
-        if expandPointer:
-            self.suffix = suffix + '*'
-   
-
-#==============================================================================
-# FundamentalType
-#==============================================================================
-class FundamentalType(Type): 
-    'One of the fundamental types, like int, void, etc.'
-
-    def __init__(self, name, const=False, default=None): 
-        Type.__init__(self, name, const, default)
-
-
-
-#==============================================================================
-# FunctionType
-#==============================================================================
-class FunctionType(Type):
-    '''A pointer to a function.
-    @ivar _result: the return value
-    @ivar _parameters: a list of Types, indicating the parameters of the function.
-    @ivar _name: the name of the function.
-    '''
-
-    def __init__(self, result, parameters):  
-        Type.__init__(self, '', False)
-        self.result = result
-        self.parameters = parameters
-        self.name = self.FullName()
-
-
-    def FullName(self):
-        full = '%s (*)' % self.result.FullName()
-        params = [x.FullName() for x in self.parameters]
-        full += '(%s)' % ', '.join(params)        
-        return full
-    
-    
-#==============================================================================
-# MethodType
-#==============================================================================
-class MethodType(FunctionType):
-    '''A pointer to a member function of a class.
-    @ivar _class: The fullname of the class that the method belongs to.
-    '''
-
-    def __init__(self, result, parameters, class_):  
-        self.class_ = class_
-        FunctionType.__init__(self, result, parameters)
-
-
-    def FullName(self):
-        full = '%s (%s::*)' % (self.result.FullName(), self.class_)
-        params = [x.FullName() for x in self.parameters]
-        full += '(%s)' % ', '.join(params)
-        return full
-    
-     
-#==============================================================================
-# Variable
-#==============================================================================
-class Variable(Declaration):
-    '''Represents a global variable.
-
-    @type _type: L{Type}
-    @ivar _type: The type of the variable.
-    '''
-    
-    def __init__(self, type, name, namespace):
-        Declaration.__init__(self, name, namespace)
-        self.type = type
-
-
-#==============================================================================
-# ClassVariable
-#==============================================================================
-class ClassVariable(Variable):
-    '''Represents a class variable.
-
-    @type _visibility: L{Scope}
-    @ivar _visibility: The visibility of this variable within the class.
-
-    @type _static: bool
-    @ivar _static: Indicates if the variable is static.
-
-    @ivar _class: Full name of the class that this variable belongs to.
-    '''
-
-    def __init__(self, type, name, class_, visib, static):
-        Variable.__init__(self, type, name, None)
-        self.visibility = visib
-        self.static = static
-        self.class_ = class_
-    
-
-    def FullName(self):
-        return self.class_ + '::' + self.name
-
-        
-#==============================================================================
-# Enumeration    
-#==============================================================================
-class Enumeration(Declaration):
-    '''Represents an enum.
-
-    @type _values: dict of str => int
-    @ivar _values: holds the values for this enum.
-    '''
-    
-    def __init__(self, name, namespace):
-        Declaration.__init__(self, name, namespace)
-        self.values = {} # dict of str => int
-
-
-    def ValueFullName(self, name):
-        '''Returns the full name for a value in the enum.
-        '''
-        assert name in self.values
-        namespace = self.namespace
-        if namespace:
-            namespace += '::'
-        return namespace + name
-
-
-#==============================================================================
-# ClassEnumeration
-#==============================================================================
-class ClassEnumeration(Enumeration):
-    '''Represents an enum inside a class.
-
-    @ivar _class: The full name of the class where this enum belongs.
-    @ivar _visibility: The visibility of this enum inside his class.
-    '''
-
-    def __init__(self, name, class_, visib):
-        Enumeration.__init__(self, name, None)
-        self.class_ = class_
-        self.visibility = visib
-
-
-    def FullName(self):
-        return '%s::%s' % (self.class_, self.name)
-
-
-    def ValueFullName(self, name):
-        assert name in self.values
-        return '%s::%s' % (self.class_, name)
-
-    
-#==============================================================================
-# Typedef
-#==============================================================================
-class Typedef(Declaration):
-    '''A Typedef declaration.
-
-    @type _type: L{Type}
-    @ivar _type: The type of the typedef.
-
-    @type _visibility: L{Scope}
-    @ivar _visibility: The visibility of this typedef.
-    '''
-
-    def __init__(self, type, name, namespace):
-        Declaration.__init__(self, name, namespace)
-        self.type = type
-        self.visibility = Scope.public
-
-
-
-
-                          
-#==============================================================================
-# Unknown        
-#==============================================================================
-class Unknown(Declaration):
-    '''A declaration that Pyste does not know how to handle.
-    '''
-
-    def __init__(self, name):
-        Declaration.__init__(self, name, None)
diff --git a/pyste/src/Pyste/exporters.py b/pyste/src/Pyste/exporters.py
deleted file mode 100644
index 0d2d147f..00000000
--- a/pyste/src/Pyste/exporters.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-
-# a list of Exporter instances
-exporters = []
-
-current_interface = None # the current interface file being processed
-importing = False    # whetever we are now importing a pyste file.
-                     # exporters created here shouldn't export themselves
diff --git a/pyste/src/Pyste/exporterutils.py b/pyste/src/Pyste/exporterutils.py
deleted file mode 100644
index ce862383..00000000
--- a/pyste/src/Pyste/exporterutils.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-'''
-Various helpers for interface files.
-'''
-
-from settings import *
-from policies import *
-from declarations import *
-
-#==============================================================================
-# FunctionWrapper
-#==============================================================================
-class FunctionWrapper(object): 
-    '''Holds information about a wrapper for a function or a method. It is
-    divided in 2 parts: the name of the Wrapper, and its code.  The code is
-    placed in the declaration section of the module, while the name is used to
-    def' the function or method (with the pyste namespace prepend to it). If
-    code is None, the name is left unchanged.
-    '''
-
-    def __init__(self, name, code=None):
-        self.name = name
-        self.code = code
-
-    def FullName(self):
-        if self.code:
-            return namespaces.pyste + self.name
-        else:
-            return self.name
-
-
-_printed_warnings = {} # used to avoid double-prints of warnings
-
-#==============================================================================
-# HandlePolicy
-#==============================================================================
-def HandlePolicy(function, policy):
-    '''Show a warning to the user if the function needs a policy and doesn't
-    have one. Return a policy to the function, which is the given policy itself
-    if it is not None, or a default policy for this method.
-    '''
-    
-    def IsString(type):
-        'Return True if the Type instance can be considered a string'
-        return type.FullName() == 'const char*'
-
-    def IsPyObject(type):
-        return type.FullName() == '_object *' # internal name of PyObject
-    
-    result = function.result
-    # if the function returns const char*, a policy is not needed
-    if IsString(result) or IsPyObject(result):
-        return policy
-    # if returns a const T&, set the default policy
-    if policy is None and result.const and isinstance(result, ReferenceType):
-        policy = return_value_policy(copy_const_reference)
-    # basic test if the result type demands a policy
-    needs_policy = isinstance(result, (ReferenceType, PointerType)) 
-    # show a warning to the user, if needed
-    if needs_policy and policy is None:
-        global _printed_warnings
-        warning = '---> Error: %s returns a pointer or a reference, ' \
-                  'but no policy was specified.' % function.FullName()
-        if warning not in _printed_warnings:
-            print warning
-            print 
-            # avoid double prints of the same warning
-            _printed_warnings[warning] = 1
-    return policy
-            
-
-#==============================================================================
-# EspecializeTypeID
-#==============================================================================
-_exported_type_ids = {}
-def EspecializeTypeID(typename):
-    global _exported_type_ids
-    macro = 'BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(%s)\n' % typename
-    if macro not in _exported_type_ids:
-        _exported_type_ids[macro] = 1
-        return macro
-    else:
-        return None
diff --git a/pyste/src/Pyste/infos.py b/pyste/src/Pyste/infos.py
deleted file mode 100644
index 9ae76e38..00000000
--- a/pyste/src/Pyste/infos.py
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-import os.path
-import copy
-import exporters 
-from ClassExporter import ClassExporter
-from FunctionExporter import FunctionExporter
-from EnumExporter import EnumExporter
-from HeaderExporter import HeaderExporter
-from VarExporter import VarExporter
-from CodeExporter import CodeExporter
-from exporterutils import FunctionWrapper
-from utils import makeid
-
-
-#==============================================================================
-# DeclarationInfo
-#==============================================================================
-class DeclarationInfo:
-    
-    def __init__(self, otherInfo=None):
-        self.__infos = {}
-        self.__attributes = {}
-        if otherInfo is not None:
-            self.__infos = copy.deepcopy(otherInfo.__infos)
-            self.__attributes = copy.deepcopy(otherInfo.__attributes)
-
-
-    def __getitem__(self, name):
-        'Used to access sub-infos'        
-        if name.startswith('__'):
-            raise AttributeError
-        default = DeclarationInfo()
-        default._Attribute('name', name)
-        return self.__infos.setdefault(name, default)
-
-
-    def __getattr__(self, name):
-        return self[name]
-
-
-    def _Attribute(self, name, value=None):
-        if value is None:
-            # get value
-            return self.__attributes.get(name)
-        else:
-            # set value
-            self.__attributes[name] = value
-
-
-    def AddExporter(self, exporter):
-        if not exporters.importing:
-            if exporter not in exporters.exporters:
-                exporters.exporters.append(exporter)
-            exporter.interface_file = exporters.current_interface 
-
-
-#==============================================================================
-# FunctionInfo
-#==============================================================================
-class FunctionInfo(DeclarationInfo):
-
-    def __init__(self, name, include, tail=None, otherOption=None,
-                 exporter_class = FunctionExporter):        
-        DeclarationInfo.__init__(self, otherOption)
-        self._Attribute('name', name)
-        self._Attribute('include', include)
-        self._Attribute('exclude', False)
-        # create a FunctionExporter
-        exporter = exporter_class(InfoWrapper(self), tail)
-        self.AddExporter(exporter)
-
-
-#==============================================================================
-# ClassInfo
-#==============================================================================
-class ClassInfo(DeclarationInfo):
-
-    def __init__(self, name, include, tail=None, otherInfo=None,
-                 exporter_class = ClassExporter):
-        DeclarationInfo.__init__(self, otherInfo)
-        self._Attribute('name', name)
-        self._Attribute('include', include)
-        self._Attribute('exclude', False)
-        # create a ClassExporter
-        exporter = exporter_class(InfoWrapper(self), tail)
-        self.AddExporter(exporter)  
-        
-
-#==============================================================================
-# templates
-#==============================================================================
-def GenerateName(name, type_list):
-    name = name.replace('::', '_')
-    names = [name] + type_list
-    return makeid('_'.join(names))
-
-    
-class ClassTemplateInfo(DeclarationInfo):
-
-    def __init__(self, name, include,
-                 exporter_class = ClassExporter):
-        DeclarationInfo.__init__(self)
-        self._Attribute('name', name)
-        self._Attribute('include', include)
-        self._exporter_class = exporter_class
-
-
-    def Instantiate(self, type_list, rename=None):
-        if not rename:
-            rename = GenerateName(self._Attribute('name'), type_list)
-        # generate code to instantiate the template
-        types = ', '.join(type_list)
-        tail = 'typedef %s< %s > %s;\n' % (self._Attribute('name'), types, rename)
-        tail += 'void __instantiate_%s()\n' % rename
-        tail += '{ sizeof(%s); }\n\n' % rename
-        # create a ClassInfo
-        class_ = ClassInfo(rename, self._Attribute('include'), tail, self,
-                           exporter_class = self._exporter_class)
-        return class_
-
-
-    def __call__(self, types, rename=None):
-        if isinstance(types, str):
-            types = types.split() 
-        return self.Instantiate(types, rename)
-        
-#==============================================================================
-# EnumInfo
-#==============================================================================
-class EnumInfo(DeclarationInfo):
-    
-    def __init__(self, name, include, exporter_class = EnumExporter):
-        DeclarationInfo.__init__(self)
-        self._Attribute('name', name)
-        self._Attribute('include', include)
-        self._Attribute('exclude', False)
-        self._Attribute('export_values', False)
-        exporter = exporter_class(InfoWrapper(self))
-        self.AddExporter(exporter) 
-
-
-#==============================================================================
-# HeaderInfo
-#==============================================================================
-class HeaderInfo(DeclarationInfo):
-
-    def __init__(self, include, exporter_class = HeaderExporter):
-        DeclarationInfo.__init__(self)
-        self._Attribute('include', include)
-        exporter = exporter_class(InfoWrapper(self))
-        self.AddExporter(exporter) 
-
-
-#==============================================================================
-# VarInfo
-#==============================================================================
-class VarInfo(DeclarationInfo):
-    
-    def __init__(self, name, include, exporter_class = VarExporter):
-        DeclarationInfo.__init__(self)
-        self._Attribute('name', name)
-        self._Attribute('include', include)
-        exporter = exporter_class(InfoWrapper(self))
-        self.AddExporter(exporter) 
-        
-                                 
-#==============================================================================
-# CodeInfo                                 
-#==============================================================================
-class CodeInfo(DeclarationInfo):
-
-    def __init__(self, code, section, exporter_class = CodeExporter):
-        DeclarationInfo.__init__(self)
-        self._Attribute('code', code)
-        self._Attribute('section', section)
-        exporter = exporter_class(InfoWrapper(self))
-        self.AddExporter(exporter) 
-        
-
-#==============================================================================
-# InfoWrapper
-#==============================================================================
-class InfoWrapper:
-    'Provides a nicer interface for a info'
-
-    def __init__(self, info):
-        self.__dict__['_info'] = info # so __setattr__ is not called
-
-    def __getitem__(self, name):
-        return InfoWrapper(self._info[name])
-
-    def __getattr__(self, name):
-        return self._info._Attribute(name)
-
-    def __setattr__(self, name, value):
-        self._info._Attribute(name, value)
-
-
-#==============================================================================
-# Functions
-#==============================================================================
-def exclude(info):
-    info._Attribute('exclude', True)
-
-def set_policy(info, policy):
-    info._Attribute('policy', policy)
-
-def rename(info, name):
-    info._Attribute('rename', name)
-
-def set_wrapper(info, wrapper):
-    if isinstance(wrapper, str):
-        wrapper = FunctionWrapper(wrapper)
-    info._Attribute('wrapper', wrapper)
-
-def instantiate(template, types, rename=None):
-    if isinstance(types, str):
-        types = types.split()
-    return template.Instantiate(types, rename)
-
-def use_shared_ptr(info):
-    info._Attribute('smart_ptr', 'boost::shared_ptr< %s >')
-
-def use_auto_ptr(info):
-    info._Attribute('smart_ptr', 'std::auto_ptr< %s >')
-        
-def holder(info, function):
-    msg = "Expected a callable that accepts one string argument."
-    assert callable(function), msg
-    info._Attribute('holder', function)
-
-def add_method(info, name, rename=None):
-    added = info._Attribute('__added__')
-    if added is None:
-        info._Attribute('__added__', [(name, rename)])
-    else:
-        added.append((name, rename))
-
-def final(info):
-    info._Attribute('no_override', True)
-
-
-def export_values(info):
-    info._Attribute('export_values', True)
diff --git a/pyste/src/Pyste/policies.py b/pyste/src/Pyste/policies.py
deleted file mode 100644
index ff635072..00000000
--- a/pyste/src/Pyste/policies.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-
-
-class Policy(object):
-    'Represents one of the call policies of boost.python.'
-
-    def __init__(self):
-        if type(self) is Policy:
-            raise RuntimeError, "Can't create an instance of the class Policy"
-
-
-    def Code(self):
-        'Returns the string corresponding to a instancialization of the policy.'
-        pass
-        
-
-    def _next(self):
-        if self.next is not None:
-            return ', %s >' % self.next.Code()
-        else:
-            return ' >'
-
-
-    def __eq__(self, other):
-        try:
-            return self.Code() == other.Code()
-        except AttributeError:
-            return False
-
-
-
-class return_internal_reference(Policy):
-    'Ties the return value to one of the parameters.'
-
-    def __init__(self, param=1, next=None):
-        '''
-        param is the position of the parameter, or None for "self".
-        next indicates the next policy, or None.
-        '''
-        self.param = param
-        self.next=next
-
-
-    def Code(self):
-        c = 'return_internal_reference< %i' % self.param
-        c += self._next()
-        return c
-
-
-
-class with_custodian_and_ward(Policy):
-    'Ties lifetime of two arguments of a function.'
-
-    def __init__(self, custodian, ward, next=None):
-        self.custodian = custodian
-        self.ward = ward
-        self.next = next
-
-    def Code(self):
-        c = 'with_custodian_and_ward< %i, %i' % (self.custodian, self.ward)
-        c += self._next()
-        return c
-
-
-
-class return_value_policy(Policy):
-    'Policy to convert return values.'
-    
-    def __init__(self, which, next=None):            
-        self.which = which
-        self.next = next
-
-
-    def Code(self):
-        c = 'return_value_policy< %s' % self.which
-        c += self._next()
-        return c
-
-class return_self(Policy):
-
-    def Code(self):
-        return 'return_self<>'
-
-
-#  values for return_value_policy
-reference_existing_object = 'reference_existing_object'
-copy_const_reference = 'copy_const_reference'
-copy_non_const_reference = 'copy_non_const_reference'
-manage_new_object = 'manage_new_object'        
-return_opaque_pointer = 'return_opaque_pointer'
-return_by_value = 'return_by_value'
diff --git a/pyste/src/Pyste/pyste.py b/pyste/src/Pyste/pyste.py
deleted file mode 100644
index 91ed4e50..00000000
--- a/pyste/src/Pyste/pyste.py
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-"""
-Pyste version %s
-
-Usage:
-    pyste [options] interface-files
-
-where options are:
-    --module=<name>         The name of the module that will be generated;
-                            defaults to the first interface filename, without
-                            the extension.
-    -I <path>               Add an include path    
-    -D <symbol>             Define symbol    
-    --multiple              Create various cpps, instead of only one 
-                            (useful during development)                        
-    --out=<name>            Specify output filename (default: <module>.cpp)
-                            in --multiple mode, this will be a directory
-    --no-using              Do not declare "using namespace boost";
-                            use explicit declarations instead
-    --pyste-ns=<name>       Set the namespace where new types will be declared;
-                            default is the empty namespace
-    --debug                 Writes the xml for each file parsed in the current
-                            directory
-    --cache-dir=<dir>       Directory for cache files (speeds up future runs)
-    --only-create-cache     Recreates all caches (doesn't generate code).
-    --generate-main         Generates the _main.cpp file (in multiple mode)
-    --file-list             A file with one pyste file per line. Use as a 
-                            substitute for passing the files in the command
-                            line.
-    -h, --help              Print this help and exit
-    -v, --version           Print version information                         
-"""
-
-import sys
-import os
-import getopt
-import exporters
-import SingleCodeUnit
-import MultipleCodeUnit
-import infos
-import exporterutils
-import settings
-import gc
-import sys
-from policies import *
-from CppParser import CppParser, CppParserError
-import time
-import declarations
-
-__version__ = '0.9.28'
-
-def RecursiveIncludes(include):
-    'Return a list containg the include dir and all its subdirectories'
-    dirs = [include]
-    def visit(arg, dir, names):
-        # ignore CVS dirs
-        if os.path.split(dir)[1] != 'CVS':
-            dirs.append(dir)
-    os.path.walk(include, visit, None)
-    return dirs
-
-    
-def GetDefaultIncludes():
-    if 'INCLUDE' in os.environ:
-        include = os.environ['INCLUDE']
-        return include.split(os.pathsep)
-    else:
-        return []
-
-
-def ProcessIncludes(includes):
-    if sys.platform == 'win32':
-        index = 0
-        for include in includes:
-            includes[index] = include.replace('\\', '/')
-            index += 1
-
-
-def ReadFileList(filename):
-    f = file(filename)
-    files = []
-    try:
-        for line in f:
-            line = line.strip()
-            if line:
-                files.append(line)
-    finally:
-        f.close()
-    return files
-
-        
-def ParseArguments():
-
-    def Usage():
-        print __doc__ % __version__
-        sys.exit(1)
-        
-    try:
-        options, files = getopt.getopt(
-            sys.argv[1:], 
-            'R:I:D:vh', 
-            ['module=', 'multiple', 'out=', 'no-using', 'pyste-ns=', 'debug', 'cache-dir=', 
-             'only-create-cache', 'version', 'generate-main', 'file-list=',  'help'])
-    except getopt.GetoptError, e:
-        print
-        print 'ERROR:', e
-        Usage()
-    
-    includes = GetDefaultIncludes()
-    defines = []
-    module = None
-    out = None
-    multiple = False
-    cache_dir = None
-    create_cache = False
-    generate_main = False
-    
-    for opt, value in options:
-        if opt == '-I':
-            includes.append(value)
-        elif opt == '-D':
-            defines.append(value)
-        elif opt == '-R':
-            includes.extend(RecursiveIncludes(value))
-        elif opt == '--module':
-            module = value
-        elif opt == '--out':
-            out = value 
-        elif opt == '--no-using':
-            settings.namespaces.python = 'boost::python::'
-            settings.USING_BOOST_NS = False
-        elif opt == '--pyste-ns':
-            settings.namespaces.pyste = value + '::'
-        elif opt == '--debug':
-            settings.DEBUG = True
-        elif opt == '--multiple':
-            multiple = True
-        elif opt == '--cache-dir':
-            cache_dir = value
-        elif opt == '--only-create-cache':
-            create_cache = True
-        elif opt == '--file-list':
-            files += ReadFileList(value)
-        elif opt in ['-h', '--help']:
-            Usage()
-        elif opt in ['-v', '--version']:
-            print 'Pyste version %s' % __version__
-            sys.exit(2)
-        elif opt == '--generate-main':
-            generate_main = True
-        else:
-            print 'Unknown option:', opt
-            Usage()
-
-    if not files:
-        Usage() 
-    if not module:
-        module = os.path.splitext(files[0])[0]
-    if not out:
-        out = module
-        if not multiple:
-            out += '.cpp'
-    for file in files:
-        d = os.path.dirname(os.path.abspath(file))
-        if d not in sys.path:
-            sys.path.append(d) 
-
-    if create_cache and not cache_dir:
-        print 'Error: Use --cache-dir to indicate where to create the cache files!'
-        Usage()
-        sys.exit(3)
-
-    if generate_main and not multiple:
-        print 'Error: --generate-main only valid in multiple mode.'
-        Usage()
-        sys.exit(3)
-
-    ProcessIncludes(includes)
-    return includes, defines, module, out, files, multiple, cache_dir, create_cache, generate_main
-
-
-def PCHInclude(*headers):
-    code = '\n'.join(['#include <%s>' % x for x in headers])
-    infos.CodeInfo(code, 'pchinclude')
-
-    
-def CreateContext():
-    'create the context where a interface file will be executed'
-    context = {}
-    context['Import'] = Import
-    # infos
-    context['Function'] = infos.FunctionInfo
-    context['Class'] = infos.ClassInfo
-    context['Include'] = lambda header: infos.CodeInfo('#include <%s>\n' % header, 'include')
-    context['PCHInclude'] = PCHInclude
-    context['Template'] = infos.ClassTemplateInfo
-    context['Enum'] = infos.EnumInfo
-    context['AllFromHeader'] = infos.HeaderInfo
-    context['Var'] = infos.VarInfo
-    # functions
-    context['rename'] = infos.rename
-    context['set_policy'] = infos.set_policy
-    context['exclude'] = infos.exclude
-    context['set_wrapper'] = infos.set_wrapper
-    context['use_shared_ptr'] = infos.use_shared_ptr
-    context['use_auto_ptr'] = infos.use_auto_ptr
-    context['holder'] = infos.holder
-    context['add_method'] = infos.add_method
-    context['final'] = infos.final
-    context['export_values'] = infos.export_values
-    # policies
-    context['return_internal_reference'] = return_internal_reference
-    context['with_custodian_and_ward'] = with_custodian_and_ward
-    context['return_value_policy'] = return_value_policy
-    context['reference_existing_object'] = reference_existing_object
-    context['copy_const_reference'] = copy_const_reference
-    context['copy_non_const_reference'] = copy_non_const_reference
-    context['return_opaque_pointer'] = return_opaque_pointer
-    context['manage_new_object'] = manage_new_object
-    context['return_by_value'] = return_by_value
-    context['return_self'] = return_self
-    # utils
-    context['Wrapper'] = exporterutils.FunctionWrapper
-    context['declaration_code'] = lambda code: infos.CodeInfo(code, 'declaration-outside')
-    context['module_code'] = lambda code: infos.CodeInfo(code, 'module')
-    return context                                        
-
-    
-def Begin():
-    # parse arguments
-    includes, defines, module, out, interfaces, multiple, cache_dir, create_cache, generate_main = ParseArguments()
-    # run pyste scripts
-    for interface in interfaces:
-        ExecuteInterface(interface)
-    # create the parser
-    parser = CppParser(includes, defines, cache_dir, declarations.version)
-    try:
-        if not create_cache:
-            if not generate_main:
-                return GenerateCode(parser, module, out, interfaces, multiple)
-            else:
-                return GenerateMain(module, out, OrderInterfaces(interfaces))
-        else:
-            return CreateCaches(parser)
-    finally:
-        parser.Close()
-
-
-def CreateCaches(parser):
-    # There is one cache file per interface so we organize the headers
-    # by interfaces.  For each interface collect the tails from the
-    # exporters sharing the same header.
-    tails = JoinTails(exporters.exporters)
-
-    # now for each interface file take each header, and using the tail
-    # get the declarations and cache them.
-    for interface, header in tails:        
-        tail = tails[(interface, header)]
-        declarations = parser.ParseWithGCCXML(header, tail)
-        cachefile = parser.CreateCache(header, interface, tail, declarations)
-        print 'Cached', cachefile
-    
-    return 0
-        
-
-_imported_count = {}  # interface => count
-
-def ExecuteInterface(interface):
-    old_interface = exporters.current_interface
-    if not os.path.exists(interface):
-        if old_interface and os.path.exists(old_interface):
-            d = os.path.dirname(old_interface)
-            interface = os.path.join(d, interface)
-    if not os.path.exists(interface):
-        raise IOError, "Cannot find interface file %s."%interface
-    
-    _imported_count[interface] = _imported_count.get(interface, 0) + 1
-    exporters.current_interface = interface
-    context = CreateContext()
-    context['INTERFACE_FILE'] = os.path.abspath(interface)
-    execfile(interface, context)
-    exporters.current_interface = old_interface
-
-
-def Import(interface):
-    exporters.importing = True
-    ExecuteInterface(interface)
-    exporters.importing = False
-
-    
-def JoinTails(exports):
-    '''Returns a dict of {(interface, header): tail}, where tail is the
-    joining of all tails of all exports for the header.  
-    '''
-    tails = {}
-    for export in exports:
-        interface = export.interface_file
-        header = export.Header()
-        tail = export.Tail() or ''
-        if (interface, header) in tails:
-            all_tails = tails[(interface,header)]
-            all_tails += '\n' + tail
-            tails[(interface, header)] = all_tails
-        else:
-            tails[(interface, header)] = tail         
-
-    return tails
-
-
-
-def OrderInterfaces(interfaces):
-    interfaces_order = [(_imported_count[x], x) for x in interfaces]
-    interfaces_order.sort()
-    interfaces_order.reverse()
-    return [x for _, x in interfaces_order]
-
-
-
-def GenerateMain(module, out, interfaces):
-    codeunit = MultipleCodeUnit.MultipleCodeUnit(module, out)
-    codeunit.GenerateMain(interfaces)
-    return 0
-    
-
-def GenerateCode(parser, module, out, interfaces, multiple):    
-    # prepare to generate the wrapper code
-    if multiple:
-        codeunit = MultipleCodeUnit.MultipleCodeUnit(module, out)
-    else:
-        codeunit = SingleCodeUnit.SingleCodeUnit(module, out) 
-    # stop referencing the exporters here
-    exports = exporters.exporters
-    exporters.exporters = None 
-    exported_names = dict([(x.Name(), None) for x in exports])
-
-    # order the exports
-    order = {}
-    for export in exports:
-        if export.interface_file in order:
-            order[export.interface_file].append(export)
-        else:
-            order[export.interface_file] = [export]
-    exports = []
-    interfaces_order = OrderInterfaces(interfaces)
-    for interface in interfaces_order:
-        exports.extend(order[interface])
-    del order
-    del interfaces_order
-
-    # now generate the code in the correct order 
-    #print exported_names
-    tails = JoinTails(exports)
-    for i in xrange(len(exports)):
-        export = exports[i]
-        interface = export.interface_file
-        header = export.Header()
-        if header:
-            tail = tails[(interface, header)]
-            declarations, parsed_header = parser.Parse(header, interface, tail)
-        else:
-            declarations = []
-            parsed_header = None
-        ExpandTypedefs(declarations, exported_names)
-        export.SetDeclarations(declarations)
-        export.SetParsedHeader(parsed_header)
-        if multiple:
-            codeunit.SetCurrent(export.interface_file, export.Name())
-        export.GenerateCode(codeunit, exported_names)
-        # force collect of cyclic references
-        exports[i] = None
-        del declarations
-        del export
-        gc.collect()
-    # finally save the code unit
-    codeunit.Save()
-    if not multiple:
-        print 'Module %s generated' % module
-    return 0
-
-
-def ExpandTypedefs(decls, exported_names):
-    '''Check if the names in exported_names are a typedef, and add the real class 
-    name in the dict.
-    '''
-    for name in exported_names.keys():
-        for decl in decls:
-            if isinstance(decl, declarations.Typedef):
-                exported_names[decl.type.FullName()] = None
-
-def UsePsyco():
-    'Tries to use psyco if possible'
-    try:
-        import psyco
-        psyco.profile()
-    except: pass         
-
-
-def main():
-    start = time.clock()
-    UsePsyco()
-    status = Begin()
-    print '%0.2f seconds' % (time.clock()-start)
-    sys.exit(status) 
-
-    
-if __name__ == '__main__':
-    main()
diff --git a/pyste/src/Pyste/settings.py b/pyste/src/Pyste/settings.py
deleted file mode 100644
index 145ad046..00000000
--- a/pyste/src/Pyste/settings.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-
-#==============================================================================
-# Global information
-#==============================================================================
-
-DEBUG = False
-USING_BOOST_NS = True
-
-class namespaces:
-    boost = 'boost::'
-    pyste = ''
-    python = '' # default is to not use boost::python namespace explicitly, so
-                # use the "using namespace" statement instead
-
-import sys
-msvc = sys.platform == 'win32'
diff --git a/pyste/src/Pyste/utils.py b/pyste/src/Pyste/utils.py
deleted file mode 100644
index 23b3b2a7..00000000
--- a/pyste/src/Pyste/utils.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright Bruno da Silva de Oliveira 2003. Use, modification and 
-# distribution is subject to the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http:#www.boost.org/LICENSE_1_0.txt)
-
-from __future__ import generators
-import string
-import sys
-
-#==============================================================================
-# enumerate
-#==============================================================================
-def enumerate(seq):
-    i = 0
-    for x in seq:
-        yield i, x
-        i += 1  
-
-
-#==============================================================================
-# makeid
-#==============================================================================
-_valid_chars = string.ascii_letters + string.digits + '_'
-_valid_chars = dict(zip(_valid_chars, _valid_chars))
-
-def makeid(name):
-    'Returns the name as a valid identifier'
-    if type(name) != str:
-        print type(name), name
-    newname = []
-    for char in name:
-        if char not in _valid_chars:
-            char = '_'
-        newname.append(char)
-    newname = ''.join(newname)
-    # avoid duplications of '_' chars
-    names = [x for x in newname.split('_') if x]
-    return '_'.join(names)
- 
-
-#==============================================================================
-# remove_duplicated_lines
-#==============================================================================
-def remove_duplicated_lines(text):
-    includes = text.splitlines()
-    d = dict([(include, 0) for include in includes])
-    includes = d.keys()
-    includes.sort()
-    return '\n'.join(includes)
-
-
-#==============================================================================
-# left_equals
-#==============================================================================
-def left_equals(s):
-        s = '// %s ' % s
-        return s + ('='*(80-len(s))) + '\n'  
-
-
-#==============================================================================
-# post_mortem    
-#==============================================================================
-def post_mortem():
-
-    def info(type, value, tb):
-       if hasattr(sys, 'ps1') or not sys.stderr.isatty():
-          # we are in interactive mode or we don't have a tty-like
-          # device, so we call the default hook
-          sys.__excepthook__(type, value, tb)
-       else:
-          import traceback, pdb
-          # we are NOT in interactive mode, print the exception...
-          traceback.print_exception(type, value, tb)
-          print
-          # ...then start the debugger in post-mortem mode.
-          pdb.pm()
-
-    sys.excepthook = info 
diff --git a/pyste/tests/.cvsignore b/pyste/tests/.cvsignore
deleted file mode 100644
index 8fe21f06..00000000
--- a/pyste/tests/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.pyc
-*.exp
-*.lib
-*.obj
-*.arg
-*.dll
-.sconsign
diff --git a/pyste/tests/GCCXMLParserUT.py b/pyste/tests/GCCXMLParserUT.py
deleted file mode 100644
index 3bacc973..00000000
--- a/pyste/tests/GCCXMLParserUT.py
+++ /dev/null
@@ -1,336 +0,0 @@
-import sys
-sys.path.append('../src') 
-import unittest
-import tempfile
-import os.path
-import GCCXMLParser
-from declarations import *
-
-    
-class Tester(unittest.TestCase):
-
-    def TestConstructor(self, class_, method, visib):
-        self.assert_(isinstance(method, Constructor))
-        self.assertEqual(method.FullName(), class_.FullName() + '::' + method.name)
-        self.assertEqual(method.result, None)
-        self.assertEqual(method.visibility, visib)
-        self.assert_(not method.virtual)
-        self.assert_(not method.abstract)
-        self.assert_(not method.static)
-        
-    def TestDefaultConstructor(self, class_, method, visib):
-        self.TestConstructor(class_, method, visib)
-        self.assert_(method.IsDefault())
-
-    def TestCopyConstructor(self, class_, method, visib):    
-        self.TestConstructor(class_, method, visib)
-        self.assertEqual(len(method.parameters), 1)
-        param = method.parameters[0]
-        self.TestType(
-            param, 
-            ReferenceType, 
-            class_.FullName(), 
-            'const %s&' % class_.FullName(),
-            True)
-        self.assert_(method.IsCopy())
-
-
-    def TestType(self, type_, classtype_, name, fullname, const):
-        self.assert_(isinstance(type_, classtype_))
-        self.assertEqual(type_.name, name)
-        self.assertEqual(type_.namespace, None)
-        self.assertEqual(type_.FullName(), fullname)
-        self.assertEqual(type_.const, const)
-        
-        
-class ClassBaseTest(Tester):
-
-    def setUp(self):
-        self.base = GetDecl('Base')
-        
-    def testClass(self):
-        'test the properties of the class Base'
-        self.assert_(isinstance(self.base, Class))
-        self.assert_(self.base.abstract)
-                
-
-    def testFoo(self):
-        'test function foo in class Base' 
-        foo = GetMember(self.base, 'foo')
-        self.assert_(isinstance(foo, Method))
-        self.assertEqual(foo.visibility, Scope.public)
-        self.assert_(foo.virtual)
-        self.assert_(foo.abstract)
-        self.failIf(foo.static)
-        self.assertEqual(foo.class_, 'test::Base')
-        self.failIf(foo.const)
-        self.assertEqual(foo.FullName(), 'test::Base::foo')        
-        self.assertEqual(foo.result.name, 'void')
-        self.assertEqual(len(foo.parameters), 1)
-        param = foo.parameters[0]
-        self.TestType(param, FundamentalType, 'int', 'int', False)  
-        self.assertEqual(foo.namespace, None)
-        self.assertEqual(
-            foo.PointerDeclaration(1), '(void (test::Base::*)(int) )&test::Base::foo')
-
-    def testX(self):
-        'test the member x in class Base'
-        x = GetMember(self.base, 'x')
-        self.assertEqual(x.class_, 'test::Base')
-        self.assertEqual(x.FullName(), 'test::Base::x')
-        self.assertEqual(x.namespace, None)
-        self.assertEqual(x.visibility, Scope.private)
-        self.TestType(x.type, FundamentalType, 'int', 'int', False)  
-        self.assertEqual(x.static, False)
-
-    def testConstructors(self):
-        'test constructors in class Base'
-        constructors = GetMembers(self.base, 'Base')
-        for cons in constructors:
-            if len(cons.parameters) == 0:
-                self.TestDefaultConstructor(self.base, cons, Scope.public)
-            elif len(cons.parameters) == 1: # copy constructor
-                self.TestCopyConstructor(self.base, cons, Scope.public)
-            elif len(cons.parameters) == 2: # other constructor
-                intp, floatp = cons.parameters
-                self.TestType(intp, FundamentalType, 'int', 'int', False)
-                self.TestType(floatp, FundamentalType, 'float', 'float', False)
-
-    def testSimple(self):
-        'test function simple in class Base'
-        simple = GetMember(self.base, 'simple')
-        self.assert_(isinstance(simple, Method))
-        self.assertEqual(simple.visibility, Scope.protected)
-        self.assertEqual(simple.FullName(), 'test::Base::simple')
-        self.assertEqual(len(simple.parameters), 1)
-        param = simple.parameters[0]
-        self.TestType(param, ReferenceType, 'std::string', 'const std::string&', True)
-        self.TestType(simple.result, FundamentalType, 'bool', 'bool', False)
-        self.assertEqual(
-            simple.PointerDeclaration(1), 
-            '(bool (test::Base::*)(const std::string&) )&test::Base::simple')
-        
-          
-    def testZ(self):
-        z = GetMember(self.base, 'z')
-        self.assert_(isinstance(z, Variable))
-        self.assertEqual(z.visibility, Scope.public)
-        self.assertEqual(z.FullName(), 'test::Base::z')
-        self.assertEqual(z.type.name, 'int')
-        self.assertEqual(z.type.const, False)
-        self.assert_(z.static)
-        
-        
-class ClassTemplateTest(Tester):        
-    
-    def setUp(self):
-        self.template = GetDecl('Template<int>')
-
-    def testClass(self):
-        'test the properties of the Template<int> class'
-        self.assert_(isinstance(self.template, Class))
-        self.assert_(not self.template.abstract)
-        self.assertEqual(self.template.FullName(), 'Template<int>')
-        self.assertEqual(self.template.namespace, '')
-        self.assertEqual(self.template.name, 'Template<int>')
-
-    def testConstructors(self):
-        'test the automatic constructors of the class Template<int>'
-        constructors = GetMembers(self.template, 'Template')
-        for cons in constructors:
-            if len(cons.parameters) == 0:
-                self.TestDefaultConstructor(self.template, cons, Scope.public)
-            elif len(cons.parameters) == 1:
-                self.TestCopyConstructor(self.template, cons, Scope.public)
-                    
-
-    def testValue(self):
-        'test the class variable value'
-        value = GetMember(self.template, 'value')
-        self.assert_(isinstance(value, ClassVariable))
-        self.assert_(value.name, 'value')
-        self.TestType(value.type, FundamentalType, 'int', 'int', False)  
-        self.assert_(not value.static)
-        self.assertEqual(value.visibility, Scope.public)
-        self.assertEqual(value.class_, 'Template<int>')
-        self.assertEqual(value.FullName(), 'Template<int>::value')
-
-    def testBase(self):
-        'test the superclasses of Template<int>'
-        bases = self.template.bases
-        self.assertEqual(len(bases), 1)
-        base = bases[0]
-        self.assert_(isinstance(base, Base))
-        self.assertEqual(base.name, 'test::Base')
-        self.assertEqual(base.visibility, Scope.protected)
-
-        
-        
-class FreeFuncTest(Tester):
-
-    def setUp(self):
-        self.func = GetDecl('FreeFunc')
-
-    def testFunc(self):
-        'test attributes of FreeFunc'
-        self.assert_(isinstance(self.func, Function))
-        self.assertEqual(self.func.name, 'FreeFunc')
-        self.assertEqual(self.func.FullName(), 'test::FreeFunc')
-        self.assertEqual(self.func.namespace, 'test')
-        self.assertEqual(
-            self.func.PointerDeclaration(1), 
-            '(const test::Base& (*)(const std::string&, int))&test::FreeFunc')
-
-
-    def testResult(self):
-        'test the return value of FreeFunc'
-        res = self.func.result
-        self.TestType(res, ReferenceType, 'test::Base', 'const test::Base&', True)
-
-    def testParameters(self):
-        'test the parameters of FreeFunc'
-        self.assertEqual(len(self.func.parameters), 2)
-        strp, intp = self.func.parameters
-        self.TestType(strp, ReferenceType, 'std::string', 'const std::string&', True)
-        self.assertEqual(strp.default, None)
-        self.TestType(intp, FundamentalType, 'int', 'int', False)
-        self.assertEqual(intp.default, '10')
-        
-        
-
-class testFunctionPointers(Tester):
-
-    def testMethodPointer(self):
-        'test declaration of a pointer-to-method'
-        meth = GetDecl('MethodTester')
-        param = meth.parameters[0]
-        fullname = 'void (test::Base::*)(int)'
-        self.TestType(param, PointerType, fullname, fullname, False)
-
-    def testFunctionPointer(self):
-        'test declaration of a pointer-to-function'
-        func = GetDecl('FunctionTester')
-        param = func.parameters[0]
-        fullname = 'void (*)(int)'
-        self.TestType(param, PointerType, fullname, fullname, False)
-
-        
-        
-# =============================================================================
-# Support routines
-# =============================================================================
-
-cppcode = '''
-namespace std {
-    class string;
-}
-namespace test {
-class Base
-{
-public:
-    Base();
-    Base(const Base&);
-    Base(int, float);
-
-    virtual void foo(int = 0.0) = 0;
-    static int z;
-protected:    
-    bool simple(const std::string&);
-private:
-    int x;
-};
-
-void MethodTester( void (Base::*)(int) );
-void FunctionTester( void (*)(int) );
-
-
-const Base & FreeFunc(const std::string&, int=10);
-
-}
-
-template <class T>
-struct Template: protected test::Base
-{
-    T value;        
-    virtual void foo(int);
-};
- 
-Template<int> __aTemplateInt;
-'''
-
-def GetXMLFile():
-    '''Generates an gccxml file using the code from the global cppcode. 
-    Returns the xml's filename.'''
-    # write the code to a header file
-    tmpfile = tempfile.mktemp() + '.h'
-    f = file(tmpfile, 'w')
-    f.write(cppcode)
-    f.close()
-    # run gccxml
-    outfile = tmpfile + '.xml'
-    if os.system('gccxml "%s" "-fxml=%s"' % (tmpfile, outfile)) != 0:
-        raise RuntimeError, 'Error executing GCCXML.'
-    # read the output file into the xmlcode
-    f = file(outfile)
-    xmlcode = f.read()
-    #print xmlcode
-    f.close()
-    # remove the header
-    os.remove(tmpfile)
-    return outfile       
-
-
-
-def GetDeclarations():
-    'Uses the GCCXMLParser module to get the declarations.'
-    xmlfile = GetXMLFile()
-    declarations = GCCXMLParser.ParseDeclarations(xmlfile)
-    os.remove(xmlfile)
-    return declarations
-
-# the declarations to be analysed
-declarations = GetDeclarations()
-
-
-def GetDecl(name):
-    'returns one of the top declarations given its name'
-    for decl in declarations:
-        if decl.name == name:
-            return decl
-    else:
-        raise RuntimeError, 'Declaration not found: %s' % name
-
-
-def GetMember(class_, name):
-    'gets the member of the given class by its name'
-                
-    res = None
-    multipleFound = False
-    for member in class_:
-        if member.name == name:
-            if res is not None:
-                multipleFound = True
-                break
-            res = member
-    if res is None or multipleFound:
-        raise RuntimeError, \
-            'No member or more than one member found in class %s: %s' \
-                % (class_.name, name)
-    return res            
-    
-
-def GetMembers(class_, name):
-    'gets the members of the given class by its name'
-    res = []
-    for member in class_:
-        if member.name == name:
-            res.append(member)
-    if len(res) in (0, 1):            
-        raise RuntimeError, \
-            'GetMembers: 0 or 1 members found in class %s: %s' \
-                % (class_.name, name)
-    return res            
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/SmartFileUT.py b/pyste/tests/SmartFileUT.py
deleted file mode 100644
index ffde1899..00000000
--- a/pyste/tests/SmartFileUT.py
+++ /dev/null
@@ -1,80 +0,0 @@
-import sys
-sys.path.append('../src')
-from SmartFile import *
-import unittest
-import tempfile
-import os
-import time
-
-
-class SmartFileTest(unittest.TestCase):
-
-    FILENAME = tempfile.mktemp()
-    
-    def setUp(self):
-        self._Clean()
-        
-    def tearDown(self):
-        self._Clean()
-
-    def _Clean(self):
-        try:
-            os.remove(self.FILENAME)
-        except OSError: pass
-
-        
-    def testNonExistant(self):
-        "Must override the file, as there's no file in the disk yet"
-        self.assert_(not os.path.isfile(self.FILENAME))
-        f = SmartFile(self.FILENAME, 'w')
-        f.write('Testing 123\nTesting again.')
-        f.close()
-        self.assert_(os.path.isfile(self.FILENAME))
-
-
-    def testOverride(self):
-        "Must override the file, because the contents are different"
-        contents = 'Contents!\nContents!'
-        # create the file normally first
-        f = file(self.FILENAME, 'w')
-        f.write(contents)
-        f.close()
-        file_time = os.path.getmtime(self.FILENAME)
-        self.assert_(os.path.isfile(self.FILENAME))
-        time.sleep(2)
-        f = SmartFile(self.FILENAME, 'w')
-        f.write(contents + '_')
-        f.close()
-        new_file_time = os.path.getmtime(self.FILENAME)
-        self.assert_(new_file_time != file_time)
-
-
-    def testNoOverride(self):
-        "Must not override the file, because the contents are the same"
-        contents = 'Contents!\nContents!'
-        # create the file normally first
-        f = file(self.FILENAME, 'w')
-        f.write(contents)
-        f.close()
-        file_time = os.path.getmtime(self.FILENAME)
-        self.assert_(os.path.isfile(self.FILENAME))
-        time.sleep(2)
-        f = SmartFile(self.FILENAME, 'w')
-        f.write(contents)
-        f.close()
-        new_file_time = os.path.getmtime(self.FILENAME)
-        self.assert_(new_file_time == file_time) 
-
-
-    def testAutoClose(self):
-        "Must be closed when garbage-collected"
-        def foo():
-            f = SmartFile(self.FILENAME)
-            f.write('testing')  
-            self.assert_(not os.path.isfile(self.FILENAME))
-        foo()
-        self.assert_(os.path.isfile(self.FILENAME))
-        
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/abstract_test.h b/pyste/tests/abstract_test.h
deleted file mode 100644
index 4ac2b99b..00000000
--- a/pyste/tests/abstract_test.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <vector>
-#include <string>
-
-namespace abstract {
-    
-struct A {
-    virtual ~A() {}
-    virtual std::string f()=0;
-};
-
-struct B: A {
-    std::string f() { return "B::f"; }
-};
-
-std::string call(A* a) { return a->f(); }
-  
-}
diff --git a/pyste/tests/abstract_test.pyste b/pyste/tests/abstract_test.pyste
deleted file mode 100644
index c65bb3ad..00000000
--- a/pyste/tests/abstract_test.pyste
+++ /dev/null
@@ -1,3 +0,0 @@
-Class('abstract::A', 'abstract_test.h')
-Class('abstract::B', 'abstract_test.h')
-Function('abstract::call', 'abstract_test.h')
diff --git a/pyste/tests/abstract_testUT.py b/pyste/tests/abstract_testUT.py
deleted file mode 100644
index ace4ba80..00000000
--- a/pyste/tests/abstract_testUT.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import unittest
-from _abstract_test import *
-
-class AbstractTest(unittest.TestCase):
-
-    def testIt(self):
-        class C(A):
-            def f(self):
-                return 'C::f'
-
-        a = A()
-        b = B()
-        c = C()
-        self.assertRaises(RuntimeError, a.f)
-        self.assertEqual(b.f(), 'B::f')
-        self.assertEqual(call(b), 'B::f')
-        self.assertEqual(c.f(), 'C::f')
-        self.assertEqual(call(c), 'C::f') 
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/add_test.h b/pyste/tests/add_test.h
deleted file mode 100644
index d9f84780..00000000
--- a/pyste/tests/add_test.h
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace add_test {
-
-struct C
-{
-    int x;
-};
-
-const int get_x(C& c)
-{
-    return c.x;
-}
-
-}
diff --git a/pyste/tests/add_test.pyste b/pyste/tests/add_test.pyste
deleted file mode 100644
index cc7faa9e..00000000
--- a/pyste/tests/add_test.pyste
+++ /dev/null
@@ -1,2 +0,0 @@
-C = Class('add_test::C', 'add_test.h')
-add_method(C, 'add_test::get_x')
diff --git a/pyste/tests/add_testUT.py b/pyste/tests/add_testUT.py
deleted file mode 100644
index 69748418..00000000
--- a/pyste/tests/add_testUT.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import unittest
-from _add_test import *
-
-class AddMethodTest(unittest.TestCase):
-
-    def testIt(self):
-        c = C()
-        c.x = 10
-        self.assertEqual(c.get_x(), 10)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/basic.cpp b/pyste/tests/basic.cpp
deleted file mode 100644
index 9e6ed996..00000000
--- a/pyste/tests/basic.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "basic.h"
-
-namespace  basic {
-    
-    int C::static_value = 3;
-    const int C::const_static_value = 100;   
-
-}
diff --git a/pyste/tests/basic.h b/pyste/tests/basic.h
deleted file mode 100644
index 08286593..00000000
--- a/pyste/tests/basic.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef BASIC_H
-#define BASIC_H
-
-
-#include <string>
-
-namespace basic {
-    
-struct C
-{    
-    // test virtuallity
-    C(): value(1), const_value(0) {}
-    virtual int f(int x = 10)
-    {
-        return x*2;
-    }    
-    
-    int foo(int x=1){
-        return x+1;
-    }
-
-    const std::string& get_name() { return name; }
-    void set_name(const std::string& name) { this->name = name; }
-private:
-    std::string name;
-
-public:
-    // test data members
-    static int static_value;
-    static const int const_static_value;
-    
-    int value;
-    const int const_value;
-
-    // test static functions
-    static int mul(int x, int y) { return x*y; }
-    static double mul(double x, double y) { return x*y; }
-
-    static int square(int x=2) { return x*x; }
-};
-
-inline int call_f(C& c)
-{
-    return c.f();
-}
-
-inline int call_f(C& c, int x)
-{
-    return c.f(x);
-} 
-
-inline int get_static()
-{
-    return C::static_value;
-}
-
-inline int get_value(C& c)
-{
-    return c.value;
-}
-
-}
-
-#endif
diff --git a/pyste/tests/basic.pyste b/pyste/tests/basic.pyste
deleted file mode 100644
index 4fe0b5b3..00000000
--- a/pyste/tests/basic.pyste
+++ /dev/null
@@ -1,5 +0,0 @@
-Class('basic::C', 'basic.h')
-Function('basic::call_f', 'basic.h')
-Function('basic::get_static', 'basic.h')
-Function('basic::get_value', 'basic.h')
-
diff --git a/pyste/tests/basicUT.py b/pyste/tests/basicUT.py
deleted file mode 100644
index 4600e9e4..00000000
--- a/pyste/tests/basicUT.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import unittest
-from _basic import *
-
-class BasicExampleTest(unittest.TestCase):
-
-    def testIt(self):
-
-        # test virtual functions
-        class D(C):
-            def f(self, x=10):
-                return x+1
-
-        d = D()
-        c = C()
-
-        self.assertEqual(c.f(), 20)
-        self.assertEqual(c.f(3), 6)
-        self.assertEqual(d.f(), 11)
-        self.assertEqual(d.f(3), 4)
-        self.assertEqual(call_f(c), 20)
-        self.assertEqual(call_f(c, 4), 8)
-        self.assertEqual(call_f(d), 11)
-        self.assertEqual(call_f(d, 3), 4)
-        
-        # test data members
-        def testValue(value):
-            self.assertEqual(c.value, value)
-            self.assertEqual(d.value, value) 
-            self.assertEqual(get_value(c), value)
-            self.assertEqual(get_value(d), value)
-        testValue(1)
-        c.value = 30
-        d.value = 30
-        testValue(30)
-        self.assertEqual(c.const_value, 0)
-        self.assertEqual(d.const_value, 0)
-        def set_const_value():
-            c.const_value = 12
-        self.assertRaises(AttributeError, set_const_value)
-        
-        # test static data-members
-        def testStatic(value):
-            self.assertEqual(C.static_value, value)
-            self.assertEqual(c.static_value, value)
-            self.assertEqual(D.static_value, value)
-            self.assertEqual(d.static_value, value)
-            self.assertEqual(get_static(), value)
-        testStatic(3)
-        C.static_value = 10
-        testStatic(10)
-        self.assertEqual(C.const_static_value, 100)
-        def set_const_static():
-            C.const_static_value = 1
-        self.assertRaises(AttributeError, set_const_static)
-
-        # test static function
-        def test_mul(result, *args):
-            self.assertEqual(C.mul(*args), result)
-            self.assertEqual(c.mul(*args), result)
-        test_mul(16, 8, 2)
-        test_mul(6.0, 2.0, 3.0)
-        self.assertEqual(C.square(), 4)
-        self.assertEqual(c.square(), 4)
-        self.assertEqual(C.square(3), 9)
-        self.assertEqual(c.square(3), 9)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/code_test.h b/pyste/tests/code_test.h
deleted file mode 100644
index 4e073c78..00000000
--- a/pyste/tests/code_test.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-struct A {
-    int x;
-};
diff --git a/pyste/tests/code_test.pyste b/pyste/tests/code_test.pyste
deleted file mode 100644
index 467996fd..00000000
--- a/pyste/tests/code_test.pyste
+++ /dev/null
@@ -1,9 +0,0 @@
-Class('A', 'code_test.h')
-Include('string')
-declaration_code('''
-int get(A& a) { return a.x; }
-
-std::string foo() { return "Hello!"; }
-''')
-module_code('    def("get", &get);\n')
-module_code('    def("foo", &foo);\n')
diff --git a/pyste/tests/code_testUT.py b/pyste/tests/code_testUT.py
deleted file mode 100644
index 4655e724..00000000
--- a/pyste/tests/code_testUT.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import unittest
-from _code_test import *
-
-class CodeTest(unittest.TestCase):
-
-    def testIt(self):
-        a = A()
-        a.x = 12
-        self.assertEqual(get(a), 12)
-        self.assertEqual(foo(), "Hello!")
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/enums.h b/pyste/tests/enums.h
deleted file mode 100644
index e58a5c39..00000000
--- a/pyste/tests/enums.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef ENUMS_H
-#define ENUMS_H
-
-namespace enums {
-    
-enum color { red, blue };
-
-struct X
-{
-    enum choices
-    {
-        good = 1,
-        bad = 2
-    };
-
-    int set(choices c)
-    {
-        return (int)c;
-    }
-};
-
-enum {
-    x = 0,
-    y = 1
-};
-
-}
-
-#endif
diff --git a/pyste/tests/enums.pyste b/pyste/tests/enums.pyste
deleted file mode 100644
index c18a1244..00000000
--- a/pyste/tests/enums.pyste
+++ /dev/null
@@ -1,8 +0,0 @@
-h = AllFromHeader('enums.h')
-rename(h.color.red, 'Red')
-rename(h.color.blue, 'Blue')
-export_values(h.color)
-rename(h.X.choices.bad, 'Bad')
-rename(h.X.choices.good, 'Good')
-rename(h.X.choices, 'Choices')
-
diff --git a/pyste/tests/enumsUT.py b/pyste/tests/enumsUT.py
deleted file mode 100644
index cd1a8d9e..00000000
--- a/pyste/tests/enumsUT.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import unittest
-from _enums import *
-
-class EnumsTest(unittest.TestCase):
-
-    def testIt(self):
-        self.assertEqual(int(Red), 0)
-        self.assertEqual(int(Blue), 1)
-
-        self.assertEqual(int(X.Choices.Good), 1)
-        self.assertEqual(int(X.Choices.Bad), 2)
-        a = X()
-        self.assertEqual(a.set(a.Choices.Good), 1)
-        self.assertEqual(a.set(a.Choices.Bad), 2)
-        self.assertEqual(x, 0)
-        self.assertEqual(y, 1)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/header_test.h b/pyste/tests/header_test.h
deleted file mode 100644
index ada44ac0..00000000
--- a/pyste/tests/header_test.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef HEADER_TEST_H
-#define HEADER_TEST_H
-
-#include <map>
-#include <string>
-
-namespace header_test {
-    
-enum choice { red, blue };
-
-inline std::string choice_str(choice c)
-{
-    std::map<choice, std::string> choice_map;
-    choice_map[red] = "red";
-    choice_map[blue] = "blue";
-    return choice_map[c];
-}
-
-struct C
-{
-    choice c;
-
-    std::string get()
-    {
-        return choice_str(c);
-    }
-};
-
-// test the exclusion of the following
-
-struct ForwardDeclared; // should be excluded automatically
-struct A {};
-void foo();
-enum bar { value };
-
-}
-
-#endif
diff --git a/pyste/tests/header_test.pyste b/pyste/tests/header_test.pyste
deleted file mode 100644
index 3bd55501..00000000
--- a/pyste/tests/header_test.pyste
+++ /dev/null
@@ -1,4 +0,0 @@
-h = AllFromHeader('header_test.h')
-exclude(h.A)
-exclude(h.foo)
-exclude(h.bar)
diff --git a/pyste/tests/header_testUT.py b/pyste/tests/header_testUT.py
deleted file mode 100644
index 4e879429..00000000
--- a/pyste/tests/header_testUT.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import unittest
-from _header_test import *
-
-class HeaderTest(unittest.TestCase):
-    
-    def testIt(self):
-        self.assertEqual(choice.red, 0)
-        self.assertEqual(choice.blue, 1)
-        self.assertEqual(choice_str(choice.blue), 'blue')
-        self.assertEqual(choice_str(choice.red), 'red')
-        c = C()
-        c.c = choice.blue
-        self.assertEqual(c.get(), 'blue')
-        c.c = choice.red
-        self.assertEqual(c.get(), 'red')
-        # the following classes/functions should not have being exported
-        self.assertRaises(NameError, lambda: A())
-        self.assertRaises(NameError, lambda: foo())
-        self.assertRaises(NameError, lambda: bar.value)
-        self.assertRaises(NameError, lambda: ForwardDeclared())
-        
-if __name__ == '__main__':
-    unittest.main()    
diff --git a/pyste/tests/infosUT.py b/pyste/tests/infosUT.py
deleted file mode 100644
index 71d5e368..00000000
--- a/pyste/tests/infosUT.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import sys
-sys.path.append('../src')  
-from infos import *
-from policies import *
-from exporterutils import *
-import unittest
-
-
-class InfosTest(unittest.TestCase):
-
-    def testFunctionInfo(self):
-        info = FunctionInfo('test::foo', 'foo.h')
-        rename(info, 'hello')
-        set_policy(info, return_internal_reference())
-        set_wrapper(info, FunctionWrapper('foo_wrapper'))
-
-        info = InfoWrapper(info)
-        
-        self.assertEqual(info.rename, 'hello')
-        self.assertEqual(info.policy.Code(), 'return_internal_reference< 1 >')
-        self.assertEqual(info.wrapper.name, 'foo_wrapper')
-
-
-    def testClassInfo(self):
-        info = ClassInfo('test::IFoo', 'foo.h')
-        rename(info.name, 'Name')
-        rename(info.exclude, 'Exclude')
-        rename(info, 'Foo')
-        rename(info.Bar, 'bar')
-        set_policy(info.Baz, return_internal_reference())
-        rename(info.operator['>>'], 'from_string')
-        exclude(info.Bar)
-        set_wrapper(info.Baz, FunctionWrapper('baz_wrapper'))
-        
-        info = InfoWrapper(info)
-        
-        self.assertEqual(info.rename, 'Foo')
-        self.assertEqual(info['Bar'].rename, 'bar')
-        self.assertEqual(info['name'].rename, 'Name')
-        self.assertEqual(info['exclude'].rename, 'Exclude')
-        self.assertEqual(info['Bar'].exclude, True)
-        self.assertEqual(info['Baz'].policy.Code(), 'return_internal_reference< 1 >')
-        self.assertEqual(info['Baz'].wrapper.name, 'baz_wrapper')
-        self.assertEqual(info['operator']['>>'].rename, 'from_string')
-
-     
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/inherit.cpp b/pyste/tests/inherit.cpp
deleted file mode 100644
index d5c34e96..00000000
--- a/pyste/tests/inherit.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "inherit.h"
-
-int inherit::C::s = 1;
diff --git a/pyste/tests/inherit.h b/pyste/tests/inherit.h
deleted file mode 100644
index 0703ddc5..00000000
--- a/pyste/tests/inherit.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-namespace inherit {
-    
-template<typename T>
-class A
-{
-public:
-   void set(T v) { mData = v; }
-
-   T get() const { return mData; }
-
-private:
-   T mData;
-};
-
-
-class B : public A<int>
-{
-public:
-   int go() { return get(); }
-};
-
-struct C : B
-{
-    enum ab { a = 1, b = 2 };
-    int f1() { return 1; }
-    int x;
-    static int s;
-};
-
-struct D : C
-{
-    int f2() { return 2; }
-    int y;
-};
-
-struct X {};
-struct E: X, D {};
-}
diff --git a/pyste/tests/inherit.pyste b/pyste/tests/inherit.pyste
deleted file mode 100644
index 0dc02998..00000000
--- a/pyste/tests/inherit.pyste
+++ /dev/null
@@ -1,8 +0,0 @@
-A = Template('inherit::A', 'inherit.h')
-A_int = A('int', 'A_int')
-
-Class('inherit::B', 'inherit.h')
-Class('inherit::D', 'inherit.h')
-E = Class('inherit::E', 'inherit.h')
-exclude(E.s)
-exclude(E.ab)
diff --git a/pyste/tests/inherit2.h b/pyste/tests/inherit2.h
deleted file mode 100644
index f1a7195a..00000000
--- a/pyste/tests/inherit2.h
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace inherit2 {
-
-struct A
-{
-    int x;
-    int getx() { return x; }
-    int foo() { return 0; }
-    int foo(int x) { return x; }
-};
-
-struct B : A
-{
-    int y;
-    int gety() { return y; }
-    int foo() { return 1; }
-};
-
-struct C : B
-{
-    int z;
-    int getz() { return z; }
-};
-
-struct D : C
-{
-    int w;
-    int getw() { return w; }
-};
-
-}
diff --git a/pyste/tests/inherit2.pyste b/pyste/tests/inherit2.pyste
deleted file mode 100644
index 38082139..00000000
--- a/pyste/tests/inherit2.pyste
+++ /dev/null
@@ -1,2 +0,0 @@
-Class('inherit2::B', 'inherit2.h')
-Class('inherit2::D', 'inherit2.h')
diff --git a/pyste/tests/inherit2UT.py b/pyste/tests/inherit2UT.py
deleted file mode 100644
index 22985b1c..00000000
--- a/pyste/tests/inherit2UT.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import unittest
-from _inherit2 import *
-
-class InheritExampleTest(unittest.TestCase):
-
-    def testIt(self):
-        b = B()
-        d = D()
-        
-        self.assert_(issubclass(D, B))
-        b.x, b.y = 10, 5
-        self.assertEqual(b.getx(), 10)
-        self.assertEqual(b.gety(), 5)
-        d.x, d.y, d.z, d.w = 20, 15, 10, 5
-        self.assertEqual(d.getx(), 20)
-        self.assertEqual(d.gety(), 15) 
-        self.assertEqual(d.getz(), 10)
-        self.assertEqual(d.getw(), 5) 
-        self.assertEqual(b.foo(), 1)
-        self.assertEqual(b.foo(3), 3)
-
-        def wrong():
-            return b.getw()
-        self.assertRaises(AttributeError, wrong)
-
-if __name__ == '__main__':
-    unittest.main() 
diff --git a/pyste/tests/inherit3.h b/pyste/tests/inherit3.h
deleted file mode 100644
index 8385fe50..00000000
--- a/pyste/tests/inherit3.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-namespace inherit3 {
-    
-struct A
-{
-    struct X { int y; };
-    int x;
-    virtual int foo() { return 0; }
-    virtual int foo(int x) { return x; }
-    A operator+(A o) const
-    {
-        A r;
-        r.x = o.x + x;
-        return r;
-    }
-    enum E { i, j };
-
-};
-
-struct B: A
-{
-    struct X { int y; };
-    int x;
-    int foo() { return 1; }
-    A operator+(A o) const
-    {
-        A r;
-        r.x = o.x + x;
-        return r;
-    }     
-    enum E { i, j };
-
-}; 
-
-struct C: A
-{
-};  
-
-}
diff --git a/pyste/tests/inherit3.pyste b/pyste/tests/inherit3.pyste
deleted file mode 100644
index f95c0605..00000000
--- a/pyste/tests/inherit3.pyste
+++ /dev/null
@@ -1,2 +0,0 @@
-Class('inherit3::B', 'inherit3.h')
-Class('inherit3::C', 'inherit3.h')
diff --git a/pyste/tests/inherit3UT.py b/pyste/tests/inherit3UT.py
deleted file mode 100644
index 78cd7c3f..00000000
--- a/pyste/tests/inherit3UT.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import unittest
-from _inherit3 import *
-
-class testInherit3(unittest.TestCase):
-
-    def testIt(self):
-        def testInst(c):
-            self.assertEqual(c.x, 0)
-            self.assertEqual(c.foo(3), 3)
-            x = c.X()
-            self.assertEqual(x.y, 0)
-            self.assertEqual(c.E.i, 0)
-            self.assertEqual(c.E.j, 1)
-        b = B()
-        c = C()
-        testInst(b)
-        testInst(c)
-        self.assertEqual(b.foo(), 1)
-        self.assertEqual(c.foo(), 0)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/inherit4.h b/pyste/tests/inherit4.h
deleted file mode 100644
index fddda295..00000000
--- a/pyste/tests/inherit4.h
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace inherit4 {
-    
-struct A
-{
-    int x;
-};  
-
-struct B: A
-{
-    int y;
-};
-
-struct C: B
-{
-    int z;
-};   
-
-}
diff --git a/pyste/tests/inherit4.pyste b/pyste/tests/inherit4.pyste
deleted file mode 100644
index 4809e022..00000000
--- a/pyste/tests/inherit4.pyste
+++ /dev/null
@@ -1,3 +0,0 @@
-Class('inherit4::A', 'inherit4.h') 
-Class('inherit4::B', 'inherit4.h') 
-Class('inherit4::C', 'inherit4.h') 
diff --git a/pyste/tests/inherit4UT.py b/pyste/tests/inherit4UT.py
deleted file mode 100644
index ce917afb..00000000
--- a/pyste/tests/inherit4UT.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import unittest
-from _inherit4 import *
-
-class TestInherit4(unittest.TestCase):
-
-    def testIt(self):
-        self.assert_(issubclass(B, A))
-        self.assert_(issubclass(C, A))
-        self.assert_(issubclass(C, B))
-        a = A()
-        a.x = 1
-        b = B()
-        b.x = 10
-        b.y = 20
-        c = C()
-        c.x = 100
-        c.y = 200
-        c.z = 300
-        self.assertEqual(a.x, 1)
-        self.assertEqual(b.x, 10)
-        self.assertEqual(b.y, 20)
-        self.assertEqual(c.x, 100)
-        self.assertEqual(c.y, 200)
-        self.assertEqual(c.z, 300)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/inheritUT.py b/pyste/tests/inheritUT.py
deleted file mode 100644
index 0df82799..00000000
--- a/pyste/tests/inheritUT.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import unittest
-from _inherit import *
-
-class InheritExampleTest(unittest.TestCase):
-
-    def testIt(self):
-        a = A_int()        
-        b = B()
-        self.assert_(isinstance(b, A_int))
-        self.assert_(issubclass(B, A_int))
-        a.set(10)
-        self.assertEqual(a.get(), 10)        
-        b.set(1)
-        self.assertEqual(b.go(), 1)
-        self.assertEqual(b.get(), 1)
-
-        d = D()
-        self.assert_(issubclass(D, B))
-        self.assertEqual(d.x, 0)
-        self.assertEqual(d.y, 0)
-        self.assertEqual(d.s, 1)
-        self.assertEqual(D.s, 1)
-        self.assertEqual(d.f1(), 1)
-        self.assertEqual(d.f2(), 2)
-
-
-
-if __name__ == '__main__':
-    unittest.main() 
diff --git a/pyste/tests/nested.cpp b/pyste/tests/nested.cpp
deleted file mode 100644
index 9a37a226..00000000
--- a/pyste/tests/nested.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "nested.h"
-
-int nested::X::staticXValue = 10;
-int nested::X::Y::staticYValue = 20; 
diff --git a/pyste/tests/nested.h b/pyste/tests/nested.h
deleted file mode 100644
index e62adab5..00000000
--- a/pyste/tests/nested.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef NESTED_H
-#define NESTED_H
-
-namespace nested {
-    
-struct X
-{
-    struct Y 
-    {
-        int valueY;
-        static int staticYValue; 
-        struct Z
-        {
-            int valueZ;
-        };
-    };
-    
-    static int staticXValue;
-    int valueX;
-};
-
-typedef X Root;
-
-}
-
-#endif
diff --git a/pyste/tests/nested.pyste b/pyste/tests/nested.pyste
deleted file mode 100644
index 48bb26b5..00000000
--- a/pyste/tests/nested.pyste
+++ /dev/null
@@ -1 +0,0 @@
-Class('nested::Root', 'nested.h')
diff --git a/pyste/tests/nestedUT.py b/pyste/tests/nestedUT.py
deleted file mode 100644
index 43f3a346..00000000
--- a/pyste/tests/nestedUT.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import unittest
-from _nested import *
-
-class NestedTest(unittest.TestCase):
-
-    def testIt(self):              
-        self.assertEqual(Root.staticXValue, 10)
-        self.assertEqual(Root.Y.staticYValue, 20)
-        z = Root.Y.Z()
-        z.valueZ = 3
-        self.assertEqual(z.valueZ, 3)
-        
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/opaque.h b/pyste/tests/opaque.h
deleted file mode 100644
index 84ea3423..00000000
--- a/pyste/tests/opaque.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef OPAQUE_H
-#define OPAQUE_H
-
-#include <iostream>
-
-namespace opaque {
-
-    
-struct C { 
-    C(int v): value(v) {}
-    int value; 
-};
-
-
-inline C* new_C()
-{
-    return new C(10);
-}
-
-inline C* new_C_zero()
-{
-    return new C(0);
-}
-
-inline int get(C* c)
-{
-    return c->value;
-}
-
-struct D { 
-    D(double v): value(v) {}
-    double value; 
-};
-
-struct A
-{
-    D* new_handle()
-    {
-        return new D(3.0); 
-    }
-
-    double get(D* d)
-    {
-        return d->value;
-    }
-    
-    int f(int x=0) { return x; }
-};
-
-}
-
-#endif
diff --git a/pyste/tests/opaque.pyste b/pyste/tests/opaque.pyste
deleted file mode 100644
index 8180d251..00000000
--- a/pyste/tests/opaque.pyste
+++ /dev/null
@@ -1,7 +0,0 @@
-foo = Function('opaque::new_C', 'opaque.h')
-set_policy(foo, return_value_policy(return_opaque_pointer))
-foo = Function('opaque::new_C_zero', 'opaque.h')
-set_policy(foo, return_value_policy(return_opaque_pointer)) 
-Function('opaque::get', 'opaque.h' )
-A = Class('opaque::A', 'opaque.h')
-set_policy(A.new_handle, return_value_policy(return_opaque_pointer)) 
diff --git a/pyste/tests/opaqueUT.py b/pyste/tests/opaqueUT.py
deleted file mode 100644
index 2be26b83..00000000
--- a/pyste/tests/opaqueUT.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import unittest
-from _opaque import *
-
-class OpaqueTest(unittest.TestCase):
-
-    def testIt(self):
-
-        c = new_C()
-        self.assertEqual(get(c), 10)
-        c = new_C_zero()
-        self.assertEqual(get(c), 0) 
-        a = A()
-        d = a.new_handle()
-        self.assertEqual(a.get(d), 3.0)
-        self.assertEqual(a.f(), 0)
-        self.assertEqual(a.f(3), 3)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/operators.cpp b/pyste/tests/operators.cpp
deleted file mode 100644
index cc8e881d..00000000
--- a/pyste/tests/operators.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "operators.h"
-
-double operators::C::x = 10; 
diff --git a/pyste/tests/operators.h b/pyste/tests/operators.h
deleted file mode 100644
index 30ec8ecf..00000000
--- a/pyste/tests/operators.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef OPERATORS_H
-#define OPERATORS_H
-
-
-namespace operators {
-
-struct C
-{
-    static double x;
-    double value;
-
-    const C operator+(const C other) const
-    {
-        C c;
-        c.value = value + other.value;
-        return c;
-    }
-    operator int() const
-    {
-        return (int)value;    
-    } 
-    
-    double operator()()
-    {
-        return C::x;
-    }
-
-    double operator()(double other)
-    {
-        return C::x + other;
-    }
-    
-    operator const char*() { return "C"; }
-};
-
-inline const C operator*(const C& lhs, const C& rhs)
-{
-    C c;
-    c.value = lhs.value * rhs.value;
-    return c;
-}
-
-
-}
-
-
-#endif
diff --git a/pyste/tests/operators.pyste b/pyste/tests/operators.pyste
deleted file mode 100644
index 4ab7a370..00000000
--- a/pyste/tests/operators.pyste
+++ /dev/null
@@ -1,2 +0,0 @@
-C = Class('operators::C', 'operators.h')
-#exclude(C.operator['+'])
diff --git a/pyste/tests/operatorsUT.py b/pyste/tests/operatorsUT.py
deleted file mode 100644
index b0bdfa13..00000000
--- a/pyste/tests/operatorsUT.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import unittest
-from _operators import *
-
-class OperatorTest(unittest.TestCase):
-
-    def testIt(self):              
-        c = C()
-        c.value = 3.0
-        d = C()
-        d.value = 2.0
-        self.assertEqual(c.x, 10)
-        self.assertEqual(C.x, 10)
-        self.assertEqual(C.x, 10)
-        self.assertEqual((c * d).value, 6.0)
-        self.assertEqual((c + d).value, 5.0)
-        self.assertEqual(int(c), 3)
-        self.assertEqual(int(d), 2)
-        self.assertEqual(c(), 10)
-        self.assertEqual(d(), 10)
-        self.assertEqual(c(3.0), 13.0)
-        self.assertEqual(d(6.0), 16.0)
-        self.assertEqual(str(c), "C")
-
-
-if __name__ == '__main__':
-    unittest.main()  
diff --git a/pyste/tests/policiesUT.py b/pyste/tests/policiesUT.py
deleted file mode 100644
index 5e699b21..00000000
--- a/pyste/tests/policiesUT.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import sys
-sys.path.append('../src')  
-import unittest
-from policies import *
-
-class PoliciesTest(unittest.TestCase):
-    
-    def testReturnInternal(self):
-        'tests the code from a simple internal_reference'
-        
-        x = return_internal_reference(1)
-        self.assertEqual(x.Code(), 'return_internal_reference< 1 >')
-        x = return_internal_reference(3)
-        self.assertEqual(x.Code(), 'return_internal_reference< 3 >') 
-
-
-    def testCustodian(self):
-        'tests the code from a simple custodian_and_ward'
-        
-        x = with_custodian_and_ward(1,2)
-        self.assertEqual(x.Code(), 'with_custodian_and_ward< 1, 2 >')
-        x = with_custodian_and_ward(3,4)
-        self.assertEqual(x.Code(), 'with_custodian_and_ward< 3, 4 >') 
-
-
-    def testReturnPolicies(self):        
-        'tests all the return_value_policies'
-        
-        ret = 'return_value_policy< %s >'
-        x = return_value_policy(reference_existing_object)
-        self.assertEqual(x.Code(), ret % 'reference_existing_object')
-        x = return_value_policy(copy_const_reference)
-        self.assertEqual(x.Code(), ret % 'copy_const_reference') 
-        x = return_value_policy(copy_non_const_reference)
-        self.assertEqual(x.Code(), ret % 'copy_non_const_reference') 
-        x = return_value_policy(manage_new_object)
-        self.assertEqual(x.Code(), ret % 'manage_new_object') 
-        x = return_value_policy(return_opaque_pointer)
-        self.assertEqual(x.Code(), ret % 'return_opaque_pointer') 
-
-    def testReturnWithCustodiam(self):
-        'test the mix of return_internal with custodian'
-
-        x = return_internal_reference(1, with_custodian_and_ward(3,2))
-        self.assertEqual(
-            x.Code(), 
-            'return_internal_reference< 1, with_custodian_and_ward< 3, 2 > >')
-
-
-    def testReturnPoliciesWithInternal(self):
-        'test the mix of return_internal with return_policy'
-
-        x = return_internal_reference(1, return_value_policy(manage_new_object))
-        self.assertEqual(
-            x.Code(), 
-            'return_internal_reference< 1, return_value_policy< manage_new_object > >')
-
-        
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/runtests.py b/pyste/tests/runtests.py
deleted file mode 100644
index aae2dcfa..00000000
--- a/pyste/tests/runtests.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/python
-
-import sys
-sys.path.append('../src/Pyste')  
-import unittest
-import os.path
-from glob import glob
-
-if __name__ == '__main__':
-    loader = unittest.defaultTestLoader
-    tests = []
-    for name in glob('*UT.py'):
-        module = __import__(os.path.splitext(name)[0])
-        tests.append(loader.loadTestsFromModule(module))
-    runner = unittest.TextTestRunner()
-    result = runner.run(unittest.TestSuite(tests))
-    sys.exit(not result.wasSuccessful())    
diff --git a/pyste/tests/smart_ptr.h b/pyste/tests/smart_ptr.h
deleted file mode 100644
index 05b9149c..00000000
--- a/pyste/tests/smart_ptr.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef SMART_PTR_H
-#define SMART_PTR_H
-
-
-#include <memory>
-#include <boost/shared_ptr.hpp>
-
-namespace smart_ptr {
-    
-struct C
-{
-    int value;
-};
-
-inline boost::shared_ptr<C> NewC() { return boost::shared_ptr<C>( new C() ); }
-
-struct D
-{
-    boost::shared_ptr<C> Get() { return ptr; }
-    void Set( boost::shared_ptr<C> c ) { ptr = c; }
-private:    
-    boost::shared_ptr<C> ptr;
-};
-
-inline std::auto_ptr<D> NewD() { return std::auto_ptr<D>( new D() ); }
-
-
-// test an abstract class
-struct A
-{
-    virtual int f() = 0;
-};
-
-struct B: A
-{
-    virtual int f(){ return 1; }
-};
-
-inline boost::shared_ptr<A> NewA() { return boost::shared_ptr<A>(new B()); }
-inline int GetA(boost::shared_ptr<A> a) { return a->f(); }
-
-}
-
-#endif
diff --git a/pyste/tests/smart_ptr.pyste b/pyste/tests/smart_ptr.pyste
deleted file mode 100644
index cfbdd81a..00000000
--- a/pyste/tests/smart_ptr.pyste
+++ /dev/null
@@ -1,13 +0,0 @@
-C = Class('smart_ptr::C', 'smart_ptr.h')
-use_shared_ptr(C)
-
-D = Class('smart_ptr::D', 'smart_ptr.h')
-use_auto_ptr(D)
-
-A = Class('smart_ptr::A', 'smart_ptr.h')
-use_shared_ptr(A)
-
-Function('smart_ptr::NewC', 'smart_ptr.h')
-Function('smart_ptr::NewD', 'smart_ptr.h')
-Function('smart_ptr::NewA', 'smart_ptr.h')
-Function('smart_ptr::GetA', 'smart_ptr.h')
diff --git a/pyste/tests/smart_ptrUT.py b/pyste/tests/smart_ptrUT.py
deleted file mode 100644
index 477c919a..00000000
--- a/pyste/tests/smart_ptrUT.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import unittest
-from _smart_ptr import *
-
-class BasicExampleTest(unittest.TestCase):
-
-    def testIt(self):
-        c = NewC()
-        d = NewD()
-        c.value = 3
-        d.Set(c)
-        c1 = d.Get()
-        c1.value = 6
-        self.assertEqual(c.value, 6)
-        a = NewA()
-        self.assertEqual(GetA(a), 1)
-
-if __name__ == '__main__':
-    unittest.main()     
diff --git a/pyste/tests/templates.h b/pyste/tests/templates.h
deleted file mode 100644
index c34f4a81..00000000
--- a/pyste/tests/templates.h
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace templates {
-    
-template <class T>
-struct Point
-{
-    T x;
-    T y;
-};
-  
-}
diff --git a/pyste/tests/templates.pyste b/pyste/tests/templates.pyste
deleted file mode 100644
index 77eaceaa..00000000
--- a/pyste/tests/templates.pyste
+++ /dev/null
@@ -1,8 +0,0 @@
-Point = Template('templates::Point', 'templates.h')
-rename(Point.x, 'i')
-rename(Point.y, 'j')
-IPoint = Point('int')
-FPoint = Point('double', 'FPoint')
-rename(IPoint, 'IPoint')
-rename(IPoint.x, 'x')
-rename(IPoint.y, 'y')
diff --git a/pyste/tests/templatesUT.py b/pyste/tests/templatesUT.py
deleted file mode 100644
index af908369..00000000
--- a/pyste/tests/templatesUT.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import unittest
-from _templates import *
-
-class TemplatesTest(unittest.TestCase):
-
-    def testIt(self):  
-        fp = FPoint()
-        fp.i = 3.0
-        fp.j = 4.0
-        ip = IPoint()
-        ip.x = 10
-        ip.y = 3
-
-        self.assertEqual(fp.i, 3.0)
-        self.assertEqual(fp.j, 4.0)
-        self.assertEqual(ip.x, 10)
-        self.assertEqual(ip.y, 3)
-        self.assertEqual(type(fp.i), float)
-        self.assertEqual(type(fp.j), float)
-        self.assertEqual(type(ip.x), int)
-        self.assertEqual(type(ip.y), int)
-                
-                
-
-if __name__ == '__main__':
-    unittest.main() 
diff --git a/pyste/tests/test_all.py b/pyste/tests/test_all.py
deleted file mode 100644
index 413d7246..00000000
--- a/pyste/tests/test_all.py
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/python
-
-import os
-import glob
-import shutil
-import sys
-import time
-
-#=============================================================================
-# win32 configuration
-#=============================================================================
-if sys.platform == 'win32':
-    
-    includes = '-ID:/programming/libraries/boost-cvs/boost -ID:/Bin/Python/include'
-    build_pyste_cmd = 'python ../src/Pyste/pyste.py --cache-dir=cache %s ' % includes
-    compile_single_cmd = 'icl /nologo /GR /GX -c %s -I. ' % includes
-    link_single_cmd = 'link /nologo /DLL '\
-        '/libpath:D:/programming/libraries/boost-cvs/lib /libpath:D:/Bin/Python/libs '\
-        'boost_python.lib python23.lib /out:_%s.dll '
-    obj_ext = 'obj'
-    
-#=============================================================================
-# linux configuration
-#============================================================================= 
-elif sys.platform == 'linux2':
-    
-    build_pyste_cmd = 'python ../src/Pyste/pyste.py -I. '
-    compile_single_cmd = 'g++ -shared -c -I. -I/usr/include/python2.2 '
-    link_single_cmd = 'g++ -shared -o _%s.so -lboost_python '
-    obj_ext = 'o'
-
-    
-
-def build_pyste(multiple, module): 
-    rest = '%s --module=_%s %s.pyste' % (multiple, module, module)
-    execute(build_pyste_cmd + rest)
-
-
-def compile_single(module):
-    module_obj = ''
-    if os.path.isfile(module+'.cpp'):
-        execute(compile_single_cmd + module+'.cpp')
-        module_obj = module + '.' + obj_ext
-    execute(compile_single_cmd + ('_%s.cpp' % module))
-    link = link_single_cmd % module
-    execute(link + ('_%s.%s ' % (module, obj_ext)) + module_obj)
-
-
-def compile_multiple(module):
-    module_obj = ''
-    if os.path.isfile(module+'.cpp'):
-        execute(compile_single_cmd + module+'.cpp')
-        module_obj = module + '.' + obj_ext
-    files = glob.glob('_%s/*.cpp' % module)
-    for f in files:
-        execute(compile_single_cmd + f)
-    def basename(name):
-        return os.path.basename(os.path.splitext(name)[0])
-    objs = [basename(x) + '.' + obj_ext for x in files]
-    objs.append(module_obj)
-    execute((link_single_cmd % module) + ' '.join(objs))
-
-
-def execute(cmd):
-    os.system(cmd)
-        
-        
-def run_tests():
-    if os.system('python runtests.py') != 0:
-        raise RuntimeError, 'tests failed'
-
-
-def cleanup():
-    modules = get_modules()
-    extensions = '*.dll *.pyc *.obj *.exp *.lib *.o *.so'
-    files = []
-    for module in modules:
-        files.append('_' + module + '.cpp')
-    for ext in extensions.split():
-        files += glob.glob(ext)
-    files.append('build.log')
-    for file in files:
-        try:
-            os.remove(file)
-        except OSError: pass
-
-    for module in modules:
-        try:
-            shutil.rmtree('_' + module)
-        except OSError: pass
-
-    
-def main(multiple, module=None):
-    if module is None:
-        modules = get_modules()
-    else:
-        modules = [module]
-    
-    start = time.clock()
-    for module in modules:    
-        build_pyste(multiple, module) 
-    print '-'*50
-    print 'Building pyste files: %0.2f seconds' % (time.clock()-start)
-    print
-    
-    start = time.clock()
-    for module in modules:
-        if multiple:
-            compile_multiple(module)
-        else:
-            compile_single(module) 
-    print '-'*50
-    print 'Compiling files: %0.2f seconds' % (time.clock()-start) 
-    print
-    if len(modules) == 1:
-        os.system('python %sUT.py' % modules[0])
-    else:
-        run_tests()
-    #cleanup() 
-
-    
-def get_modules():
-    def getname(file):
-        return os.path.splitext(os.path.basename(file))[0]
-    return [getname(x) for x in glob.glob('*.pyste')]
-
-if __name__ == '__main__':
-    if len(sys.argv) > 1:
-        module = sys.argv[1]
-    else:
-        module = None
-    try:
-#        main('--multiple', module)
-        main('', module)
-    except RuntimeError, e:
-        print e        
diff --git a/pyste/tests/vars.cpp b/pyste/tests/vars.cpp
deleted file mode 100644
index 03994cff..00000000
--- a/pyste/tests/vars.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "vars.h"
-
-const Color black = Color(0, 0, 0);
-const Color red = Color(255, 0, 0);
-const Color green = Color(0, 255, 0);
-const Color blue = Color(0, 0, 255);
-Color in_use = black; 
diff --git a/pyste/tests/vars.h b/pyste/tests/vars.h
deleted file mode 100644
index 0aa44cac..00000000
--- a/pyste/tests/vars.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-struct Color
-{
-    Color(int r_ = 0, int g_ = 0, int b_ = 0):
-        r(r_), g(g_), b(b_)
-    {}        
-    Color( const Color &c):
-        r(c.r), g(c.g), b(c.b)
-    {}
-    int r;
-    int g;
-    int b;
-};
-
-extern const Color black;
-extern const Color red;
-extern const Color green;
-extern const Color blue;
-extern Color in_use;
diff --git a/pyste/tests/vars.pyste b/pyste/tests/vars.pyste
deleted file mode 100644
index 3fd9d689..00000000
--- a/pyste/tests/vars.pyste
+++ /dev/null
@@ -1 +0,0 @@
-AllFromHeader('vars.h')
diff --git a/pyste/tests/varsUT.py b/pyste/tests/varsUT.py
deleted file mode 100644
index 9507bba1..00000000
--- a/pyste/tests/varsUT.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import unittest
-import _vars
-
-
-class VarsTest(unittest.TestCase):
-
-    def testIt(self):
-        def testColor(c, r, g, b):
-            self.assertEqual(c.r, r)            
-            self.assertEqual(c.g, g)            
-            self.assertEqual(c.b, b)            
-        testColor(_vars.black, 0, 0, 0)
-        testColor(_vars.red, 255, 0, 0)
-        testColor(_vars.green, 0, 255, 0)
-        testColor(_vars.blue, 0, 0, 255)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/pyste/tests/virtual.cpp b/pyste/tests/virtual.cpp
deleted file mode 100644
index a1baa6db..00000000
--- a/pyste/tests/virtual.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-
-// Includes ====================================================================
-#include <boost/python.hpp>
-#include <virtual.h>
-
-// Using =======================================================================
-using namespace boost::python;
-
-// Declarations ================================================================
-
-
-namespace  {
-
-
-struct virtual_C_Wrapper: virtual_::C
-{
-    virtual_C_Wrapper(PyObject* self_, const virtual_::C & p0):
-        virtual_::C(p0), self(self_) {}
-
-    virtual_C_Wrapper(PyObject* self_):
-        virtual_::C(), self(self_) {}
-
-    int f() {
-        return call_method< int >(self, "f");
-    }
-
-    int default_f() {
-        return virtual_::C::f();
-    }
-
-    void bar(int p0) {
-        call_method< void >(self, "bar", p0);
-    }
-
-    void default_bar(int p0) {
-        virtual_::C::bar(p0);
-    }
-
-    void bar(char * p0) {
-        call_method< void >(self, "bar", p0);
-    }
-
-    void default_bar(char * p0) {
-        virtual_::C::bar(p0);
-    }
-
-    int f_abs() {
-        return call_method< int >(self, "f_abs");
-    }
-
-    PyObject* self;
-};
-
-
-
-}// namespace 
-
-
-// Module ======================================================================
-BOOST_PYTHON_MODULE(virtual)
-{
-    class_< virtual_::C, boost::noncopyable, virtual_C_Wrapper >("C", init<  >())
-        .def("get_name", &virtual_::C::get_name)
-        .def("f", &virtual_::C::f, &virtual_C_Wrapper::default_f)
-        .def("bar", (void (virtual_::C::*)(int) )&virtual_::C::bar, (void (virtual_C_Wrapper::*)(int))&virtual_C_Wrapper::default_bar)
-        .def("bar", (void (virtual_::C::*)(char *) )&virtual_::C::bar, (void (virtual_C_Wrapper::*)(char *))&virtual_C_Wrapper::default_bar)
-    ;
-
-    def("call_f", &virtual_::call_f);
-}
diff --git a/pyste/tests/virtual.h b/pyste/tests/virtual.h
deleted file mode 100644
index c7880a1b..00000000
--- a/pyste/tests/virtual.h
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace virtual_ {
-    
-struct C
-{
-public:
-    virtual int f()
-    {
-        return f_abs();
-    }
-
-    virtual void bar(int) {}
-    virtual void bar(char*) {}
-
-    const char* get_name()
-    {
-        return name();
-    }
-    virtual int dummy() { return 0; }
-
-protected:    
-    virtual int f_abs() = 0;
-
-private:    
-    virtual const char* name() { return "C"; }
-};
-
-struct D
-{
-    virtual int dummy() { return 0; }
-};
-
-inline int call_f(C& c) { return c.f(); }
-inline int call_dummy(C* c) { return c->dummy(); }
-inline int call_dummy(D* d) { return d->dummy(); }
-
-}
diff --git a/pyste/tests/virtual.pyste b/pyste/tests/virtual.pyste
deleted file mode 100644
index ef966412..00000000
--- a/pyste/tests/virtual.pyste
+++ /dev/null
@@ -1,6 +0,0 @@
-C = Class('virtual_::C', 'virtual.h')
-final(C.dummy)
-D = Class('virtual_::D', 'virtual.h')
-final(D.dummy)
-Function('virtual_::call_f', 'virtual.h')
-Function('virtual_::call_dummy', 'virtual.h')
diff --git a/pyste/tests/virtual2.h b/pyste/tests/virtual2.h
deleted file mode 100644
index 7c9659d3..00000000
--- a/pyste/tests/virtual2.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-namespace virtual2 {
-
-struct A
-{
-    virtual int f() { return 0; }
-    virtual int f1() { return 10; }
-    virtual A* make_new() { return new A; }
-};
-
-struct B: A
-{
-    virtual int f() { return 1; }
-    virtual int f2() { return 20; }
-    virtual A* make_new() { return new B; }
-};
-
-inline int call_fs(A*a)
-{
-    int r = a->f1();
-    B* b = dynamic_cast<B*>(a);
-    return r + b->f2();
-}
-    
-inline int call_f(A* a)
-{
-    return a->f();
-}
-}
diff --git a/pyste/tests/virtual2.pyste b/pyste/tests/virtual2.pyste
deleted file mode 100644
index 785b819c..00000000
--- a/pyste/tests/virtual2.pyste
+++ /dev/null
@@ -1,6 +0,0 @@
-A = Class('virtual2::A', 'virtual2.h')
-set_policy(A.make_new, return_value_policy(manage_new_object))
-B = Class('virtual2::B', 'virtual2.h')
-set_policy(B.make_new, return_value_policy(manage_new_object))
-Function('virtual2::call_fs', 'virtual2.h')
-Function('virtual2::call_f', 'virtual2.h')
diff --git a/pyste/tests/virtual2UT.py b/pyste/tests/virtual2UT.py
deleted file mode 100644
index 2a722711..00000000
--- a/pyste/tests/virtual2UT.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import unittest
-from _virtual2 import *
-
-class Virtual2Test(unittest.TestCase):
-
-    def testIt(self):
-        a = A()
-        self.assertEqual(a.f1(), 10)
-        b = B()
-        self.assertEqual(b.f1(), 10)
-        self.assertEqual(b.f2(), 20)
-        self.assertEqual(call_fs(b), 30)
-        self.assertEqual(call_f(a), 0)
-        self.assertEqual(call_f(b), 1)
-        nb = b.make_new()
-        na = a.make_new()
-        self.assertEqual(na.f1(), 10)
-        self.assertEqual(nb.f1(), 10)
-        self.assertEqual(nb.f2(), 20)
-        self.assertEqual(call_fs(nb), 30)
-        self.assertEqual(call_f(na), 0)
-        self.assertEqual(call_f(nb), 1) 
-        class C(B):
-            def f1(self): return 1
-            def f2(self): return 2
-            def f(self): return 100
-
-        c = C()
-        self.assertEqual(call_fs(c), 3)
-        self.assertEqual(call_fs(c), 3)
-        self.assertEqual(call_f(c), 100)
-
-
-if __name__ == '__main__':
-    unittest.main()  
diff --git a/pyste/tests/virtualUT.py b/pyste/tests/virtualUT.py
deleted file mode 100644
index 767965f9..00000000
--- a/pyste/tests/virtualUT.py
+++ /dev/null
@@ -1,51 +0,0 @@
-import unittest
-from _virtual import *
-
-class VirtualTest(unittest.TestCase):
-
-    def testIt(self):              
-        
-        class E(C):
-            def f_abs(self):
-                return 3
-            def dummy(self):
-                # override should not work
-                return 100
-            
-        class F(C):
-            def f(self):
-                return 10
-            def name(self):
-                return 'F'
-  
-        class G(D):
-            def dummy(self):
-                # override should not work
-                return 100
-
-        e = E()
-        f = F()
-
-        self.assertEqual(e.f(), 3)
-        self.assertEqual(call_f(e), 3)
-        self.assertEqual(f.f(), 10)
-        self.assertEqual(call_f(f), 10)
-        self.assertEqual(e.get_name(), 'C')
-        #self.assertEqual(e.get_name(), 'E') check this later
-
-        c = C()
-        c.bar(1)      # ok
-        c.bar('a')    # ok
-        self.assertRaises(TypeError, c.bar, 1.0)        
-
-        # test no_overrides
-        d = G()        
-        self.assertEqual(e.dummy(), 100)
-        self.assertEqual(call_dummy(e), 0)
-        self.assertEqual(d.dummy(), 100)
-        self.assertEqual(call_dummy(d), 0)     
-
-
-        
-if __name__ == '__main__':
-    unittest.main()  
diff --git a/pyste/tests/wrappertest.h b/pyste/tests/wrappertest.h
deleted file mode 100644
index 4cce28ee..00000000
--- a/pyste/tests/wrappertest.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef WRAPPER_TEST
-#define WRAPPER_TEST
-
-
-#include <vector>
-
-namespace wrappertest {
-
-inline std::vector<int> Range(int count)
-{
-    std::vector<int> v;
-    v.reserve(count);
-    for (int i = 0; i < count; ++i){
-        v.push_back(i);
-    }
-    return v;
-}
-
-
-struct C
-{
-    C() {}
-
-    std::vector<int> Mul(int value)
-    {
-        std::vector<int> res;
-        res.reserve(value);
-        std::vector<int>::const_iterator it;
-        std::vector<int> v(Range(value));
-        for (it = v.begin(); it != v.end(); ++it){
-            res.push_back(*it * value);
-        }
-        return res;
-    }
-};
-
-
-struct A
-{
-    virtual int f() { return 1; };
-};
-
-inline int call_foo(A* a){ return a->f(); }
-} 
-#endif
-
diff --git a/pyste/tests/wrappertest.pyste b/pyste/tests/wrappertest.pyste
deleted file mode 100644
index 12ba47b6..00000000
--- a/pyste/tests/wrappertest.pyste
+++ /dev/null
@@ -1,21 +0,0 @@
-Include('wrappertest_wrappers.h')
-
-f = Function('wrappertest::Range', 'wrappertest.h')
-set_wrapper(f, 'RangeWrapper')
-
-mul = Wrapper('MulWrapper',
-'''
-list MulWrapper(wrappertest::C& c, int value){    
-    return VectorToList(c.Mul(value));
-} 
-'''
-)
-
-C = Class('wrappertest::C', 'wrappertest.h')
-set_wrapper(C.Mul, mul)
-
-
-A = Class('wrappertest::A', 'wrappertest.h')
-set_wrapper(A.f, 'f_wrapper')
-
-Function('wrappertest::call_foo', 'wrappertest.h')
diff --git a/pyste/tests/wrappertestUT.py b/pyste/tests/wrappertestUT.py
deleted file mode 100644
index 5831dd76..00000000
--- a/pyste/tests/wrappertestUT.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import unittest
-from _wrappertest import *
-
-class WrapperTest(unittest.TestCase):
-
-    def testIt(self):              
-        self.assertEqual(Range(10), range(10))
-        self.assertEqual(C().Mul(10), [x*10 for x in range(10)])
-
-        a = A()
-        self.assertEqual(a.f(), 10)
-        self.assertEqual(call_foo(a), 10)
-        class D(A):
-            def f(self): return 2
-        d = D()
-        self.assertEqual(d.f(), 2)
-        self.assertEqual(call_foo(d), 2)
-
-if __name__ == '__main__':
-    unittest.main()  
diff --git a/pyste/tests/wrappertest_wrappers.h b/pyste/tests/wrappertest_wrappers.h
deleted file mode 100644
index a0b5d946..00000000
--- a/pyste/tests/wrappertest_wrappers.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef WRAPPER_TEST_WRAPPERS
-#define WRAPPER_TEST_WRAPPERS 
-
-#include <vector>
-#include <boost/python.hpp>
-#include "wrappertest.h"
-
-using namespace boost::python;
-
-template <class T>
-list VectorToList(const std::vector<T> & v)
-{
-    list res;
-    typename std::vector<T>::const_iterator it;
-    for(it = v.begin(); it != v.end(); ++it){
-        res.append(*it);
-    }
-    Py_XINCREF(res.ptr());
-    return res;
-}
-
-inline list RangeWrapper(int count){
-    return VectorToList(wrappertest::Range(count));
-}
-
-inline int f_wrapper(wrappertest::A*) { return 10; } 
-
-#endif
diff --git a/release_notes.txt b/release_notes.txt
deleted file mode 100644
index 8932a0aa..00000000
--- a/release_notes.txt
+++ /dev/null
@@ -1,217 +0,0 @@
-2000-11-22 10:00
-    Ullrich fixed bug in operator_dispatcher<op_long>.
-    
-2000-11-21 10:00
-    Changed all class and function names into lower_case.
-    
-    Ullrich updated documentation for operator wrapping.
-    
-2000-11-20 10:00
-    Ullrich renamed ExtensionClass:register_coerce() into 
-    ExtensionClass:def_standard_coerce() and made it public
-    
-    Ullrich improved shared_pod_manager.
-    
-2000-11-17 15:04
-    Changed allocation strategy of shared_pod_manager to make it portable.
-    
-    Added pickling support + tests thanks to "Ralf W. Grosse-Kunstleve"
-    <rwgk@cci.lbl.gov>
-
-    Added a specialization of Callback<const char*> to prevent unsafe usage.
-
-    Fixed Ullrich's operator_dispatcher refcount bug
-
-    Removed const char* return values from virtual functions in tests; that
-    usage was unsafe.
-
-    Ullrich changed Module::add() so that it steals a reference (fix of refcount bug)
-    
-    Ullrich added operator_dispatcher::create() optimization
-    
-    Ullrich changed design and implementation of TypeObjectBase::enable() (to eliminate low-level
-    code) and added shared_pod_manager optimization.
-
-
-2000-11-15 12:01
-    Fixed refcount bugs in operator calls.
-    
-    Added callback_adjust_refcount(PyObject*, Type<T>) to account for different ownership 
-    semantics of Callback's return types and Caller's arguments (which both use from_python())
-    This bug caused refcount errors during operator calls.
-
-    Moved operator_dispatcher into extclass.cpp
-    Gave it shared ownership of the objects it wraps
-
-    Introduced sequence points in extension_class_coerce for exception-safety
-
-    UPPER_CASE_MACRO_NAMES
-
-    MixedCase template type argument names
-
-    Changed internal error reporting to use Python exceptions so we don't force the
-    user to link in iostreams code
-
-    Changed error return value of call_cmp to -1
-
-    Moved unwrap_* functions out of operator_dispatcher. This was transitional: when
-    I realized they didn't need to be declared in extclass.h I moved them out, but
-    now that operator_dispatcher itself is in extclass.cpp they could go back in.
-
-    Numerous formatting tweaks
-
-    Updated the BoundFunction::create() optimization and enabled it so it could actually be used!
-
-2000-11-15 00:26
-
-    Made Ullrich's operators support work with MSVC
-    
-    Cleaned up operators.h such that invalid define_operator<0> is no longer needed.
-    
-    Ullrich created operators.h to support wrapping of C++ operators (including the "__r*__" forms). 
-    He added several auxiliary classes to extclass.h and extclass.cpp (most importantly, 
-    py::detail::operator_dispatcher and py::operators)
-
-2000-11-13 22:29
-
-    removed obsolete ExtensionClassFromPython for good.
-
-    removed unused class ExtensionType forward declaration
-
-2000-11-12 13:08
-
-    Added enum_as_int_converters for easier enum wrapping
-
-    Introduced new conversion namespace macros:
-        PY_BEGIN_CONVERSION_NAMESPACE,
-        PY_END_CONVERSION_NAMESPACE,
-        PY_CONVERSION
-
-    callback.h, gen_callback.py:
-        Added call() function so that a regular python function (as opposed to
-         method or other function-as-attribute) can be called.
-
-         Added newlines for readability.
-
-    class_wrapper.h:
-        Fixed a bug in add(), which allows non-method class attributes
-
-    Ullrich has added def_raw for simple varargs and keyword support.
-
-    Fixed version number check for __MWERKS__
-    
-    Added tests for enums and non-method class attributes
-
-    objects.h/objects.cpp:
-        Added py::String operator*= and operator* for repetition
-
-        Change Dict::items(), keys(), and values() to return a List
-
-        Added template versions of set_item, etc., methods so that users can optionally
-        use C++ types that have to_python() functions as parameters.
-
-        Changed various Ptr by-value parameters to const Ptr&
-
-
-======= Release =======
-2000-11-06 0:22 
-    Lots of documentation updates
-
-    added 4-argument template constructor to py::Tuple
-
-    added "add" member function to ClassWrapper<> to allow arbitrary Python
-    objects to be added to an extension class.
-
-    gen_all.py now generates support for n argument member functions and n+1
-    argument member functions at the suggestion of "Ralf W. Grosse-Kunstleve"
-    <rwgk@cci.lbl.gov>
-
-    Added regression tests and re-ordered declare_base calls to verify that the
-    phantom base class issue is resolved.
-
-2000-11-04 17:35
-
-    Integrated Ullrich Koethe's brilliant from_python_experiment for better
-    error-reporting in many cases.
-
-    extclass.h, gen_extclass.py:
-        removed special-case MSVC code
-        added much commentary
-        removed unused py_copy_to_new_value_holder
-
-    init_function.h, gen_init_function.py:
-        added missing 'template' keyword on type-dependent template member usage
-        removed special-case MSVC code
-        added much commentary
-        
-2000-11-04 0:36
-
-    Removed the need for the phantom base class that screwed up inheritance
-    hierarchies, introduced error-prone ordering dependencies, and complexified
-    logic in many places!
-    
-    extclass.h: Added some explanatory comments, removed wasteful m_self member
-    of HeldInstance
-
-    extclass_demo.cpp: Added #pragmas which allow compilation in ansi strict
-    mode under Metrowerks
-
-    functions.h: Added virtual_function as part of phantom base class removal;
-    expanded commentary
-
-    pyptr.h: Added some missing 'typename's and a GCC workaround fix
-
-    subclass.cpp: Added missing string literal const_cast<>s.
-
-2000-11-03 10:58
-
-    Fix friend function instantiation bug caught by Metrowerks (thanks
-    Metrowerks!)
-
-    Add proof-of-concept for one technique of wrapping function that return a
-    pointer
-
-    Worked around MSVC optimizer bug by writing to_python(double) and
-    to_python(float) out-of-line
-
-2000-11-02 23:25
-
-    Add /Zm200 option to vc6_prj to deal with MSVC resource limitations
-    
-    Remove conflicting /Ot option from vc6_prj release build
-
-======= Release =======
-2000-11-02 17:42
-
-    Added a fix for interactions between default virtual function
-    implementations and declare_base(). You still need to write your
-    declare_base() /after/ all member functions have been def()d for the two
-    classes concerned.  Many, many thanks to Ullrich Koethe
-    <koethe@informatik.uni-hamburg.de> for all his work on this.
-
-    Added missing conversions:
-        to_python(float)
-        from_python(const char* const&)
-        from_python(const double&)
-        from_python(const float&)
-
-    Added a Regression test for a reference-counting bug thanks to Mark Evans
-    (<mark.evans@clarisay.com>)
-
-    const-ify ClassBase::getattr()
-
-    Add repr() function to Class<T>
-
-    Add to_python/from_python conversions for PyPtr<T>
-
-    Standardize set_item/get_item interfaces (instead of proxies) for Dict and List
-
-    Add Reprable<> template to newtypes.h
-
-    Fix a bug wherein the __module__ attribute would be lost for classes that have a
-    default virtual function implementation.
-
-    Remove extra ';' in module.cpp thanks to "Ralf W. Grosse-Kunstleve"
-    <rwgk@cci.lbl.gov>
-
-    Fix a bug in the code of example1.html
diff --git a/src/aix_init_module.cpp b/src/aix_init_module.cpp
deleted file mode 100644
index 3eb9f097..00000000
--- a/src/aix_init_module.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifdef _AIX
-#include <cstdio>
-#include <cstdlib>
-
-extern "C"
-{
-#include <sys/stat.h>
-#include <unistd.h>
-}
-
-# include <string>
-# include <boost/python/detail/wrap_python.hpp>
-# include <boost/python/errors.hpp>
-# include <boost/python/detail/aix_init_module.hpp>
-# include <boost/python/module.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-namespace
-{
-  static PyMethodDef initial_methods[] = { { 0, 0, 0, 0 } };
-  extern "C" void initlibboost_python()
-  {
-      Py_InitModule("libboost_python", initial_methods);
-  }
-
-  struct find_and_open_file
-  {
-      FILE*       fp;
-      std::string libpath;  // -- search path
-      std::string filename; // -- filename to look for
-      std::string fullpath; // -- full path to file
-   
-      find_and_open_file(
-          const std::string& libpath_env
-          , const std::string& file);
-  };
-
-  find_and_open_file::find_and_open_file(
-      const std::string& libpath_env
-      , const std::string& file)
-      : fp(0)
-  {
-      char* value = std::getenv(libpath_env.c_str());
-
-      if(value == 0)
-          return;
-      
-      libpath = value;
-      
-      if (libpath == "")
-          return;
-
-      std::string::size_type pos = 0, prev_pos = 0;
-
-      // -- loop through all search paths looking for file 
-      while((pos = libpath.find_first_of(":",pos)) != std::string::npos)
-      {
-          fullpath = libpath.substr(prev_pos,pos - prev_pos) + "/" + file;
-          if (::access(fullpath.c_str(), R_OK) == 0)
-          {
-              struct stat filestat;
-              ::stat(fullpath.c_str(), &filestat);
-              if (!S_ISDIR(filestat.st_mode))
-              { 
-                  fp = std::fopen(fullpath.c_str(), "r"); 
-                  if (fp)
-                  {
-                      filename = file;
-                  }
-                  return;
-              }
-          }
-          prev_pos = ++pos;
-      }
-
-      // -- mop up odd path
-      if (libpath.find_first_of(":", prev_pos) == std::string::npos)
-      {
-          fullpath = libpath.substr(prev_pos, libpath.size() - prev_pos) + "/" + file;
-          if (::access(fullpath.c_str(), R_OK) == 0)
-          {
-              struct stat filestat;
-              ::stat(fullpath.c_str(),&filestat);
-              if (!S_ISDIR(filestat.st_mode))
-              { 
-                  fp = std::fopen(fullpath.c_str(), "r"); 
-                  filename = file;
-              }
-          }
-      }
-  }
-}
-
-void aix_init_module(
-    so_load_function load_dynamic_module
-    , char const* module_name
-    , void (*init_module)())
-{
-    static bool initialized;
-    if (!initialized)
-    {
-        char const* const name = "libboost_python.so";
-        find_and_open_file dynlib("LIBPATH", name);
-        if (dynlib.fp == 0)
-        {
-            fprintf(stderr, " Error: could not find %s\n", name);
-            return;
-        }
-        
-        std::string::size_type pos = pos = dynlib.filename.rfind(".so");
-        if (pos != dynlib.filename.size() - 3)
-        {
-            fprintf(stderr, "dynamic library %s must end with .so\n", dynlib.filename.c_str());
-            return;
-        }
-
-        PyObject* m = 
-            load_dynamic_module(
-                const_cast<char*>(dynlib.filename.substr(0,pos).c_str()),
-                const_cast<char*>(dynlib.fullpath.c_str()),
-                dynlib.fp);
-
-        if (m == 0)
-        {
-            fprintf(stderr, "failed to load library %s\n", name);
-            return;
-        }
-        Py_DECREF(m);
-
-        initialized = true;
-    }
-    python::detail::init_module(module_name, init_module);
-}
-
-}}} // namespace boost::python
-#endif
diff --git a/src/converter/arg_to_python_base.cpp b/src/converter/arg_to_python_base.cpp
deleted file mode 100644
index 9849071e..00000000
--- a/src/converter/arg_to_python_base.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/converter/arg_to_python_base.hpp>
-#include <boost/python/errors.hpp>
-#include <boost/python/converter/registrations.hpp>
-#include <boost/python/handle.hpp>
-#include <boost/python/refcount.hpp>
-
-namespace boost { namespace python { namespace converter { 
-
-namespace detail
-{
-  arg_to_python_base::arg_to_python_base(
-      void const volatile* source, registration const& converters)
-# if !defined(BOOST_MSVC) || BOOST_MSVC <= 1300 || _MSC_FULL_VER > 13102179
-      : handle<>
-# else
-      : m_ptr
-# endif
-         (converters.to_python(source))
-  {
-  }
-}
-
-}}} // namespace boost::python::converter
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
deleted file mode 100644
index f1a614c3..00000000
--- a/src/converter/builtin_converters.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/handle.hpp>
-#include <boost/python/type_id.hpp>
-#include <boost/python/errors.hpp>
-#include <boost/python/refcount.hpp>
-
-#include <boost/python/detail/config.hpp>
-#include <boost/python/detail/wrap_python.hpp>
-
-#include <boost/python/converter/builtin_converters.hpp>
-#include <boost/python/converter/rvalue_from_python_data.hpp>
-#include <boost/python/converter/registry.hpp>
-#include <boost/python/converter/registrations.hpp>
-#include <boost/python/converter/shared_ptr_deleter.hpp>
-
-#include <boost/cast.hpp>
-#include <string>
-#include <complex>
-
-namespace boost { namespace python { namespace converter {
-
-shared_ptr_deleter::shared_ptr_deleter(handle<> owner)
-    : owner(owner)
-{}
-
-shared_ptr_deleter::~shared_ptr_deleter() {}
-
-void shared_ptr_deleter::operator()(void const*)
-{
-    owner.reset();
-}
-
-namespace
-{
-  // An lvalue conversion function which extracts a char const* from a
-  // Python String.
-  void* convert_to_cstring(PyObject* obj)
-  {
-      return PyString_Check(obj) ? PyString_AsString(obj) : 0;
-  }
-
-  // Given a target type and a SlotPolicy describing how to perform a
-  // given conversion, registers from_python converters which use the
-  // SlotPolicy to extract the type.
-  template <class T, class SlotPolicy>
-  struct slot_rvalue_from_python
-  {
-   public:
-      slot_rvalue_from_python()
-      {
-          registry::insert(
-              &slot_rvalue_from_python<T,SlotPolicy>::convertible
-              , &slot_rvalue_from_python<T,SlotPolicy>::construct
-              , type_id<T>()
-              );
-      }
-      
-   private:
-      static void* convertible(PyObject* obj)
-      {
-          unaryfunc* slot = SlotPolicy::get_slot(obj);
-          return slot && *slot ? slot : 0;
-      }
-
-      static void construct(PyObject* obj, rvalue_from_python_stage1_data* data)
-      {
-          // Get the (intermediate) source object
-          unaryfunc creator = *static_cast<unaryfunc*>(data->convertible);
-          handle<> intermediate(creator(obj));
-
-          // Get the location in which to construct
-          void* storage = ((rvalue_from_python_storage<T>*)data)->storage.bytes;
-          new (storage) T(SlotPolicy::extract(intermediate.get()));
-
-          // record successful construction
-          data->convertible = storage;
-      }
-  };
-
-  // A SlotPolicy for extracting signed integer types from Python objects
-  struct signed_int_rvalue_from_python_base
-  {
-      static unaryfunc* get_slot(PyObject* obj)
-      {
-          PyNumberMethods* number_methods = obj->ob_type->tp_as_number;
-          if (number_methods == 0)
-              return 0;
-
-          return (PyInt_Check(obj) || PyLong_Check(obj))
-              ? &number_methods->nb_int : 0;
-      }
-  };
-
-  template <class T>
-  struct signed_int_rvalue_from_python : signed_int_rvalue_from_python_base
-  {
-      static T extract(PyObject* intermediate)
-      {
-          long x = PyInt_AsLong(intermediate);
-          if (PyErr_Occurred())
-              throw_error_already_set();
-          return numeric_cast<T>(x);
-      }
-  };
-
-  // identity_unaryfunc/py_object_identity -- manufacture a unaryfunc
-  // "slot" which just returns its argument. 
-  extern "C" PyObject* identity_unaryfunc(PyObject* x)
-  {
-      Py_INCREF(x);
-      return x;
-  }
-  unaryfunc py_object_identity = identity_unaryfunc;
-
-  // A SlotPolicy for extracting unsigned integer types from Python objects
-  struct unsigned_int_rvalue_from_python_base
-  {
-      static unaryfunc* get_slot(PyObject* obj)
-      {
-          PyNumberMethods* number_methods = obj->ob_type->tp_as_number;
-          if (number_methods == 0)
-              return 0;
-
-          return (PyInt_Check(obj) || PyLong_Check(obj))
-              ? &py_object_identity : 0;
-      }
-  };
-
-  template <class T>
-  struct unsigned_int_rvalue_from_python : unsigned_int_rvalue_from_python_base
-  {
-      static T extract(PyObject* intermediate)
-      {
-          return numeric_cast<T>(
-              PyLong_Check(intermediate)
-              ? PyLong_AsUnsignedLong(intermediate)
-              : PyInt_AS_LONG(intermediate));
-      }
-  };
-
-// Checking Python's macro instead of Boost's - we don't seem to get
-// the config right all the time. Furthermore, Python's is defined
-// when long long is absent but __int64 is present.
-  
-#ifdef HAVE_LONG_LONG
-  // A SlotPolicy for extracting long long types from Python objects
-
-  struct long_long_rvalue_from_python_base
-  {
-      static unaryfunc* get_slot(PyObject* obj)
-      {
-          PyNumberMethods* number_methods = obj->ob_type->tp_as_number;
-          if (number_methods == 0)
-              return 0;
-
-          // Return the identity conversion slot to avoid creating a
-          // new object. We'll handle that in the extract function
-          if (PyInt_Check(obj))
-              return &number_methods->nb_int;
-          else if (PyLong_Check(obj))
-              return &number_methods->nb_long;
-          else
-              return 0;
-      }
-  };
-  
-  struct long_long_rvalue_from_python : long_long_rvalue_from_python_base
-  {
-      static BOOST_PYTHON_LONG_LONG extract(PyObject* intermediate)
-      {
-          if (PyInt_Check(intermediate))
-          {
-              return PyInt_AS_LONG(intermediate);
-          }
-          else
-          {
-              BOOST_PYTHON_LONG_LONG result = PyLong_AsLongLong(intermediate);
-              
-              if (PyErr_Occurred())
-                  throw_error_already_set();
-
-              return result;
-          }
-      }
-  };
-
-  struct unsigned_long_long_rvalue_from_python : long_long_rvalue_from_python_base
-  {
-      static unsigned BOOST_PYTHON_LONG_LONG extract(PyObject* intermediate)
-      {
-          if (PyInt_Check(intermediate))
-          {
-              return numeric_cast<unsigned BOOST_PYTHON_LONG_LONG>(PyInt_AS_LONG(intermediate));
-          }
-          else
-          {
-              unsigned BOOST_PYTHON_LONG_LONG result = PyLong_AsUnsignedLongLong(intermediate);
-              
-              if (PyErr_Occurred())
-                  throw_error_already_set();
-
-              return result;
-          }
-      }
-  };
-#endif 
-
-  // A SlotPolicy for extracting bool from a Python object
-  struct bool_rvalue_from_python
-  {
-      static unaryfunc* get_slot(PyObject* obj)
-      {
-          return obj == Py_None || PyInt_Check(obj) ? &py_object_identity : 0;
-      }
-      
-      static bool extract(PyObject* intermediate)
-      {
-          return PyObject_IsTrue(intermediate);
-      }
-  };
-
-  // A SlotPolicy for extracting floating types from Python objects.
-  struct float_rvalue_from_python
-  {
-      static unaryfunc* get_slot(PyObject* obj)
-      {
-          PyNumberMethods* number_methods = obj->ob_type->tp_as_number;
-          if (number_methods == 0)
-              return 0;
-
-          // For integer types, return the tp_int conversion slot to avoid
-          // creating a new object. We'll handle that below
-          if (PyInt_Check(obj))
-              return &number_methods->nb_int;
-
-          return (PyLong_Check(obj) || PyFloat_Check(obj))
-              ? &number_methods->nb_float : 0;
-      }
-      
-      static double extract(PyObject* intermediate)
-      {
-          if (PyInt_Check(intermediate))
-          {
-              return PyInt_AS_LONG(intermediate);
-          }
-          else
-          {
-              return PyFloat_AS_DOUBLE(intermediate);
-          }
-      }
-  };
-
-  // A SlotPolicy for extracting C++ strings from Python objects.
-  struct string_rvalue_from_python
-  {
-      // If the underlying object is "string-able" this will succeed
-      static unaryfunc* get_slot(PyObject* obj)
-      {
-          return (PyString_Check(obj))
-              ? &obj->ob_type->tp_str : 0;
-      };
-
-      // Remember that this will be used to construct the result object 
-      static std::string extract(PyObject* intermediate)
-      {
-          return std::string(PyString_AsString(intermediate),PyString_Size(intermediate));
-      }
-  };
-
-  // encode_string_unaryfunc/py_encode_string -- manufacture a unaryfunc
-  // "slot" which encodes a Python string using the default encoding
-  extern "C" PyObject* encode_string_unaryfunc(PyObject* x)
-  {
-      return PyUnicode_FromEncodedObject( x, 0, 0 );
-  }
-  unaryfunc py_encode_string = encode_string_unaryfunc;
-
-
-#ifndef BOOST_NO_STD_WSTRING
-  // A SlotPolicy for extracting C++ strings from Python objects.
-  struct wstring_rvalue_from_python
-  {
-      // If the underlying object is "string-able" this will succeed
-      static unaryfunc* get_slot(PyObject* obj)
-      {
-          return PyUnicode_Check(obj)
-              ? &py_object_identity
-            : PyString_Check(obj)
-              ? &py_encode_string
-            : 0;
-      };
-
-      // Remember that this will be used to construct the result object 
-      static std::wstring extract(PyObject* intermediate)
-      {
-          std::wstring result(::PyObject_Length(intermediate), L' ');
-          int err = PyUnicode_AsWideChar(
-              (PyUnicodeObject *)intermediate
-            , result.size() ? &result[0] : 0
-            , result.size());
-
-          if (err == -1)
-              throw_error_already_set();
-          return result;
-      }
-  };
-#endif 
-
-  struct complex_rvalue_from_python
-  {
-      static unaryfunc* get_slot(PyObject* obj)
-      {
-          if (PyComplex_Check(obj))
-              return &py_object_identity;
-          else
-              return float_rvalue_from_python::get_slot(obj);
-      }
-      
-      static std::complex<double> extract(PyObject* intermediate)
-      {
-          if (PyComplex_Check(intermediate))
-          {
-              return std::complex<double>(
-                  PyComplex_RealAsDouble(intermediate)
-                  , PyComplex_ImagAsDouble(intermediate));
-          }
-          else if (PyInt_Check(intermediate))
-          {
-              return PyInt_AS_LONG(intermediate);
-          }
-          else
-          {
-              return PyFloat_AS_DOUBLE(intermediate);
-          }
-      }
-  };
-} 
-
-BOOST_PYTHON_DECL PyObject* do_return_to_python(char x)
-{
-    return PyString_FromStringAndSize(&x, 1);
-}
-  
-BOOST_PYTHON_DECL PyObject* do_return_to_python(char const* x)
-{
-    return x ? PyString_FromString(x) : boost::python::detail::none();
-}
-  
-BOOST_PYTHON_DECL PyObject* do_return_to_python(PyObject* x)
-{
-    return x ? x : boost::python::detail::none();
-}
-  
-BOOST_PYTHON_DECL PyObject* do_arg_to_python(PyObject* x)
-{
-    if (x == 0)
-        return boost::python::detail::none();
-      
-    Py_INCREF(x);
-    return x;
-}
-
-#define REGISTER_INT_CONVERTERS(signedness, U)                          \
-        slot_rvalue_from_python<                                        \
-                signedness U                                            \
-                ,signedness##_int_rvalue_from_python<signedness U>      \
-         >()
-
-#define REGISTER_INT_CONVERTERS2(U)             \
-        REGISTER_INT_CONVERTERS(signed, U);     \
-        REGISTER_INT_CONVERTERS(unsigned, U)  
-
-void initialize_builtin_converters()
-{
-    // booleans
-    slot_rvalue_from_python<bool,bool_rvalue_from_python>();
-
-    // integer types
-    REGISTER_INT_CONVERTERS2(char);
-    REGISTER_INT_CONVERTERS2(short);
-    REGISTER_INT_CONVERTERS2(int);
-    REGISTER_INT_CONVERTERS2(long);
-    
-// using Python's macro instead of Boost's - we don't seem to get the
-// config right all the time.
-# ifdef HAVE_LONG_LONG
-    slot_rvalue_from_python<signed BOOST_PYTHON_LONG_LONG,long_long_rvalue_from_python>();
-    slot_rvalue_from_python<unsigned BOOST_PYTHON_LONG_LONG,unsigned_long_long_rvalue_from_python>();
-# endif
-        
-    // floating types
-    slot_rvalue_from_python<float,float_rvalue_from_python>();
-    slot_rvalue_from_python<double,float_rvalue_from_python>();
-    slot_rvalue_from_python<long double,float_rvalue_from_python>();
-    
-    slot_rvalue_from_python<std::complex<float>,complex_rvalue_from_python>();
-    slot_rvalue_from_python<std::complex<double>,complex_rvalue_from_python>();
-    slot_rvalue_from_python<std::complex<long double>,complex_rvalue_from_python>();
-    
-    // Add an lvalue converter for char which gets us char const*
-    registry::insert(convert_to_cstring,type_id<char>());
-
-# ifndef BOOST_NO_STD_WSTRING
-    // Register by-value converters to std::string, std::wstring
-    slot_rvalue_from_python<std::wstring, wstring_rvalue_from_python>();
-# endif 
-    slot_rvalue_from_python<std::string, string_rvalue_from_python>();
-}
-
-}}} // namespace boost::python::converter
diff --git a/src/converter/from_python.cpp b/src/converter/from_python.cpp
deleted file mode 100644
index d12fb756..00000000
--- a/src/converter/from_python.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/converter/from_python.hpp>
-#include <boost/python/converter/registrations.hpp>
-#include <boost/python/converter/rvalue_from_python_data.hpp>
-
-#include <boost/python/object/find_instance.hpp>
-
-#include <boost/python/handle.hpp>
-#include <boost/python/detail/raw_pyobject.hpp>
-#include <boost/python/cast.hpp>
-
-#include <vector>
-#include <algorithm>
-
-namespace boost { namespace python { namespace converter { 
-
-// rvalue_from_python_stage1 -- do the first stage of a conversion
-// from a Python object to a C++ rvalue.
-//
-//    source     - the Python object to be converted
-//    converters - the registry entry for the target type T
-//
-// Postcondition: where x is the result, one of:
-//
-//   1. x.convertible == 0, indicating failure
-//
-//   2. x.construct == 0, x.convertible is the address of an object of
-//      type T. Indicates a successful lvalue conversion
-//
-//   3. where y is of type rvalue_from_python_data<T>,
-//      x.construct(source, y) constructs an object of type T
-//      in y.storage.bytes and then sets y.convertible == y.storage.bytes,
-//      or else throws an exception and has no effect.
-BOOST_PYTHON_DECL rvalue_from_python_stage1_data rvalue_from_python_stage1(
-    PyObject* source
-    , registration const& converters)
-{
-    rvalue_from_python_stage1_data data;
-
-    // First check to see if it's embedded in an extension class
-    // instance, as a special case.
-    data.convertible = objects::find_instance_impl(source, converters.target_type);
-    if (data.convertible)
-    {
-        data.construct = 0;
-    }
-    else
-    {
-        for (rvalue_from_python_chain const* chain = converters.rvalue_chain;
-             chain != 0;
-             chain = chain->next)
-        {
-            void* r = chain->convertible(source);
-            if (r != 0)
-            {
-                data.convertible = r;
-                data.construct = chain->construct;
-                break;
-            }
-        }
-    }
-    return data;
-}
-
-// rvalue_result_from_python -- return the address of a C++ object which
-// can be used as the result of calling a Python function.
-//
-//      src  - the Python object to be converted
-//
-//      data - a reference to the base part of a
-//             rvalue_from_python_data<T> object, where T is the
-//             target type of the conversion.
-//
-// Requires: data.convertible == &registered<T>::converters
-//
-BOOST_PYTHON_DECL void* rvalue_result_from_python(
-    PyObject* src, rvalue_from_python_stage1_data& data)
-{
-    // Retrieve the registration
-    // Cast in two steps for less-capable compilers
-    void const* converters_ = data.convertible;
-    registration const& converters = *static_cast<registration const*>(converters_);
-
-    // Look for an eligible converter
-    data = rvalue_from_python_stage1(src, converters);
-    return rvalue_from_python_stage2(src, data, converters);
-}
-
-BOOST_PYTHON_DECL void* rvalue_from_python_stage2(
-    PyObject* source, rvalue_from_python_stage1_data& data, registration const& converters)
-{
-    if (!data.convertible)
-    {
-        handle<> msg(
-            ::PyString_FromFormat(
-                "No registered converter was able to produce a C++ rvalue of type %s from this Python object of type %s"
-                , converters.target_type.name()
-                , source->ob_type->tp_name
-                ));
-              
-        PyErr_SetObject(PyExc_TypeError, msg.get());
-        throw_error_already_set();
-    }
-
-    // If a construct function was registered (i.e. we found an
-    // rvalue conversion), call it now.
-    if (data.construct != 0)
-        data.construct(source, &data);
-
-    // Return the address of the resulting C++ object
-    return data.convertible;
-}
-
-BOOST_PYTHON_DECL void* get_lvalue_from_python(
-    PyObject* source
-    , registration const& converters)
-{
-    // Check to see if it's embedded in a class instance
-    void* x = objects::find_instance_impl(source, converters.target_type);
-    if (x)
-        return x;
-
-    lvalue_from_python_chain const* chain = converters.lvalue_chain;
-    for (;chain != 0; chain = chain->next)
-    {
-        void* r = chain->convert(source);
-        if (r != 0)
-            return r;
-    }
-    return 0;
-}
-
-namespace
-{
-  // Prevent looping in implicit conversions. This could/should be
-  // much more efficient, but will work for now.
-  typedef std::vector<rvalue_from_python_chain const*> visited_t;
-  static visited_t visited;
-
-  inline bool visit(rvalue_from_python_chain const* chain)
-  {
-      visited_t::iterator const p = std::lower_bound(visited.begin(), visited.end(), chain);
-      if (p != visited.end() && *p == chain)
-          return false;
-      visited.insert(p, chain);
-      return true;
-  }
-
-  // RAII class for managing global visited marks.
-  struct unvisit
-  {
-      unvisit(rvalue_from_python_chain const* chain)
-          : chain(chain) {}
-      
-      ~unvisit()
-      {
-          visited_t::iterator const p = std::lower_bound(visited.begin(), visited.end(), chain);
-          assert(p != visited.end());
-          visited.erase(p);
-      }
-   private:
-      rvalue_from_python_chain const* chain;
-  };
-}
-
-
-BOOST_PYTHON_DECL bool implicit_rvalue_convertible_from_python(
-    PyObject* source
-    , registration const& converters)
-{    
-    if (objects::find_instance_impl(source, converters.target_type))
-        return true;
-    
-    rvalue_from_python_chain const* chain = converters.rvalue_chain;
-    
-    if (!visit(chain))
-        return false;
-
-    unvisit protect(chain);
-    
-    for (;chain != 0; chain = chain->next)
-    {
-        if (chain->convertible(source))
-            return true;
-    }
-
-    return false;
-}
-
-namespace
-{
-  void throw_no_lvalue_from_python(PyObject* source, registration const& converters, char const* ref_type)
-  {
-      handle<> msg(
-          ::PyString_FromFormat(
-              "No registered converter was able to extract a C++ %s to type %s"
-              " from this Python object of type %s"
-              , ref_type
-              , converters.target_type.name()
-              , source->ob_type->tp_name
-              ));
-              
-      PyErr_SetObject(PyExc_TypeError, msg.get());
-
-      throw_error_already_set();
-  }
-
-  void* lvalue_result_from_python(
-      PyObject* source
-      , registration const& converters
-      , char const* ref_type)
-  {
-      handle<> holder(source);
-      if (source->ob_refcnt <= 1)
-      {
-          handle<> msg(
-              ::PyString_FromFormat(
-                  "Attempt to return dangling %s to object of type: %s"
-                  , ref_type
-                  , converters.target_type.name()));
-          
-          PyErr_SetObject(PyExc_ReferenceError, msg.get());
-
-          throw_error_already_set();
-      }
-      
-      void* result = get_lvalue_from_python(source, converters);
-      if (!result)
-          (throw_no_lvalue_from_python)(source, converters, ref_type);
-      return result;
-  }
-  
-}
-
-BOOST_PYTHON_DECL void throw_no_pointer_from_python(PyObject* source, registration const& converters)
-{
-    (throw_no_lvalue_from_python)(source, converters, "pointer");
-}
-
-BOOST_PYTHON_DECL void throw_no_reference_from_python(PyObject* source, registration const& converters)
-{
-    (throw_no_lvalue_from_python)(source, converters, "reference");
-}
-
-BOOST_PYTHON_DECL void* reference_result_from_python(
-    PyObject* source
-    , registration const& converters)
-{
-    return (lvalue_result_from_python)(source, converters, "reference");
-}
-  
-BOOST_PYTHON_DECL void* pointer_result_from_python(
-    PyObject* source
-    , registration const& converters)
-{
-    if (source == Py_None)
-    {
-        Py_DECREF(source);
-        return 0;
-    }
-    return (lvalue_result_from_python)(source, converters, "pointer");
-}
-  
-BOOST_PYTHON_DECL void void_result_from_python(PyObject* o)
-{
-    Py_DECREF(expect_non_null(o));
-}
-
-} // namespace boost::python::converter
-
-BOOST_PYTHON_DECL PyObject*
-pytype_check(PyTypeObject* type_, PyObject* source)
-{
-    if (!PyObject_IsInstance(source, python::upcast<PyObject>(type_)))
-    {
-        ::PyErr_Format(
-            PyExc_TypeError
-            , "Expecting an object of type %s; got an object of type %s instead"
-            , type_->tp_name
-            , source->ob_type->tp_name
-            );
-        throw_error_already_set();
-    }
-    return source;
-}
-
-}} // namespace boost::python
diff --git a/src/converter/registry.cpp b/src/converter/registry.cpp
deleted file mode 100644
index ce12ec81..00000000
--- a/src/converter/registry.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-//  Copyright David Abrahams 2001. Permission to copy, use,
-//  modify, sell and distribute this software is granted provided this
-//  copyright notice appears in all copies. This software is provided
-//  "as is" without express or implied warranty, and with no claim as
-//  to its suitability for any purpose.
-#include <boost/python/converter/registry.hpp>
-#include <boost/python/converter/registrations.hpp>
-#include <boost/python/converter/builtin_converters.hpp>
-
-#include <set>
-#include <stdexcept>
-#include <boost/lexical_cast.hpp>
-
-#if defined(__APPLE__) && defined(__MACH__) && defined(__GNUC__) \
- && __GNUC__ == 3 && __GNUC_MINOR__ == 3 && !defined(__APPLE_CC__)
-# define BOOST_PYTHON_CONVERTER_REGISTRY_APPLE_MACH_WORKAROUND
-#endif
-
-#if defined(BOOST_PYTHON_TRACE_REGISTRY) \
- || defined(BOOST_PYTHON_CONVERTER_REGISTRY_APPLE_MACH_WORKAROUND)
-# include <iostream>
-#endif
-
-namespace boost { namespace python { namespace converter { 
-
-BOOST_PYTHON_DECL PyTypeObject* registration::get_class_object() const
-{
-    if (this->m_class_object == 0)
-    {
-        ::PyErr_Format(
-            PyExc_TypeError
-            , const_cast<char*>("No Python class registered for C++ class %s")
-            , this->target_type.name());
-    
-        throw_error_already_set();
-    }
-    
-    return this->m_class_object;
-}
-  
-BOOST_PYTHON_DECL PyObject* registration::to_python(void const volatile* source) const
-{
-    if (this->m_to_python == 0)
-    {
-        handle<> msg(
-            ::PyString_FromFormat(
-                "No to_python (by-value) converter found for C++ type: %s"
-                , this->target_type.name()
-                )
-            );
-            
-        PyErr_SetObject(PyExc_TypeError, msg.get());
-
-        throw_error_already_set();
-    }
-        
-    return source == 0
-        ? incref(Py_None)
-        : this->m_to_python(const_cast<void*>(source));
-}
-
-namespace // <unnamed>
-{
-  typedef registration entry;
-  
-  typedef std::set<entry> registry_t;
-  
-#ifndef BOOST_PYTHON_CONVERTER_REGISTRY_APPLE_MACH_WORKAROUND
-  registry_t& entries()
-  {
-      static registry_t registry;
-
-# ifndef BOOST_PYTHON_SUPPRESS_REGISTRY_INITIALIZATION
-      static bool builtin_converters_initialized = false;
-      if (!builtin_converters_initialized)
-      {
-          // Make this true early because registering the builtin
-          // converters will cause recursion.
-          builtin_converters_initialized = true;
-          
-          initialize_builtin_converters();
-      }
-#  ifdef BOOST_PYTHON_TRACE_REGISTRY
-      std::cout << "registry: ";
-      for (registry_t::iterator p = registry.begin(); p != registry.end(); ++p)
-      {
-          std::cout << p->target_type << "; ";
-      }
-      std::cout << '\n';
-#  endif 
-# endif 
-      return registry;
-  }
-#else
-  registry_t& static_registry()
-  {
-    static registry_t result;
-    return result;
-  }
-
-  bool static_builtin_converters_initialized()
-  {
-    static bool result = false;
-    if (result == false) {
-      result = true;
-      std::cout << std::flush;
-      return false;
-    }
-    return true;
-  }
-
-  registry_t& entries()
-  {
-# ifndef BOOST_PYTHON_SUPPRESS_REGISTRY_INITIALIZATION
-      if (!static_builtin_converters_initialized())
-      {
-          initialize_builtin_converters();
-      }
-#  ifdef BOOST_PYTHON_TRACE_REGISTRY
-      std::cout << "registry: ";
-      for (registry_t::iterator p = static_registry().begin(); p != static_registry().end(); ++p)
-      {
-          std::cout << p->target_type << "; ";
-      }
-      std::cout << '\n';
-#  endif 
-# endif 
-      return static_registry();
-  }
-#endif // BOOST_PYTHON_CONVERTER_REGISTRY_APPLE_MACH_WORKAROUND
-
-  entry* get(type_info type)
-  {
-#  ifdef BOOST_PYTHON_TRACE_REGISTRY
-      registry_t::iterator p = entries().find(entry(type));
-      
-      std::cout << "looking up " << type
-                << (p == entries().end() || p->target_type != type
-                    ? "...NOT found\n" : "...found\n");
-#  endif
-      std::pair<registry_t::const_iterator,bool> pos_ins
-          = entries().insert(entry(type));
-      
-#  if __MWERKS__ >= 0x3000
-      // do a little invariant checking if a change was made
-      if ( pos_ins.second )
-          assert(entries().invariants());
-#  endif
-      return const_cast<entry*>(&*pos_ins.first);
-  }
-} // namespace <unnamed>
-
-namespace registry
-{
-  void insert(to_python_function_t f, type_info source_t)
-  {
-#  ifdef BOOST_PYTHON_TRACE_REGISTRY
-      std::cout << "inserting to_python " << source_t << "\n";
-#  endif 
-      to_python_function_t& slot = get(source_t)->m_to_python;
-      
-      assert(slot == 0); // we have a problem otherwise
-      if (slot != 0)
-      {
-          std::string msg(
-              "to-Python converter for "
-              + lexical_cast<std::string>(source_t)
-              + " already registered; second conversion method ignored."
-          );
-          
-          if ( ::PyErr_Warn( NULL, const_cast<char*>(msg.c_str()) ) )
-          {
-              throw_error_already_set();
-          }
-      }
-      slot = f;
-  }
-
-  // Insert an lvalue from_python converter
-  void insert(convertible_function convert, type_info key)
-  {
-#  ifdef BOOST_PYTHON_TRACE_REGISTRY
-      std::cout << "inserting lvalue from_python " << key << "\n";
-#  endif 
-      entry* found = get(key);
-      lvalue_from_python_chain *registration = new lvalue_from_python_chain;
-      registration->convert = convert;
-      registration->next = found->lvalue_chain;
-      found->lvalue_chain = registration;
-      
-      insert(convert, 0, key);
-  }
-
-  // Insert an rvalue from_python converter
-  void insert(void* (*convertible)(PyObject*)
-              , constructor_function construct
-              , type_info key)
-  {
-#  ifdef BOOST_PYTHON_TRACE_REGISTRY
-      std::cout << "inserting rvalue from_python " << key << "\n";
-#  endif 
-      entry* found = get(key);
-      rvalue_from_python_chain *registration = new rvalue_from_python_chain;
-      registration->convertible = convertible;
-      registration->construct = construct;
-      registration->next = found->rvalue_chain;
-      found->rvalue_chain = registration;
-  }
-
-  // Insert an rvalue from_python converter
-  void push_back(void* (*convertible)(PyObject*)
-              , constructor_function construct
-              , type_info key)
-  {
-#  ifdef BOOST_PYTHON_TRACE_REGISTRY
-      std::cout << "push_back rvalue from_python " << key << "\n";
-#  endif 
-      rvalue_from_python_chain** found = &get(key)->rvalue_chain;
-      while (*found != 0)
-          found = &(*found)->next;
-      
-      rvalue_from_python_chain *registration = new rvalue_from_python_chain;
-      registration->convertible = convertible;
-      registration->construct = construct;
-      registration->next = 0;
-      *found = registration;
-  }
-
-  registration const& lookup(type_info key)
-  {
-      return *get(key);
-  }
-
-  registration const* query(type_info type)
-  {
-      registry_t::iterator p = entries().find(entry(type));
-#  ifdef BOOST_PYTHON_TRACE_REGISTRY
-      std::cout << "querying " << type
-                << (p == entries().end() || p->target_type != type
-                    ? "...NOT found\n" : "...found\n");
-#  endif 
-      return (p == entries().end() || p->target_type != type) ? 0 : &*p;
-  }
-} // namespace registry
-
-}}} // namespace boost::python::converter
diff --git a/src/converter/type_id.cpp b/src/converter/type_id.cpp
deleted file mode 100644
index 528c5129..00000000
--- a/src/converter/type_id.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/type_id.hpp>
-#include <boost/python/detail/decorated_type_id.hpp>
-#include <utility>
-#include <vector>
-#include <algorithm>
-#include <memory>
-#include <cstdlib>
-#include <cstring>
-
-#if !defined(__GNUC__) || __GNUC__ >= 3 || __SGI_STL_PORT
-# include <ostream>
-#else 
-# include <ostream.h>
-#endif 
-
-
-#  ifdef BOOST_PYTHON_HAVE_GCC_CP_DEMANGLE
-#   if defined(__GNUC__) &&  __GNUC__ >= 3
-#    include <cxxabi.h>
-#   endif
-#  endif 
-
-namespace boost { namespace python {
-
-#  ifdef BOOST_PYTHON_HAVE_GCC_CP_DEMANGLE
-#   ifdef __GNUC__
-#    if __GNUC__ < 3
-
-namespace cxxabi = :: ;
-#  else
-namespace cxxabi = ::abi;       // GCC 3.1 and later
-#    endif
-#   endif
-
-namespace
-{
-  struct compare_first_cstring
-  {
-      template <class T>
-      bool operator()(T const& x, T const& y)
-      {
-          return std::strcmp(x.first,y.first) < 0;
-      }
-  };
-  
-  struct free_mem
-  {
-      free_mem(char*p)
-          : p(p) {}
-    
-      ~free_mem()
-      {
-          std::free(p);
-      }
-      char* p;
-  };
-}
-
-namespace detail
-{
-  BOOST_PYTHON_DECL char const* gcc_demangle(char const* mangled)
-  {
-      typedef std::vector<
-          std::pair<char const*, char const*>
-      > mangling_map;
-      
-      static mangling_map demangler;
-      mangling_map::iterator p
-          = std::lower_bound(
-              demangler.begin(), demangler.end()
-            , std::make_pair(mangled, (char const*)0)
-            , compare_first_cstring());
-      
-      if (p == demangler.end() || strcmp(p->first, mangled))
-      {
-          int status;
-          free_mem keeper(
-              cxxabi::__cxa_demangle(mangled, 0, 0, &status)
-              );
-    
-          assert(status != -3); // invalid argument error
-    
-          if (status == -1)
-          {
-              throw std::bad_alloc();
-          }
-          else
-          {
-              char const* demangled
-                = status == -2
-                  // Invalid mangled name.  Best we can do is to
-                  // return it intact.
-                  ? mangled
-                  : keeper.p;
-
-              p = demangler.insert(p, std::make_pair(mangled, demangled));
-              keeper.p = 0;
-          }
-      }
-      
-      return p->second;
-  }
-}
-#  endif
-
-BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream& os, type_info const& x)
-{
-    return os << x.name();
-}
-
-namespace detail
-{
-  BOOST_PYTHON_DECL std::ostream& operator<<(std::ostream& os, detail::decorated_type_info const& x)
-  {
-      os << x.m_base_type;
-      if (x.m_decoration & decorated_type_info::const_)
-          os << " const";
-      if (x.m_decoration & decorated_type_info::volatile_)
-          os << " volatile";
-      if (x.m_decoration & decorated_type_info::reference)
-          os << "&";
-      return os;
-  }
-}
-}} // namespace boost::python::converter
diff --git a/src/dict.cpp b/src/dict.cpp
deleted file mode 100644
index f1b8df84..00000000
--- a/src/dict.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-#include <boost/python/dict.hpp>
-#include <boost/python/extract.hpp>
-
-namespace boost { namespace python { namespace detail {
-namespace
-{
-  // When returning list objects from methods, it may turn out that the
-  // derived class is returning something else, perhaps something not
-  // even derived from list. Since it is generally harmless for a
-  // Boost.Python wrapper object to hold an object of a different
-  // type, and because calling list() with an object may in fact
-  // perform a conversion, the least-bad alternative is to assume that
-  // we have a Python list object and stuff it into the list result.
-  list assume_list(object const& o)
-  {
-      return list(detail::borrowed_reference(o.ptr()));
-  }
-
-  // No PyDict_CheckExact; roll our own.
-  inline bool check_exact(dict_base const* p)
-  {
-      return  p->ptr()->ob_type == &PyDict_Type;
-  }
-}
-
-detail::new_reference dict_base::call(object const& arg_)
-{
-    return (detail::new_reference)PyObject_CallFunction(
-        (PyObject*)&PyDict_Type, "(O)", 
-        arg_.ptr());
-}
-
-dict_base::dict_base()
-    : object(detail::new_reference(PyDict_New()))
-{}
-    
-dict_base::dict_base(object_cref data)
-    : object(call(data))
-{}
-    
-void dict_base::clear()
-{
-    if (check_exact(this))
-        PyDict_Clear(this->ptr());
-    else
-        this->attr("clear")();
-}
-
-dict dict_base::copy()
-{
-    if (check_exact(this))
-    {
-        return dict(detail::new_reference(
-                        PyDict_Copy(this->ptr())));
-    }
-    else
-    {
-        return dict(detail::borrowed_reference(
-                        this->attr("copy")().ptr()
-                        ));
-    }
-}
-
-object dict_base::get(object_cref k) const
-{
-    if (check_exact(this))
-    {
-        PyObject* result = PyDict_GetItem(this->ptr(),k.ptr());
-        return object(detail::borrowed_reference(result ? result : Py_None));
-    }
-    else
-    {
-        return this->attr("get")(k);
-    }
-}
-
-object dict_base::get(object_cref k, object_cref d) const
-{
-    return this->attr("get")(k,d);
-}
-
-bool dict_base::has_key(object_cref k) const
-{
-    return extract<bool>(this->attr("has_key")(k)); 
-}
-
-list dict_base::items() const
-{
-    if (check_exact(this))
-    {
-        return list(detail::new_reference(
-                        PyDict_Items(this->ptr())));
-    }
-    else
-    {
-        return assume_list(this->attr("items")());
-    }
-}
-
-object dict_base::iteritems() const
-{
-    return this->attr("iteritems")();
-}
-
-object dict_base::iterkeys() const
-{
-    return this->attr("iterkeys")();
-}
-
-object dict_base::itervalues() const
-{
-    return this->attr("itervalues")();
-}
-
-list dict_base::keys() const
-{
-    if (check_exact(this))
-    {
-        return list(detail::new_reference(
-                        PyDict_Keys(this->ptr())));
-    }
-    else
-    {
-        return assume_list(this->attr("keys")());
-    }
-}
-
-tuple dict_base::popitem()
-{
-    return tuple(detail::borrowed_reference(
-                     this->attr("popitem")().ptr()
-                     ));
-}
-
-object dict_base::setdefault(object_cref k)
-{
-    return this->attr("setdefault")(k);
-}
-
-object dict_base::setdefault(object_cref k, object_cref d)
-{
-    return this->attr("setdefault")(k,d);
-}
-
-void dict_base::update(object_cref other)
-{
-    if (check_exact(this))
-    {
-        if (PyDict_Update(this->ptr(),other.ptr()) == -1)
-            throw_error_already_set();
-    }
-    else
-    {
-        this->attr("update")(other);
-    }
-}
-
-list dict_base::values() const
-{
-    if (check_exact(this))
-    {
-        return list(detail::new_reference(
-                        PyDict_Values(this->ptr())));
-    }
-    else
-    {
-        return assume_list(this->attr("values")());
-    }
-}
-
-}}}  // namespace boost::python
diff --git a/src/errors.cpp b/src/errors.cpp
deleted file mode 100644
index a2ab071e..00000000
--- a/src/errors.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#ifndef BOOST_PYTHON_SOURCE
-# define BOOST_PYTHON_SOURCE
-#endif
-
-#include <boost/python/errors.hpp>
-#include <boost/cast.hpp>
-#include <boost/python/detail/exception_handler.hpp>
-
-namespace boost { namespace python {
-
-error_already_set::~error_already_set() {}
-
-// IMPORTANT: this function may only be called from within a catch block!
-BOOST_PYTHON_DECL bool handle_exception_impl(function0<void> f)
-{
-    try
-    {
-        if (detail::exception_handler::chain)
-            return detail::exception_handler::chain->handle(f);
-        f();
-        return false;
-    }
-    catch(const boost::python::error_already_set&)
-    {
-        // The python error reporting has already been handled.
-    }
-    catch(const std::bad_alloc&)
-    {
-        PyErr_NoMemory();
-    }
-    catch(const bad_numeric_cast& x)
-    {
-        PyErr_SetString(PyExc_OverflowError, x.what());
-    }
-    catch(const std::out_of_range& x)
-    {
-        PyErr_SetString(PyExc_IndexError, x.what());
-    }
-    catch(const std::exception& x)
-    {
-        PyErr_SetString(PyExc_RuntimeError, x.what());
-    }
-    catch(...)
-    {
-        PyErr_SetString(PyExc_RuntimeError, "unidentifiable C++ exception");
-    }
-    return true;
-}
-
-void BOOST_PYTHON_DECL throw_error_already_set()
-{
-    throw error_already_set();
-}
-
-namespace detail {
-
-bool exception_handler::operator()(function0<void> const& f) const
-{
-    if (m_next)
-    {
-        return m_next->handle(f);
-    }
-    else
-    {
-        f();
-        return false;
-    }
-}
-
-exception_handler::exception_handler(handler_function const& impl)
-    : m_impl(impl)
-    , m_next(0)
-{
-    if (chain != 0)
-        tail->m_next = this;
-    else
-        chain = this;
-    tail = this;
-}
-
-exception_handler* exception_handler::chain;
-exception_handler* exception_handler::tail;
-
-BOOST_PYTHON_DECL void register_exception_handler(handler_function const& f)
-{
-    // the constructor links the new object into a handler chain, so
-    // this object isn't actaully leaked (until, of course, the
-    // interpreter exits).
-    new exception_handler(f);
-}
-
-} // namespace boost::python::detail
-
-}} // namespace boost::python
-
-
diff --git a/src/list.cpp b/src/list.cpp
deleted file mode 100644
index 30ee78a0..00000000
--- a/src/list.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/list.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-
-detail::new_non_null_reference list_base::call(object const& arg_)
-{
-    return (detail::new_non_null_reference)
-        (expect_non_null)(
-            PyObject_CallFunction(
-                (PyObject*)&PyList_Type, "(O)", 
-                arg_.ptr()));
-}
-
-list_base::list_base()
-    : object(detail::new_reference(PyList_New(0)))
-{}
-
-list_base::list_base(object_cref sequence)
-    : object(list_base::call(sequence))
-{}
-
-void list_base::append(object_cref x)
-{
-    if (PyList_CheckExact(this->ptr()))
-    {
-        if (PyList_Append(this->ptr(), x.ptr()) == -1)
-            throw_error_already_set();
-    }
-    else
-    {
-        this->attr("append")(x);
-    }
-}
-
-//long list_base::count(object_cref value) const;
-
-void list_base::extend(object_cref sequence)
-{
-    this->attr("extend")(sequence);
-}
-
-long list_base::index(object_cref value) const
-{
-    object result_obj(this->attr("index")(value));
-    long result = PyInt_AsLong(result_obj.ptr());
-    if (result == -1)
-        throw_error_already_set();
-    return result;
-}
-
-void list_base::insert(int index, object_cref item)
-{
-    if (PyList_CheckExact(this->ptr()))
-    {
-        if (PyList_Insert(this->ptr(), index, item.ptr()) == -1)
-            throw_error_already_set();
-    }
-    else
-    {
-        this->attr("insert")(index, item);
-    }
-}
-
-void list_base::insert(object const& index, object_cref x)
-{
-    long index_ = PyInt_AsLong(index.ptr());
-    if (index_ == -1 && PyErr_Occurred())
-        throw_error_already_set();
-    this->insert(index_, x);
-}
-
-object list_base::pop()
-{
-    return this->attr("pop")();
-}
-
-object list_base::pop(long index)
-{
-    return this->pop(object(index));
-}
-
-object list_base::pop(object const& index)
-{
-    return this->attr("pop")(index);
-}
-
-void list_base::remove(object_cref value)
-{
-    this->attr("remove")(value);
-}
-    
-void list_base::reverse()
-{
-    if (PyList_CheckExact(this->ptr()))
-    {
-        if (PyList_Reverse(this->ptr()) == -1)
-            throw_error_already_set();
-    }
-    else
-    {
-        this->attr("reverse")();
-    }
-}
-
-void list_base::sort()
-{
-    if (PyList_CheckExact(this->ptr()))
-    {
-        if (PyList_Sort(this->ptr()) == -1)
-            throw_error_already_set();
-    }
-    else
-    {
-        this->attr("sort")();
-    }
-}
-
-void list_base::sort(object_cref cmpfunc)
-{
-    this->attr("sort")(cmpfunc);
-}
-
-// For some reason, moving this to the end of the TU suppresses an ICE
-// with vc6.
-long list_base::count(object_cref value) const
-{
-    object result_obj(this->attr("count")(value));
-    long result = PyInt_AsLong(result_obj.ptr());
-    if (result == -1)
-        throw_error_already_set();
-    return result;
-}
-
-}}} // namespace boost::python
diff --git a/src/long.cpp b/src/long.cpp
deleted file mode 100644
index bfc09257..00000000
--- a/src/long.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/long.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-new_non_null_reference long_base::call(object const& arg_)
-{
-    return (detail::new_non_null_reference)PyObject_CallFunction(
-        (PyObject*)&PyLong_Type, "(O)", 
-        arg_.ptr());
-}
-
-new_non_null_reference long_base::call(object const& arg_, object const& base)
-{
-    return (detail::new_non_null_reference)PyObject_CallFunction(
-        (PyObject*)&PyLong_Type, "(OO)", 
-        arg_.ptr(), base.ptr());
-}
-
-long_base::long_base()
-    : object(
-        detail::new_reference(
-            PyObject_CallFunction((PyObject*)&PyLong_Type, "()"))
-        )
-{}
-
-long_base::long_base(object_cref arg)
-    : object(long_base::call(arg))
-{}
-
-long_base::long_base(object_cref arg, object_cref base)
-    : object(long_base::call(arg, base))
-{}
-
-
-}}} // namespace boost::python
diff --git a/src/module.cpp b/src/module.cpp
deleted file mode 100644
index 18a5061a..00000000
--- a/src/module.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//  (C) Copyright David Abrahams 2000. Permission to copy, use, modify, sell and
-//  distribute this software is granted provided this copyright notice appears
-//  in all copies. This software is provided "as is" without express or implied
-//  warranty, and with no claim as to its suitability for any purpose.
-//
-//  The author gratefully acknowleges the support of Dragon Systems, Inc., in
-//  producing this work.
-
-#include <boost/python/scope.hpp>
-#include <boost/python/object/add_to_namespace.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-BOOST_PYTHON_DECL void scope_setattr_doc(char const* name, object const& x, char const* doc)
-{
-    // Use function::add_to_namespace to achieve overloading if
-    // appropriate.
-    scope current;
-    objects::add_to_namespace(current, name, x, doc);
-}
-
-namespace
-{
-  PyMethodDef initial_methods[] = { { 0, 0, 0, 0 } };
-}
-
-BOOST_PYTHON_DECL void init_module(char const* name, void(*init_function)())
-{
-    
-    PyObject* m
-        = Py_InitModule(const_cast<char*>(name), initial_methods);
-
-    if (m != 0)
-    {
-        // Create the current module scope
-        scope current_module(
-            (object(
-                ((borrowed_reference_t*)m)
-                ))
-            );
-        
-        handle_exception(init_function);
-    }
-}
-
-}}} // namespace boost::python::detail
-
-namespace boost { namespace python {
-
-namespace detail
-{
-  BOOST_PYTHON_DECL PyObject* current_scope = 0;
-}
-
-}}
diff --git a/src/numeric.cpp b/src/numeric.cpp
deleted file mode 100644
index 7d275ff0..00000000
--- a/src/numeric.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/numeric.hpp>
-#include <boost/python/handle.hpp>
-#include <boost/python/cast.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/detail/raw_pyobject.hpp>
-#include <boost/python/extract.hpp>
-
-namespace boost { namespace python { namespace numeric {
-
-namespace
-{
-  enum state_t { failed = -1, unknown, succeeded };
-  state_t state = unknown;
-  std::string module_name;
-  std::string type_name;
-
-  handle<> array_module;
-  handle<> array_type;
-  handle<> array_function;
-
-  void throw_load_failure()
-  {
-      PyErr_Format(
-          PyExc_ImportError
-          , "No module named '%s' or its type '%s' did not follow the NumPy protocol"
-          , module_name.c_str(), type_name.c_str());
-      throw_error_already_set();
-      
-  }
-
-  bool load(bool throw_on_error)
-  {
-      if (!state)
-      {
-          if (module_name.size() == 0)
-          {
-              module_name = "numarray";
-              type_name = "NDArray";
-              if (load(false))
-                  return true;
-              module_name = "Numeric";
-              type_name = "ArrayType";
-          }
-
-          state = failed;
-          PyObject* module = ::PyImport_Import(object(module_name).ptr());
-          if (module)
-          {
-              PyObject* type = ::PyObject_GetAttrString(module, const_cast<char*>(type_name.c_str()));
-
-              if (type && PyType_Check(type))
-              {
-                  array_type = handle<>(type);
-                  PyObject* function = ::PyObject_GetAttrString(module, const_cast<char*>("array"));
-                  
-                  if (function && PyCallable_Check(function))
-                  {
-                      array_function = handle<>(function);
-                      state = succeeded;
-                  }
-              }
-          }
-      }
-      
-      if (state == succeeded)
-          return true;
-      
-      if (throw_on_error)
-          throw_load_failure();
-      
-      PyErr_Clear();
-      return false;
-  }
-
-  object demand_array_function()
-  {
-      load(true);
-      return object(array_function);
-  }
-}
-
-void array::set_module_and_type(char const* package_name, char const* type_attribute_name)
-{
-    state = unknown;
-    module_name = package_name ? package_name : "" ;
-    type_name = type_attribute_name ? type_attribute_name : "" ;
-}
-  
-
-namespace aux
-{
-  bool array_object_manager_traits::check(PyObject* obj)
-  {
-      if (!load(false))
-          return false;
-      return ::PyObject_IsInstance(obj, array_type.get());
-  }
-
-  python::detail::new_non_null_reference
-  array_object_manager_traits::adopt(PyObject* obj)
-  {
-      load(true);
-      return detail::new_non_null_reference(
-          pytype_check(downcast<PyTypeObject>(array_type.get()), obj));
-  }
-
-
-# define BOOST_PYTHON_AS_OBJECT(z, n, _) object(x##n)
-# define BOOST_PP_LOCAL_MACRO(n)                                        \
-    array_base::array_base(BOOST_PP_ENUM_PARAMS(n, object const& x))    \
-        : object(demand_array_function()(BOOST_PP_ENUM_PARAMS(n, x)))   \
-    {}
-# define BOOST_PP_LOCAL_LIMITS (1, 6)
-# include BOOST_PP_LOCAL_ITERATE()
-# undef BOOST_PYTHON_AS_OBJECT
-
-    array_base::array_base(BOOST_PP_ENUM_PARAMS(7, object const& x))
-        : object(demand_array_function()(BOOST_PP_ENUM_PARAMS(7, x)))
-    {}
-
-  object array_base::argmax(long axis)
-  {
-      return attr("argmax")(axis);
-  }
-  
-  object array_base::argmin(long axis)
-  {
-      return attr("argmin")(axis);
-  }
-  
-  object array_base::argsort(long axis)
-  {
-      return attr("argsort")(axis);
-  }
-  
-  object array_base::astype(object const& type)
-  {
-      return attr("astype")(type);
-  }
-  
-  void array_base::byteswap()
-  {
-      attr("byteswap")();
-  }
-  
-  object array_base::copy() const
-  {
-      return attr("copy")();
-  }
-  
-  object array_base::diagonal(long offset, long axis1, long axis2) const
-  {
-      return attr("diagonal")(offset, axis1, axis2);
-  }
-  
-  void array_base::info() const
-  {
-      attr("info")();
-  }
-  
-  bool array_base::is_c_array() const
-  {
-      return extract<bool>(attr("is_c_array")());
-  }
-  
-  bool array_base::isbyteswapped() const
-  {
-      return extract<bool>(attr("isbyteswapped")());
-  }
-  
-  object array_base::new_(object type) const
-  {
-      return attr("new")(type);
-  }
-  
-  void array_base::sort()
-  {
-      attr("sort")();
-  }
-  
-  object array_base::trace(long offset, long axis1, long axis2) const
-  {
-      return attr("trace")(offset, axis1, axis2);
-  }
-  
-  object array_base::type() const
-  {
-      return attr("type")();
-  }
-  
-  char array_base::typecode() const
-  {
-      return extract<char>(attr("typecode")());
-  }
-  
-  object array_base::factory(object const& buffer
-        , object const& type
-        , object const& shape
-        , bool copy
-        , bool savespace
-        , object typecode)
-  {
-      return attr("array")(buffer, type, shape, copy, savespace, typecode);
-  }
-
-  object array_base::getflat() const
-  {
-      return attr("getflat")();
-  }
-      
-  long array_base::getrank() const
-  {
-      return extract<long>(attr("getrank")());
-  }
-  
-  object array_base::getshape() const
-  {
-      return attr("getshape")();
-  }
-  
-  bool array_base::isaligned() const
-  {
-      return extract<bool>(attr("isaligned"));
-  }
-  
-  bool array_base::iscontiguous() const
-  {      
-      return extract<bool>(attr("isaligned"));
-  }
-  
-  long array_base::itemsize() const
-  {
-      return extract<long>(attr("itemsize"));
-  }
-  
-  long array_base::nelements() const
-  {
-      return extract<long>(attr("nelements"));
-  }
-  
-  object array_base::nonzero() const
-  {
-      return attr("nonzero")();
-  }
-   
-  void array_base::put(object const& indices, object const& values)
-  {
-      attr("put")(indices, values);
-  }
-   
-  void array_base::ravel()
-  {
-      attr("ravel")();
-  }
-   
-  object array_base::repeat(object const& repeats, long axis)
-  {
-      return attr("repeat")(repeats, axis);
-  }
-   
-  void array_base::resize(object const& shape)
-  {
-      attr("resize")(shape);
-  }
-      
-  void array_base::setflat(object const& flat)
-  {
-      attr("setflat")(flat);
-  }
-  
-  void array_base::setshape(object const& shape)
-  {
-      attr("setshape")(shape);
-  }
-   
-  void array_base::swapaxes(long axis1, long axis2)
-  {
-      attr("swapaxes")(axis1, axis2);
-  }
-   
-  object array_base::take(object const& sequence, long axis) const
-  {
-      return attr("take")(sequence, axis);
-  }
-   
-  void array_base::tofile(object const& file) const
-  {
-      attr("tofile")(file);
-  }
-   
-  str array_base::tostring() const
-  {
-      return str(attr("tostring")());
-  }
-   
-  void array_base::transpose(object const& axes)
-  {
-      attr("transpose")(axes);
-  }
-   
-  object array_base::view() const
-  {
-      return attr("view")();
-  }
-}
-
-}}} // namespace boost::python::numeric
diff --git a/src/object/class.cpp b/src/object/class.cpp
deleted file mode 100644
index 0bc59c12..00000000
--- a/src/object/class.cpp
+++ /dev/null
@@ -1,686 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/detail/prefix.hpp>
-#include <boost/mpl/lambda.hpp> // #including this first is an intel6 workaround
-
-#include <boost/python/object/class.hpp>
-#include <boost/python/object/instance.hpp>
-#include <boost/python/object/class_detail.hpp>
-#include <boost/python/scope.hpp>
-#include <boost/python/converter/registry.hpp>
-#include <boost/python/object/find_instance.hpp>
-#include <boost/python/object/pickle_support.hpp>
-#include <boost/python/detail/map_entry.hpp>
-#include <boost/python/object.hpp>
-#include <boost/python/object_protocol.hpp>
-#include <boost/detail/binary_search.hpp>
-#include <boost/python/self.hpp>
-#include <boost/python/dict.hpp>
-#include <boost/python/str.hpp>
-#include <functional>
-#include <vector>
-#include <cstddef>
-#include <new>
-#include <structmember.h>
-
-namespace boost { namespace python {
-
-# ifdef BOOST_PYTHON_SELF_IS_CLASS
-namespace self_ns
-{
-  self_t self;
-}
-# endif 
-
-instance_holder::instance_holder()
-    : m_next(0)
-{
-}
-
-instance_holder::~instance_holder()
-{
-}
-
-extern "C"
-{
-  // This is copied from typeobject.c in the Python sources. Even though
-  // class_metatype_object doesn't set Py_TPFLAGS_HAVE_GC, that bit gets
-  // filled in by the base class initialization process in
-  // PyType_Ready(). However, tp_is_gc is *not* copied from the base
-  // type, making it assume that classes are GC-able even if (like
-  // class_type_object) they're statically allocated.
-  static int
-  type_is_gc(PyTypeObject *python_type)
-  {
-      return python_type->tp_flags & Py_TPFLAGS_HEAPTYPE;
-  }
-
-  // This is also copied from the Python sources.  We can't implement
-  // static_data as a subclass property effectively without it.
-  typedef struct {
-      PyObject_HEAD
-      PyObject *prop_get;
-      PyObject *prop_set;
-      PyObject *prop_del;
-      PyObject *prop_doc;
-  } propertyobject;
-
-  static PyObject *
-  static_data_descr_get(PyObject *self, PyObject *obj, PyObject * /*type*/)
-  {
-      propertyobject *gs = (propertyobject *)self;
-
-      return PyObject_CallFunction(gs->prop_get, "()");
-  }
-
-  static int
-  static_data_descr_set(PyObject *self, PyObject *obj, PyObject *value)
-  {
-      propertyobject *gs = (propertyobject *)self;
-      PyObject *func, *res;
-
-      if (value == NULL)
-          func = gs->prop_del;
-      else
-          func = gs->prop_set;
-      if (func == NULL) {
-          PyErr_SetString(PyExc_AttributeError,
-                          value == NULL ?
-                          "can't delete attribute" :
-                          "can't set attribute");
-          return -1;
-      }
-      if (value == NULL)
-          res = PyObject_CallFunction(func, "()");
-      else
-          res = PyObject_CallFunction(func, "(O)", value);
-      if (res == NULL)
-          return -1;
-      Py_DECREF(res);
-      return 0;
-  }
-}
-
-static PyTypeObject static_data_object = {
-    PyObject_HEAD_INIT(0)//&PyType_Type)
-    0,
-    "Boost.Python.StaticProperty",
-    PyType_Type.tp_basicsize,
-    0,
-    0,                                      /* tp_dealloc */
-    0,                                      /* tp_print */
-    0,                                      /* tp_getattr */
-    0,                                      /* tp_setattr */
-    0,                                      /* tp_compare */
-    0,                                      /* tp_repr */
-    0,                                      /* tp_as_number */
-    0,                                      /* tp_as_sequence */
-    0,                                      /* tp_as_mapping */
-    0,                                      /* tp_hash */
-    0,                                      /* tp_call */
-    0,                                      /* tp_str */
-    0,                                      /* tp_getattro */
-    0,                                      /* tp_setattro */
-    0,                                      /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT // | Py_TPFLAGS_HAVE_GC
-    | Py_TPFLAGS_BASETYPE,          /* tp_flags */
-    0,                                      /* tp_doc */
-    0,                                      /* tp_traverse */
-    0,                                      /* tp_clear */
-    0,                                      /* tp_richcompare */
-    0,                                      /* tp_weaklistoffset */
-    0,                                      /* tp_iter */
-    0,                                      /* tp_iternext */
-    0,                                      /* tp_methods */
-    0,                                      /* tp_members */
-    0,                                      /* tp_getset */
-    0, //&PyProperty_Type,                           /* tp_base */
-    0,                                      /* tp_dict */
-    static_data_descr_get,                                      /* tp_descr_get */
-    static_data_descr_set,                                      /* tp_descr_set */
-    0,                                      /* tp_dictoffset */
-    0,                                      /* tp_init */
-    0,                                      /* tp_alloc */
-    0, // filled in with type_new           /* tp_new */
-    0, // filled in with __PyObject_GC_Del  /* tp_free */
-    (inquiry)type_is_gc,                    /* tp_is_gc */
-};
-
-namespace objects
-{
-  extern "C"
-  {
-      // This declaration needed due to broken Python 2.2 headers
-      extern DL_IMPORT(PyTypeObject) PyProperty_Type;
-  }
-
-  BOOST_PYTHON_DECL PyObject* static_data()
-  {
-      if (static_data_object.tp_dict == 0)
-      {
-          static_data_object.ob_type = &PyType_Type;
-          static_data_object.tp_base = &PyProperty_Type;
-          if (PyType_Ready(&static_data_object))
-              return 0;
-      }
-      return upcast<PyObject>(&static_data_object);
-  }
-}  
-
-extern "C"
-{
-    // Ordinarily, descriptors have a certain assymetry: you can use
-    // them to read attributes off the class object they adorn, but
-    // writing the same attribute on the class object always replaces
-    // the descriptor in the class __dict__.  In order to properly
-    // represent C++ static data members, we need to allow them to be
-    // written through the class instance.  This function of the
-    // metaclass makes it possible.
-    static int
-    class_setattro(PyObject *obj, PyObject *name, PyObject* value)
-    {
-        // Must use "private" Python implementation detail
-        // _PyType_Lookup instead of PyObject_GetAttr because the
-        // latter will always end up calling the descr_get function on
-        // any descriptor it finds; we need the unadulterated
-        // descriptor here.
-        PyObject* a = _PyType_Lookup(downcast<PyTypeObject>(obj), name);
-
-        // a is a borrowed reference or 0
-        
-        // If we found a static data descriptor, call it directly to
-        // force it to set the static data member
-        if (a != 0 && PyObject_IsInstance(a, objects::static_data()))
-            return a->ob_type->tp_descr_set(a, obj, value);
-        else
-            return PyType_Type.tp_setattro(obj, name, value);
-    }
-}
-
-static PyTypeObject class_metatype_object = {
-    PyObject_HEAD_INIT(0)//&PyType_Type)
-    0,
-    "Boost.Python.class",
-    PyType_Type.tp_basicsize,
-    0,
-    0,                                      /* tp_dealloc */
-    0,                                      /* tp_print */
-    0,                                      /* tp_getattr */
-    0,                                      /* tp_setattr */
-    0,                                      /* tp_compare */
-    0,                                      /* tp_repr */
-    0,                                      /* tp_as_number */
-    0,                                      /* tp_as_sequence */
-    0,                                      /* tp_as_mapping */
-    0,                                      /* tp_hash */
-    0,                                      /* tp_call */
-    0,                                      /* tp_str */
-    0,                                      /* tp_getattro */
-    class_setattro,                         /* tp_setattro */
-    0,                                      /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT // | Py_TPFLAGS_HAVE_GC
-    | Py_TPFLAGS_BASETYPE,          /* tp_flags */
-    0,                                      /* tp_doc */
-    0,                                      /* tp_traverse */
-    0,                                      /* tp_clear */
-    0,                                      /* tp_richcompare */
-    0,                                      /* tp_weaklistoffset */
-    0,                                      /* tp_iter */
-    0,                                      /* tp_iternext */
-    0,                                      /* tp_methods */
-    0,                                      /* tp_members */
-    0,                                      /* tp_getset */
-    0, //&PyType_Type,                           /* tp_base */
-    0,                                      /* tp_dict */
-    0,                                      /* tp_descr_get */
-    0,                                      /* tp_descr_set */
-    0,                                      /* tp_dictoffset */
-    0,                                      /* tp_init */
-    0,                                      /* tp_alloc */
-    0, // filled in with type_new           /* tp_new */
-    0, // filled in with __PyObject_GC_Del  /* tp_free */
-    (inquiry)type_is_gc,                    /* tp_is_gc */
-};
-
-// Install the instance data for a C++ object into a Python instance
-// object.
-void instance_holder::install(PyObject* self) throw()
-{
-    assert(self->ob_type->ob_type == &class_metatype_object);
-    m_next = ((objects::instance<>*)self)->objects;
-    ((objects::instance<>*)self)->objects = this;
-}
-
-
-namespace objects
-{
-// Get the metatype object for all extension classes.
-  BOOST_PYTHON_DECL type_handle class_metatype()
-  {
-      if (class_metatype_object.tp_dict == 0)
-      {
-          class_metatype_object.ob_type = &PyType_Type;
-          class_metatype_object.tp_base = &PyType_Type;
-          if (PyType_Ready(&class_metatype_object))
-              return type_handle();
-      }
-      return type_handle(borrowed(&class_metatype_object));
-  }
-  extern "C"
-  {
-      static void instance_dealloc(PyObject* inst)
-      {
-          instance<>* kill_me = (instance<>*)inst;
-
-          for (instance_holder* p = kill_me->objects, *next; p != 0; p = next)
-          {
-              next = p->next();
-              p->~instance_holder();
-              instance_holder::deallocate(inst, dynamic_cast<void*>(p));
-          }
-        
-          // Python 2.2.1 won't add weak references automatically when
-          // tp_itemsize > 0, so we need to manage that
-          // ourselves. Accordingly, we also have to clean up the
-          // weakrefs ourselves.
-          if (kill_me->weakrefs != NULL)
-            PyObject_ClearWeakRefs(inst);
-
-          Py_XDECREF(kill_me->dict);
-          
-          inst->ob_type->tp_free(inst);
-      }
-
-      static PyObject *
-      instance_new(PyTypeObject* type_, PyObject* args, PyObject *kw)
-      {
-          // Attempt to find the __instance_size__ attribute. If not present, no problem.
-          PyObject* d = type_->tp_dict;
-          PyObject* instance_size_obj = PyObject_GetAttrString(d, "__instance_size__");
-
-          long instance_size = 0;
-          if (instance_size != 0)
-              instance_size = PyInt_AsLong(instance_size_obj);
-          
-          if (instance_size < 0)
-              instance_size = 0;
-          PyErr_Clear(); // Clear any errors that may have occurred.
-
-          instance<>* result = (instance<>*)type_->tp_alloc(type_, instance_size);
-          if (result)
-          {
-              // Guido says we can use ob_size for any purpose we
-              // like, so we'll store the total size of the object
-              // there. A negative number indicates that the extra
-              // instance memory is not yet allocated to any holders.
-              result->ob_size = -(offsetof(instance<>,storage) + instance_size);
-          }
-          return (PyObject*)result;
-      }
-
-      static PyObject* instance_get_dict(PyObject* op, void*)
-      {
-          instance<>* inst = downcast<instance<> >(op);
-          if (inst->dict == 0)
-              inst->dict = PyDict_New();
-          return python::xincref(inst->dict);
-      }
-    
-      static int instance_set_dict(PyObject* op, PyObject* dict, void*)
-      {
-          instance<>* inst = downcast<instance<> >(op);
-          python::xdecref(inst->dict);
-          inst->dict = python::incref(dict);
-          return 0;
-      }
-
-  }
-
-
-  static PyGetSetDef instance_getsets[] = {
-      {"__dict__",  instance_get_dict,  instance_set_dict, NULL},
-      {0}
-  };
-
-  
-  static PyMemberDef instance_members[] = {
-      {"__weakref__", T_OBJECT, offsetof(instance<>, weakrefs), 0},
-      {0}
-  };
-
-  static PyTypeObject class_type_object = {
-      PyObject_HEAD_INIT(0) //&class_metatype_object)
-      0,
-      "Boost.Python.instance",
-      offsetof(instance<>,storage),           /* tp_basicsize */
-      1,                                      /* tp_itemsize */
-      instance_dealloc,                       /* tp_dealloc */
-      0,                                      /* tp_print */
-      0,                                      /* tp_getattr */
-      0,                                      /* tp_setattr */
-      0,                                      /* tp_compare */
-      0,                                      /* tp_repr */
-      0,                                      /* tp_as_number */
-      0,                                      /* tp_as_sequence */
-      0,                                      /* tp_as_mapping */
-      0,                                      /* tp_hash */
-      0,                                      /* tp_call */
-      0,                                      /* tp_str */
-      0,                                      /* tp_getattro */
-      0,                                      /* tp_setattro */
-      0,                                      /* tp_as_buffer */
-      Py_TPFLAGS_DEFAULT // | Py_TPFLAGS_HAVE_GC
-      | Py_TPFLAGS_BASETYPE,          /* tp_flags */
-      0,                                      /* tp_doc */
-      0,                                      /* tp_traverse */
-      0,                                      /* tp_clear */
-      0,                                      /* tp_richcompare */
-      offsetof(instance<>,weakrefs),          /* tp_weaklistoffset */
-      0,                                      /* tp_iter */
-      0,                                      /* tp_iternext */
-      0,                                      /* tp_methods */
-      instance_members,                       /* tp_members */
-      instance_getsets,                       /* tp_getset */
-      0, //&PyBaseObject_Type,                /* tp_base */
-      0,                                      /* tp_dict */
-      0,                                      /* tp_descr_get */
-      0,                                      /* tp_descr_set */
-      offsetof(instance<>,dict),              /* tp_dictoffset */
-      0,                                      /* tp_init */
-      PyType_GenericAlloc,                    /* tp_alloc */
-      instance_new                            /* tp_new */
-  };
-
-  BOOST_PYTHON_DECL type_handle class_type()
-  {
-      if (class_type_object.tp_dict == 0)
-      {
-          class_type_object.ob_type = incref(class_metatype().get());
-          class_type_object.tp_base = &PyBaseObject_Type;
-          if (PyType_Ready(&class_type_object))
-              return type_handle();
-//          class_type_object.tp_setattro = class_setattro;
-      }
-      return type_handle(borrowed(&class_type_object));
-  }
-
-  BOOST_PYTHON_DECL void*
-  find_instance_impl(PyObject* inst, type_info type)
-  {
-      if (inst->ob_type->ob_type != &class_metatype_object)
-          return 0;
-    
-      instance<>* self = reinterpret_cast<instance<>*>(inst);
-
-      for (instance_holder* match = self->objects; match != 0; match = match->next())
-      {
-          void* const found = match->holds(type);
-          if (found)
-              return found;
-      }
-      return 0;
-  }
-
-  object module_prefix()
-  {
-      return object(
-          PyObject_IsInstance(scope().ptr(), upcast<PyObject>(&PyModule_Type))
-          ? object(scope().attr("__name__"))
-          : api::getattr(scope(), "__module__", str())
-          );
-  }
-
-  namespace
-  {
-    // Find a registered class object corresponding to id. Return a
-    // null handle if no such class is registered.
-    inline type_handle query_class(type_info id)
-    {
-        converter::registration const* p = converter::registry::query(id);
-        return type_handle(
-            python::borrowed(
-                python::allow_null(p ? p->m_class_object : 0))
-            );
-    }
-
-    // Find a registered class corresponding to id. If not found,
-    // throw an appropriate exception.
-    type_handle get_class(type_info id)
-    {
-        type_handle result(query_class(id));
-
-        if (result.get() == 0)
-        {
-            object report("extension class wrapper for base class ");
-            report = report + id.name() + " has not been created yet";
-            PyErr_SetObject(PyExc_RuntimeError, report.ptr());
-            throw_error_already_set();
-        }
-        return result;
-    }
-
-    // class_base constructor
-    //
-    // name -      the name of the new Python class
-    //
-    // num_types - one more than the number of declared bases
-    //
-    // types -     array of python::type_info, the first item
-    //             corresponding to the class being created, and the
-    //             rest corresponding to its declared bases.
-    //
-    inline object
-    new_class(char const* name, std::size_t num_types, type_info const* const types, char const* doc)
-    {
-      assert(num_types >= 1);
-      
-      // Build a tuple of the base Python type objects. If no bases
-      // were declared, we'll use our class_type() as the single base
-      // class.
-      std::size_t const num_bases = std::max(num_types - 1, static_cast<std::size_t>(1));
-      handle<> bases(PyTuple_New(num_bases));
-
-      for (std::size_t i = 1; i <= num_bases; ++i)
-      {
-          type_handle c = (i >= num_types) ? class_type() : get_class(types[i]);
-          // PyTuple_SET_ITEM steals this reference
-          PyTuple_SET_ITEM(bases.get(), i - 1, upcast<PyObject>(c.release()));
-      }
-
-      // Call the class metatype to create a new class
-      dict d;
-   
-      object m = module_prefix();
-      if (m) d["__module__"] = m;
-
-      if (doc != 0)
-          d["__doc__"] = doc;
-      
-      object result = object(class_metatype())(name, bases, d);
-      assert(PyType_IsSubtype(result.ptr()->ob_type, &PyType_Type));
-      
-      if (scope().ptr() != Py_None)
-          scope().attr(name) = result;
-
-      return result;
-    }
-  }
-  
-  class_base::class_base(
-      char const* name, std::size_t num_types, type_info const* const types, char const* doc)
-      : object(new_class(name, num_types, types, doc))
-  {
-      // Insert the new class object in the registry
-      converter::registration& converters = const_cast<converter::registration&>(
-          converter::registry::lookup(types[0]));
-
-      // Class object is leaked, for now
-      converters.m_class_object = (PyTypeObject*)incref(this->ptr());
-  }
-
-  BOOST_PYTHON_DECL void copy_class_object(type_info const& src, type_info const& dst)
-  {
-      converter::registration& dst_converters
-          = const_cast<converter::registration&>(converter::registry::lookup(dst));
-      
-      converter::registration const& src_converters = converter::registry::lookup(src);
-
-      dst_converters.m_class_object = src_converters.m_class_object;
-  }
-  
-  void class_base::set_instance_size(std::size_t instance_size)
-  {
-      this->attr("__instance_size__") = instance_size;
-  }
-  
-  void class_base::add_property(char const* name, object const& fget)
-  {
-      object property(
-          (python::detail::new_reference)
-              PyObject_CallFunction((PyObject*)&PyProperty_Type, "O", fget.ptr()));
-      
-      this->setattr(name, property);
-  }
-
-  void class_base::add_property(char const* name, object const& fget, object const& fset)
-  {
-      object property(
-          (python::detail::new_reference)
-              PyObject_CallFunction((PyObject*)&PyProperty_Type, "OO", fget.ptr(), fset.ptr()));
-      
-      this->setattr(name, property);
-  }
-
-  void class_base::add_static_property(char const* name, object const& fget)
-  {
-      object property(
-          (python::detail::new_reference)
-          PyObject_CallFunction(static_data(), "O", fget.ptr()));
-      
-      this->setattr(name, property);
-  }
-
-  void class_base::add_static_property(char const* name, object const& fget, object const& fset)
-  {
-      object property(
-          (python::detail::new_reference)
-          PyObject_CallFunction(static_data(), "OO", fget.ptr(), fset.ptr()));
-      
-      this->setattr(name, property);
-  }
-
-  void class_base::setattr(char const* name, object const& x)
-  {
-      if (PyObject_SetAttrString(this->ptr(), const_cast<char*>(name), x.ptr()) < 0)
-          throw_error_already_set();
-  }
-
-  namespace
-  {
-    extern "C" PyObject* no_init(PyObject*, PyObject*)
-    {
-        ::PyErr_SetString(::PyExc_RuntimeError, "This class cannot be instantiated from Python");
-        return NULL;
-    }
-    static ::PyMethodDef no_init_def = {
-        "__init__", no_init, METH_VARARGS,
-        "Raises an exception\n"
-        "This class cannot be instantiated from Python\n"
-    };
-  }
-  
-  void class_base::def_no_init()
-  {
-      handle<> f(::PyCFunction_New(&no_init_def, 0));
-      this->setattr("__init__", object(f));
-  }
-
-  void class_base::enable_pickling(bool getstate_manages_dict)
-  {
-      setattr("__reduce__", object(make_instance_reduce_function()));
-      setattr("__safe_for_unpickling__", object(true));
-      
-      if (getstate_manages_dict)
-      {
-          setattr("__getstate_manages_dict__", object(true));
-      }
-  }
-
-  namespace
-  {
-    PyObject* callable_check(PyObject* callable)
-    {
-        if (PyCallable_Check(expect_non_null(callable)))
-            return callable;
-
-        ::PyErr_Format(
-            PyExc_TypeError
-            , "staticmethod expects callable object; got an object of type %s, which is not callable"
-            , callable->ob_type->tp_name
-            );
-        
-        throw_error_already_set();
-        return 0;
-    }
-  }
-  
-  void class_base::make_method_static(const char * method_name)
-  {
-      PyTypeObject* self = downcast<PyTypeObject>(this->ptr());
-      dict d((handle<>(borrowed(self->tp_dict))));
-
-      object method(d[method_name]);
-
-      this->attr(method_name) = object(
-          handle<>(
-              PyStaticMethod_New((callable_check)(method.ptr()) )
-              ));
-  }
-
-  BOOST_PYTHON_DECL type_handle registered_class_object(type_info id)
-  {
-      return query_class(id);
-  }
-} // namespace objects
-
-
-void* instance_holder::allocate(PyObject* self_, std::size_t holder_offset, std::size_t holder_size)
-{
-    assert(self_->ob_type->ob_type == &class_metatype_object);
-    objects::instance<>* self = (objects::instance<>*)self_;
-    
-    int total_size_needed = holder_offset + holder_size;
-    
-    if (-self->ob_size >= total_size_needed)
-    {
-        // holder_offset should at least point into the variable-sized part
-        assert(holder_offset >= offsetof(objects::instance<>,storage));
-
-        // Record the fact that the storage is occupied, noting where it starts
-        self->ob_size = holder_offset;
-        return (char*)self + holder_offset;
-    }
-    else
-    {
-        void* const result = PyMem_Malloc(holder_size);
-        if (result == 0)
-            throw std::bad_alloc();
-        return result;
-    }
-}
-
-void instance_holder::deallocate(PyObject* self_, void* storage) throw()
-{
-    assert(self_->ob_type->ob_type == &class_metatype_object);
-    objects::instance<>* self = (objects::instance<>*)self_;
-    if (storage != (char*)self + self->ob_size)
-    {
-        PyMem_Free(storage);
-    }
-}
-
-}} // namespace boost::python
diff --git a/src/object/enum.cpp b/src/object/enum.cpp
deleted file mode 100644
index c297abb7..00000000
--- a/src/object/enum.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/object/enum_base.hpp>
-#include <boost/python/cast.hpp>
-#include <boost/python/scope.hpp>
-#include <boost/python/object.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/dict.hpp>
-#include <boost/python/str.hpp>
-#include <boost/python/extract.hpp>
-#include <boost/python/object_protocol.hpp>
-#include <boost/python/detail/api_placeholder.hpp>
-#include <structmember.h>
-#include <cstdio>
-
-namespace boost { namespace python { namespace objects { 
-
-struct enum_object
-{
-    PyIntObject base_object;
-    PyObject* name;
-};
-
-static PyMemberDef enum_members[] = {
-    {"name", T_OBJECT_EX, offsetof(enum_object,name),READONLY},
-    {0}
-};
-
-
-extern "C"
-{
-    static int
-    enum_print(PyObject *v, BOOST_CSTD_::FILE *fp, int flags)
-    {
-        PyObject* s
-            = (flags & Py_PRINT_RAW) ? v->ob_type->tp_str(v) : v->ob_type->tp_repr(v);
-        if (s == 0)
-            return -1;
-        
-        char const* text = PyString_AsString(s);
-        if (text == 0)
-            return -1;
-        
-        BOOST_CSTD_::fprintf(fp, text);
-        return 0;
-    }
-    
-     /* flags -- not used but required by interface */
-    static PyObject* enum_repr(PyObject* self_)
-    {
-        enum_object* self = downcast<enum_object>(self_);
-        if (!self->name)
-        {
-            return PyString_FromFormat("%s(%ld)", self_->ob_type->tp_name, PyInt_AS_LONG(self_));
-        }
-        else
-        {
-            char* name = PyString_AsString(self->name);
-            if (name == 0)
-                return 0;
-            
-            return PyString_FromFormat("%s.%s", self_->ob_type->tp_name, name);
-        }
-    }
-
-    static PyObject* enum_str(PyObject* self_)
-    {
-        enum_object* self = downcast<enum_object>(self_);
-        if (!self->name)
-        {
-            return PyInt_Type.tp_str(self_);
-        }
-        else
-        {
-            return incref(self->name);
-        }
-    }
-}
-
-static PyTypeObject enum_type_object = {
-    PyObject_HEAD_INIT(0) // &PyType_Type
-    0,
-    "Boost.Python.enum",
-    sizeof(enum_object),                    /* tp_basicsize */
-    0,                                      /* tp_itemsize */
-    0,                                      /* tp_dealloc */
-    enum_print,                             /* tp_print */
-    0,                                      /* tp_getattr */
-    0,                                      /* tp_setattr */
-    0,                                      /* tp_compare */
-    enum_repr,                              /* tp_repr */
-    0,                                      /* tp_as_number */
-    0,                                      /* tp_as_sequence */
-    0,                                      /* tp_as_mapping */
-    0,                                      /* tp_hash */
-    0,                                      /* tp_call */
-    enum_str,                               /* tp_str */
-    0,                                      /* tp_getattro */
-    0,                                      /* tp_setattro */
-    0,                                      /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT
-    | Py_TPFLAGS_CHECKTYPES
-    | Py_TPFLAGS_HAVE_GC
-    | Py_TPFLAGS_BASETYPE,                  /* tp_flags */
-    0,                                      /* tp_doc */
-    0,                                      /* tp_traverse */
-    0,                                      /* tp_clear */
-    0,                                      /* tp_richcompare */
-    0,                                      /* tp_weaklistoffset */
-    0,                                      /* tp_iter */
-    0,                                      /* tp_iternext */
-    0,                                      /* tp_methods */
-    enum_members,                           /* tp_members */
-    0,                                      /* tp_getset */
-    0, //&PyInt_Type,                       /* tp_base */
-    0,                                      /* tp_dict */
-    0,                                      /* tp_descr_get */
-    0,                                      /* tp_descr_set */
-    0,                                      /* tp_dictoffset */
-    0,                                      /* tp_init */
-    0,                                      /* tp_alloc */
-    0                                       /* tp_new */
-};
-
-object module_prefix();
-
-namespace
-{
-  object new_enum_type(char const* name)
-  {
-      if (enum_type_object.tp_dict == 0)
-      {
-          enum_type_object.ob_type = incref(&PyType_Type);
-          enum_type_object.tp_base = &PyInt_Type;
-          if (PyType_Ready(&enum_type_object))
-              throw_error_already_set();
-      }
-
-      type_handle metatype(borrowed(&PyType_Type));
-      type_handle base(borrowed(&enum_type_object));
-
-      // suppress the instance __dict__ in these enum objects. There
-      // may be a slicker way, but this'll do for now.
-      dict d;
-      d["__slots__"] = tuple();
-      d["values"] = dict();
-
-      object module_name = module_prefix();
-      if (module_name)
-          module_name += '.';
-      
-      object result = (object(metatype))(
-          module_name + name, make_tuple(base), d);
-      
-      scope().attr(name) = result;
-
-      return result;
-  }
-}
-
-enum_base::enum_base(
-    char const* name
-    , converter::to_python_function_t to_python
-    , converter::convertible_function convertible
-    , converter::constructor_function construct
-    , type_info id
-    )
-    : object(new_enum_type(name))
-{
-    converter::registration& converters
-        = const_cast<converter::registration&>(
-            converter::registry::lookup(id));
-            
-    converters.m_class_object = downcast<PyTypeObject>(this->ptr());
-    converter::registry::insert(to_python, id);
-    converter::registry::insert(convertible, construct, id);
-}
-
-void enum_base::add_value(char const* name_, long value)
-{
-    // Convert name to Python string
-    object name(name_);
-
-    // Create a new enum instance by calling the class with a value
-    object x = (*this)(value);
-
-    // Store the object in the enum class
-    (*this).attr(name_) = x;
-
-    dict d = extract<dict>(this->attr("values"))();
-    d[value] = x;
-    
-    // Set the name field in the new enum instanec
-    enum_object* p = downcast<enum_object>(x.ptr());
-    Py_XDECREF(p->name);
-    p->name = incref(name.ptr());
-}
-
-void enum_base::export_values()
-{
-    dict d = extract<dict>(this->attr("values"))();
-    list values = d.values();
-    scope current;
-    
-    for (unsigned i = 0, max = len(values); i < max; ++i)
-    {
-        api::setattr(current, object(values[i].attr("name")), values[i]);
-    }
- }
-
-PyObject* enum_base::to_python(PyTypeObject* type_, long x)
-{
-    object type((type_handle(borrowed(type_))));
-
-    dict d = extract<dict>(type.attr("values"))();
-    object v = d.get(x, object());
-    return incref(
-        (v == object() ? type(x) : v).ptr());
-}
-
-}}} // namespace boost::python::object
diff --git a/src/object/function.cpp b/src/object/function.cpp
deleted file mode 100644
index 3f6cdcf6..00000000
--- a/src/object/function.cpp
+++ /dev/null
@@ -1,649 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/object/function.hpp>
-#include <boost/python/object/function_object.hpp>
-#include <boost/python/object/function_handle.hpp>
-#include <boost/python/errors.hpp>
-#include <boost/python/str.hpp>
-#include <boost/python/object_attributes.hpp>
-#include <boost/python/args.hpp>
-#include <boost/python/refcount.hpp>
-#include <boost/python/extract.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/list.hpp>
-
-#include <boost/python/detail/signature.hpp>
-#include <boost/mpl/vector/vector10.hpp>
-
-#include <boost/bind.hpp>
-
-#include <algorithm>
-#include <cstring>
-
-#if BOOST_PYTHON_DEBUG_ERROR_MESSAGES
-# include <cstdio>
-#endif
-
-namespace boost { namespace python { namespace objects { 
-
-py_function_impl_base::~py_function_impl_base()
-{
-}
-
-unsigned py_function_impl_base::max_arity() const
-{
-    return this->min_arity();
-}
-
-extern PyTypeObject function_type;
-
-function::function(
-    py_function const& implementation
-#if BOOST_WORKAROUND(__EDG_VERSION__, == 245)
-    , python::detail::keyword const*       names_and_defaults
-#else
-    , python::detail::keyword const* const names_and_defaults
-#endif
-    , unsigned num_keywords
-    )
-    : m_fn(implementation)
-    , m_nkeyword_values(0)
-{
-    if (names_and_defaults != 0)
-    {
-        unsigned int max_arity = m_fn.max_arity();
-        unsigned int keyword_offset
-            = max_arity > num_keywords ? max_arity - num_keywords : 0;
-
-
-        unsigned tuple_size = num_keywords ? max_arity : 0;
-        m_arg_names = object(handle<>(PyTuple_New(tuple_size)));
-
-        if (num_keywords != 0)
-        {
-            for (unsigned j = 0; j < keyword_offset; ++j)
-                PyTuple_SET_ITEM(m_arg_names.ptr(), j, incref(Py_None));
-        }
-        
-        for (unsigned i = 0; i < num_keywords; ++i)
-        {
-            tuple kv;
-
-            python::detail::keyword const* const p = names_and_defaults + i;
-            if (p->default_value)
-            {
-                kv = make_tuple(p->name, p->default_value);
-                ++m_nkeyword_values;
-            }
-            else
-            {
-                kv = make_tuple(p->name);
-            }
-
-            PyTuple_SET_ITEM(
-                m_arg_names.ptr()
-                , i + keyword_offset
-                , incref(kv.ptr())
-                );
-        }
-    }
-    
-    PyObject* p = this;
-    if (function_type.ob_type == 0)
-    {
-        function_type.ob_type = &PyType_Type;
-        ::PyType_Ready(&function_type);
-    }
-    PyObject_INIT(p, &function_type);
-}
-
-function::~function()
-{
-}
-
-PyObject* function::call(PyObject* args, PyObject* keywords) const
-{
-    std::size_t n_unnamed_actual = PyTuple_GET_SIZE(args);
-    std::size_t n_keyword_actual = keywords ? PyDict_Size(keywords) : 0;
-    std::size_t n_actual = n_unnamed_actual + n_keyword_actual;
-    
-    function const* f = this;
-
-    // Try overloads looking for a match
-    do
-    {
-        // Check for a plausible number of arguments
-        unsigned min_arity = f->m_fn.min_arity();
-        unsigned max_arity = f->m_fn.max_arity();
-
-        if (n_actual + f->m_nkeyword_values >= min_arity
-            && n_actual <= max_arity)
-        {
-            // This will be the args that actually get passed
-            handle<>inner_args(allow_null(borrowed(args)));
-
-            if (n_keyword_actual > 0      // Keyword arguments were supplied
-                 || n_actual < min_arity) // or default keyword values are needed
-            {                            
-                if (f->m_arg_names.ptr() == Py_None) 
-                {
-                    // this overload doesn't accept keywords
-                    inner_args = handle<>();
-                }
-                else
-                {
-                    // "all keywords are none" is a special case
-                    // indicating we will accept any number of keyword
-                    // arguments
-                    if (PyTuple_Size(f->m_arg_names.ptr()) == 0)
-                    {
-                        // no argument preprocessing
-                    }
-                    else if (n_actual > max_arity)
-                    {
-                        // too many arguments
-                        inner_args = handle<>();
-                    }
-                    else
-                    {
-                        // build a new arg tuple, will adjust its size later
-                        inner_args = handle<>(PyTuple_New(max_arity));
-
-                        // Fill in the positional arguments
-                        for (std::size_t i = 0; i < n_unnamed_actual; ++i)
-                            PyTuple_SET_ITEM(inner_args.get(), i, incref(PyTuple_GET_ITEM(args, i)));
-
-                        // Grab remaining arguments by name from the keyword dictionary
-                        std::size_t n_actual_processed = n_unnamed_actual;
-                
-                        for (std::size_t arg_pos = n_unnamed_actual; arg_pos < max_arity ; ++arg_pos)
-                        {
-                            // Get the keyword[, value pair] corresponding
-                            PyObject* kv = PyTuple_GET_ITEM(f->m_arg_names.ptr(), arg_pos);
-
-                            // If there were any keyword arguments,
-                            // look up the one we need for this
-                            // argument position
-                            PyObject* value = n_keyword_actual
-                                ? PyDict_GetItem(keywords, PyTuple_GET_ITEM(kv, 0))
-                                : 0;
-
-                            if (!value)
-                            {
-                                // Not found; check if there's a default value
-                                if (PyTuple_GET_SIZE(kv) > 1)
-                                    value = PyTuple_GET_ITEM(kv, 1);
-                        
-                                if (!value)
-                                {
-                                    // still not found; matching fails
-                                    PyErr_Clear();
-                                    inner_args = handle<>();
-                                    break;
-                                }
-                            }
-                            else
-                            {
-                                ++n_actual_processed;
-                            }
-
-                            PyTuple_SET_ITEM(inner_args.get(), arg_pos, incref(value));
-                        }
-
-                        if (inner_args.get())
-                        {
-                            //check if we proccessed all the arguments
-                            if(n_actual_processed < n_actual)
-                                inner_args = handle<>();
-                        }
-                    }
-                }
-            }
-            
-            // Call the function.  Pass keywords in case it's a
-            // function accepting any number of keywords
-            PyObject* result = inner_args ? f->m_fn(inner_args.get(), keywords) : 0;
-            
-            // If the result is NULL but no error was set, m_fn failed
-            // the argument-matching test.
-
-            // This assumes that all other error-reporters are
-            // well-behaved and never return NULL to python without
-            // setting an error.
-            if (result != 0 || PyErr_Occurred())
-                return result;
-        }
-        f = f->m_overloads.get();
-    }
-    while (f);
-    // None of the overloads matched; time to generate the error message
-    argument_error(args, keywords);
-    return 0;
-}
-
-void function::argument_error(PyObject* args, PyObject* keywords) const
-{
-    static handle<> exception(
-        PyErr_NewException("Boost.Python.ArgumentError", PyExc_TypeError, 0));
-
-    object message = "Python argument types in\n    %s.%s("
-        % make_tuple(this->m_namespace, this->m_name);
-    
-    list actual;
-    for (int i = 0; i < PyTuple_Size(args); ++i)
-    {
-        char const* name = PyTuple_GetItem(args, i)->ob_type->tp_name;
-        actual.append(str(name));
-    }
-    message += str(", ").join(actual);
-    message += ")\ndid not match C++ signature:\n    ";
-
-    list signatures;
-    for (function const* f = this; f; f = f->m_overloads.get())
-    {
-        py_function const& impl = f->m_fn;
-        
-        python::detail::signature_element const* s
-            = impl.signature();
-        
-        list formal;
-        if (impl.max_arity() == 0)
-            formal.append("void");
-
-        for (unsigned n = 1; n <= impl.max_arity(); ++n)
-        {
-            if (s[n].basename == 0)
-            {
-                formal.append("...");
-                break;
-            }
-            
-            formal.append(
-                str(s[n].basename) + (s[n].lvalue ? " {lvalue}" : "")
-                );
-        }
-
-        signatures.append(
-            "%s(%s)" % make_tuple(f->m_name, str(", ").join(formal))
-            );
-    }
-
-    message += str("\n    ").join(signatures);
-
-#if BOOST_PYTHON_DEBUG_ERROR_MESSAGES
-    std::printf("\n--------\n%s\n--------\n", extract<const char*>(message)());
-#endif 
-    PyErr_SetObject(exception.get(), message.ptr());
-    throw_error_already_set();
-}
-
-void function::add_overload(handle<function> const& overload_)
-{
-    function* parent = this;
-    
-    while (parent->m_overloads)
-        parent = parent->m_overloads.get();
-
-    parent->m_overloads = overload_;
-
-    // If we have no documentation, get the docs from the overload
-    if (!m_doc)
-        m_doc = overload_->m_doc;
-}
-
-namespace
-{
-  char const* const binary_operator_names[] =
-  {
-      "add__",
-      "and__",
-      "div__",
-      "divmod__",
-      "eq__",
-      "floordiv__",
-      "ge__",
-      "gt__",
-      "le__",
-      "lshift__",
-      "lt__",
-      "mod__",
-      "mul__",
-      "ne__",
-      "or__",
-      "pow__",
-      "radd__",
-      "rand__",
-      "rdiv__",
-      "rdivmod__", 
-      "rfloordiv__",
-      "rlshift__",
-      "rmod__",
-      "rmul__",
-      "ror__",
-      "rpow__", 
-      "rrshift__",
-      "rshift__",
-      "rsub__",
-      "rtruediv__",
-      "rxor__",
-      "sub__",
-      "truediv__", 
-      "xor__"
-  };
-
-  struct less_cstring
-  {
-      bool operator()(char const* x, char const* y) const
-      {
-          return BOOST_CSTD_::strcmp(x,y) < 0;
-      }
-  };
-  
-  inline bool is_binary_operator(char const* name)
-  {
-      return name[0] == '_'
-          && name[1] == '_'
-          && std::binary_search(
-              &binary_operator_names[0]
-              , binary_operator_names + sizeof(binary_operator_names)/sizeof(*binary_operator_names)
-              , name + 2
-              , less_cstring()
-              );
-  }
-
-  // Something for the end of the chain of binary operators
-  PyObject* not_implemented(PyObject*, PyObject*)
-  {
-      Py_INCREF(Py_NotImplemented);
-      return Py_NotImplemented;
-  }
-  
-  handle<function> not_implemented_function()
-  {
-      
-      static object keeper(
-          function_object(
-              py_function(&not_implemented, mpl::vector1<void>(), 2)
-            , python::detail::keyword_range())
-          );
-      return handle<function>(borrowed(downcast<function>(keeper.ptr())));
-  }
-}
-
-void function::add_to_namespace(
-    object const& name_space, char const* name_, object const& attribute)
-{
-    str const name(name_);
-    PyObject* const ns = name_space.ptr();
-    
-    if (attribute.ptr()->ob_type == &function_type)
-    {
-        function* new_func = downcast<function>(attribute.ptr());
-        PyObject* dict = 0;
-        
-        if (PyClass_Check(ns))
-            dict = ((PyClassObject*)ns)->cl_dict;
-        else if (PyType_Check(ns))
-            dict = ((PyTypeObject*)ns)->tp_dict;
-        else
-            dict = PyObject_GetAttrString(ns, "__dict__");
-
-        if (dict == 0)
-            throw_error_already_set();
-
-        handle<> existing(allow_null(::PyObject_GetItem(dict, name.ptr())));
-        
-        if (existing)
-        {
-            if (existing->ob_type == &function_type)
-            {
-                new_func->add_overload(
-                    handle<function>(
-                        borrowed(
-                            downcast<function>(existing.get())
-                        )
-                    )
-                );
-            }
-            else if (existing->ob_type == &PyStaticMethod_Type)
-            {
-                char const* name_space_name = extract<char const*>(name_space.attr("__name__"));
-                
-                ::PyErr_Format(
-                    PyExc_RuntimeError
-                    , "Boost.Python - All overloads must be exported "
-                      "before calling \'class_<...>(\"%s\").staticmethod(\"%s\")\'"
-                    , name_space_name
-                    , name_
-                    );
-                throw_error_already_set();
-            }
-        }
-        else if (is_binary_operator(name_))
-        {
-            // Binary operators need an additional overload which
-            // returns NotImplemented, so that Python will try the
-            // __rxxx__ functions on the other operand. We add this
-            // when no overloads for the operator already exist.
-            new_func->add_overload(not_implemented_function());
-        }
-
-        // A function is named the first time it is added to a namespace.
-        if (new_func->name().ptr() == Py_None)
-            new_func->m_name = name;
-
-        handle<> name_space_name(
-            allow_null(::PyObject_GetAttrString(name_space.ptr(), "__name__")));
-        
-        if (name_space_name)
-            new_func->m_namespace = object(name_space_name);
-    }
-
-    // The PyObject_GetAttrString() or PyObject_GetItem calls above may
-    // have left an active error
-    PyErr_Clear();
-    if (PyObject_SetAttr(ns, name.ptr(), attribute.ptr()) < 0)
-        throw_error_already_set();
-}
-
-void function::add_to_namespace(
-    object const& name_space, char const* name_, object const& attribute, char const* doc)
-{
-    add_to_namespace(name_space, name_, attribute);
-    if (doc != 0)
-    {
-        object attr_copy(attribute);
-        attr_copy.attr("__doc__") = doc;
-    }
-}
-
-BOOST_PYTHON_DECL void add_to_namespace(
-    object const& name_space, char const* name, object const& attribute)
-{
-    function::add_to_namespace(name_space, name, attribute);
-}
-
-BOOST_PYTHON_DECL void add_to_namespace(
-    object const& name_space, char const* name, object const& attribute, char const* doc)
-{
-    function::add_to_namespace(name_space, name, attribute, doc);    
-}
-
-
-namespace
-{
-  struct bind_return
-  {
-      bind_return(PyObject*& result, function const* f, PyObject* args, PyObject* keywords)
-          : m_result(result)
-            , m_f(f)
-            , m_args(args)
-            , m_keywords(keywords)
-      {}
-
-      void operator()() const
-      {
-          m_result = m_f->call(m_args, m_keywords);
-      }
-      
-   private:
-      PyObject*& m_result;
-      function const* m_f;
-      PyObject* m_args;
-      PyObject* m_keywords;
-  };
-}
-
-extern "C"
-{
-    // Stolen from Python's funcobject.c
-    static PyObject *
-    function_descr_get(PyObject *func, PyObject *obj, PyObject *type_)
-    {
-        if (obj == Py_None)
-            obj = NULL;
-        return PyMethod_New(func, obj, type_);
-    }
-
-    static void
-    function_dealloc(PyObject* p)
-    {
-        delete static_cast<function*>(p);
-    }
-
-    static PyObject *
-    function_call(PyObject *func, PyObject *args, PyObject *kw)
-    {
-        PyObject* result = 0;
-        handle_exception(bind_return(result, static_cast<function*>(func), args, kw));
-        return result;
-    }
-
-    //
-    // Here we're using the function's tp_getset rather than its
-    // tp_members to set up __doc__ and __name__, because tp_members
-    // really depends on having a POD object type (it relies on
-    // offsets). It might make sense to reformulate function as a POD
-    // at some point, but this is much more expedient.
-    //
-    static PyObject* function_get_doc(PyObject* op, void*)
-    {
-        function* f = downcast<function>(op);
-        return python::incref(f->doc().ptr());
-    }
-    
-    static int function_set_doc(PyObject* op, PyObject* doc, void*)
-    {
-        function* f = downcast<function>(op);
-        f->doc(doc ? object(python::detail::borrowed_reference(doc)) : object());
-        return 0;
-    }
-    
-    static PyObject* function_get_name(PyObject* op, void*)
-    {
-        function* f = downcast<function>(op);
-        if (f->name().ptr() == Py_None)
-            return PyString_InternFromString("<unnamed Boost.Python function>");
-        else
-            return python::incref(f->name().ptr());
-    }
-}
-    
-static PyGetSetDef function_getsetlist[] = {
-    {"__name__", (getter)function_get_name, 0 },
-    {"func_name", (getter)function_get_name, 0 },
-    {"__doc__", (getter)function_get_doc, (setter)function_set_doc},
-    {"func_doc", (getter)function_get_doc, (setter)function_set_doc},
-    {NULL} /* Sentinel */
-};
-
-PyTypeObject function_type = {
-    PyObject_HEAD_INIT(0)
-    0,
-    "Boost.Python.function",
-    sizeof(function),
-    0,
-    (destructor)function_dealloc,               /* tp_dealloc */
-    0,                                  /* tp_print */
-    0,                                  /* tp_getattr */
-    0,                                  /* tp_setattr */
-    0,                                  /* tp_compare */
-    0, //(reprfunc)func_repr,                   /* tp_repr */
-    0,                                  /* tp_as_number */
-    0,                                  /* tp_as_sequence */
-    0,                                  /* tp_as_mapping */
-    0,                                  /* tp_hash */
-    function_call,                              /* tp_call */
-    0,                                  /* tp_str */
-    0, // PyObject_GenericGetAttr,            /* tp_getattro */
-    0, // PyObject_GenericSetAttr,            /* tp_setattro */
-    0,                                  /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT /* | Py_TPFLAGS_HAVE_GC */,/* tp_flags */
-    0,                                  /* tp_doc */
-    0, // (traverseproc)func_traverse,          /* tp_traverse */
-    0,                                  /* tp_clear */
-    0,                                  /* tp_richcompare */
-    0, //offsetof(PyFunctionObject, func_weakreflist), /* tp_weaklistoffset */
-    0,                                  /* tp_iter */
-    0,                                  /* tp_iternext */
-    0,                                  /* tp_methods */
-    0, // func_memberlist,              /* tp_members */
-    function_getsetlist,                /* tp_getset */
-    0,                                  /* tp_base */
-    0,                                  /* tp_dict */
-    function_descr_get,                 /* tp_descr_get */
-    0,                                  /* tp_descr_set */
-    0, //offsetof(PyFunctionObject, func_dict),      /* tp_dictoffset */
-    0,                                      /* tp_init */
-    0,                                      /* tp_alloc */
-    0,
-    0                                       /* tp_new */
-};
-
-object function_object(
-    py_function const& f
-    , python::detail::keyword_range const& keywords)
-{
-    return python::object(
-        python::detail::new_non_null_reference(
-            new function(
-                f, keywords.first, keywords.second - keywords.first)));
-}
-
-object function_object(py_function const& f)
-{
-    return function_object(f, python::detail::keyword_range());
-}
-
-
-handle<> function_handle_impl(py_function const& f)
-{
-    return python::handle<>(
-        allow_null(
-            new function(f, 0, 0)));
-}
-
-} // namespace objects
-
-namespace detail
-{
-  object BOOST_PYTHON_DECL make_raw_function(objects::py_function f)
-  {
-      static keyword k;
-    
-      return objects::function_object(
-          f
-          , keyword_range(&k,&k));
-  }
-  void BOOST_PYTHON_DECL pure_virtual_called()
-  {
-      PyErr_SetString(PyExc_RuntimeError, "Pure virtual function called");
-      throw_error_already_set();
-  }
-}
-
-}} // namespace boost::python
diff --git a/src/object/inheritance.cpp b/src/object/inheritance.cpp
deleted file mode 100644
index b7258f8e..00000000
--- a/src/object/inheritance.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/object/inheritance.hpp>
-#include <boost/python/type_id.hpp>
-#include <boost/graph/breadth_first_search.hpp>
-#if _MSC_FULL_VER >= 13102171 && _MSC_FULL_VER <= 13102179
-# include <boost/graph/reverse_graph.hpp>
-#endif 
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/reverse_graph.hpp>
-#include <boost/property_map.hpp>
-#include <boost/bind.hpp>
-#include <boost/integer_traits.hpp>
-#include <boost/tuple/tuple.hpp>
-#include <boost/tuple/tuple_comparison.hpp>
-#include <queue>
-#include <vector>
-#include <functional>
-
-//
-// Procedure:
-//
-//      The search is a BFS over the space of (type,address) pairs
-//      guided by the edges of the casting graph whose nodes
-//      correspond to classes, and whose edges are traversed by
-//      applying associated cast functions to an address. We use
-//      vertex distance to the goal node in the cast_graph to rate the
-//      paths. The vertex distance to any goal node is calculated on
-//      demand and outdated by the addition of edges to the graph.
-
-namespace boost {
-namespace
-{
-  enum edge_cast_t { edge_cast = 8010 };
-}
-
-// Install properties
-BOOST_INSTALL_PROPERTY(edge, cast);
-
-namespace
-{
-  typedef void*(*cast_function)(void*);
-  
-  //
-  // Here we put together the low-level data structures of the
-  // casting graph representation.
-  //
-  typedef python::type_info class_id;
-
-  // represents a graph of available casts
-  
-#if 0
-  struct cast_graph
-      :
-#else
-        typedef
-#endif 
-        adjacency_list<vecS,vecS, bidirectionalS, no_property
-
-      // edge index property allows us to look up edges in the connectivity matrix
-      , property<edge_index_t,std::size_t
-  
-                 // The function which casts a void* from the edge's source type
-                 // to its destination type.
-                 , property<edge_cast_t,cast_function> > >
-#if 0
-  {};
-#else
-  cast_graph;
-#endif 
-
-  typedef cast_graph::vertex_descriptor vertex_t;
-  typedef cast_graph::edge_descriptor edge_t;
-  
-  struct smart_graph
-  {
-      typedef std::vector<std::size_t>::const_iterator node_distance_map;
-      
-      typedef std::pair<cast_graph::out_edge_iterator
-                        , cast_graph::out_edge_iterator> out_edges_t;
-      
-      // Return a map of the distances from any node to the given
-      // target node
-      node_distance_map distances_to(vertex_t target) const
-      {
-          std::size_t n = num_vertices(m_topology);
-          if (m_distances.size() != n * n)
-          {
-              m_distances.clear();
-              m_distances.resize(n * n, std::numeric_limits<std::size_t>::max());
-              m_known_vertices = n;
-          }
-          
-          std::vector<std::size_t>::iterator to_target = m_distances.begin() + n * target;
-
-          // this node hasn't been used as a target yet
-          if (to_target[target] != 0)
-          {
-              typedef reverse_graph<cast_graph> reverse_cast_graph;
-              reverse_cast_graph reverse_topology(m_topology);
-              
-              to_target[target] = 0;
-              
-              breadth_first_search(
-                  reverse_topology, target
-                  , visitor(
-                      make_bfs_visitor(
-                          record_distances(
-                              make_iterator_property_map(
-                                  to_target
-                                  , get(vertex_index, reverse_topology)
-# ifdef BOOST_NO_STD_ITERATOR_TRAITS
-                                  , *to_target
-# endif 
-                                  )
-                              , on_tree_edge()
-                              ))));
-          }
-
-          return to_target;
-      }
-
-      cast_graph& topology() { return m_topology; }
-      cast_graph const& topology() const { return m_topology; }
-
-      std::size_t known_vertices() const { return m_known_vertices; }
-
-      smart_graph()
-          : m_known_vertices(0)
-      {}
-      
-   private:
-      cast_graph m_topology;
-      mutable std::vector<std::size_t> m_distances;
-      mutable std::size_t m_known_vertices;
-  };
-  
-  smart_graph& full_graph()
-  {
-      static smart_graph x;
-      return x;
-  }
-  
-  smart_graph& up_graph()
-  {
-      static smart_graph x;
-      return x;
-  }
-
-  //
-  // Our index of class types
-  //
-  using boost::python::objects::dynamic_id_function;
-  typedef tuples::tuple<
-      class_id               // static type
-      , vertex_t             // corresponding vertex 
-      , dynamic_id_function  // dynamic_id if polymorphic, or 0
-      >
-  index_entry_interface;
-  typedef index_entry_interface::inherited index_entry;
-  enum { ksrc_static_t, kvertex, kdynamic_id };
-  
-  typedef std::vector<index_entry> type_index_t;
-
-  
-  type_index_t& type_index()
-  {
-      static type_index_t x;
-      return x;
-  }
-
-  template <class Tuple>
-  struct select1st
-  {
-      typedef typename tuples::element<0, Tuple>::type result_type;
-      
-      result_type const& operator()(Tuple const& x) const
-      {
-          return tuples::get<0>(x);
-      }
-  };
-  
-  // map a type to a position in the index
-  inline type_index_t::iterator type_position(class_id type)
-  {
-      typedef index_entry entry;
-      
-      return std::lower_bound(
-          type_index().begin(), type_index().end()
-          , boost::make_tuple(type, vertex_t(), dynamic_id_function(0))
-          , boost::bind<bool>(std::less<class_id>()
-               , boost::bind<class_id>(select1st<entry>(), _1)
-               , boost::bind<class_id>(select1st<entry>(), _2)));
-  }
-
-  inline index_entry* seek_type(class_id type)
-  {
-      type_index_t::iterator p = type_position(type);
-      if (p == type_index().end() || tuples::get<ksrc_static_t>(*p) != type)
-          return 0;
-      else
-          return &*p;
-  }
-  
-  // Get the entry for a type, inserting if neccessary
-  inline type_index_t::iterator demand_type(class_id type)
-  {
-      type_index_t::iterator p = type_position(type);
-
-      if (p != type_index().end() && tuples::get<ksrc_static_t>(*p) == type)
-          return p;
-
-      vertex_t v = add_vertex(full_graph().topology());
-      vertex_t v2 = add_vertex(up_graph().topology());
-      (void)v2; // prevent unused var warning on non-debug compile
-      assert(v == v2);
-      return type_index().insert(p, boost::make_tuple(type, v, dynamic_id_function(0)));
-  }
-
-  // Map a two types to a vertex in the graph, inserting if neccessary
-  typedef std::pair<type_index_t::iterator, type_index_t::iterator>
-        type_index_iterator_pair;
-  
-  inline type_index_iterator_pair
-  demand_types(class_id t1, class_id t2)
-  {
-      // be sure there will be no reallocation
-      type_index().reserve(type_index().size() + 2);
-      type_index_t::iterator first = demand_type(t1);
-      type_index_t::iterator second = demand_type(t2);
-      if (first == second)
-          ++first;
-      return std::make_pair(first, second);
-  }
-
-  struct q_elt
-  {
-      q_elt(std::size_t distance
-            , void* src_address
-            , vertex_t target
-            , cast_function cast
-            )
-          : distance(distance)
-          , src_address(src_address)
-          , target(target)
-          , cast(cast)
-      {}
-      
-      std::size_t distance;
-      void* src_address;
-      vertex_t target;
-      cast_function cast;
-
-      bool operator<(q_elt const& rhs) const
-      {
-          return distance < rhs.distance;
-      }
-  };
-
-  // Optimization:
-  //
-  // Given p, src_t, dst_t
-  //
-  // Get a pointer pd to the most-derived object
-  //    if it's polymorphic, dynamic_cast to void*
-  //    otherwise pd = p
-  //
-  // Get the most-derived typeid src_td
-  //
-  // ptrdiff_t offset = p - pd
-  //
-  // Now we can keep a cache, for [src_t, offset, src_td, dst_t] of
-  // the cast transformation function to use on p and the next src_t
-  // in the chain.  src_td, dst_t don't change throughout this
-  // process. In order to represent unreachability, when a pair is
-  // found to be unreachable, we stick a 0-returning "dead-cast"
-  // function in the cache.
-  
-  // This is needed in a few places below
-  inline void* identity_cast(void* p)
-  {
-      return p;
-  }
-
-  void* search(smart_graph const& g, void* p, vertex_t src, vertex_t dst)
-  {
-      // I think this test was thoroughly bogus -- dwa
-      // If we know there's no path; bail now.
-      // if (src > g.known_vertices() || dst > g.known_vertices())
-      //    return 0;
-      
-      smart_graph::node_distance_map d(g.distances_to(dst));
-
-      if (d[src] == std::numeric_limits<std::size_t>::max())
-          return 0;
-
-      typedef property_map<cast_graph,edge_cast_t>::const_type cast_map;
-      cast_map casts = get(edge_cast, g.topology());
-      
-      typedef std::pair<vertex_t,void*> search_state;
-      typedef std::vector<search_state> visited_t;
-      visited_t visited;
-      std::priority_queue<q_elt> q;
-      
-      q.push(q_elt(d[src], p, src, identity_cast));
-      while (!q.empty())
-      {
-          q_elt top = q.top();
-          q.pop();
-          
-          // Check to see if we have a real state
-          void* dst_address = top.cast(top.src_address);
-          if (dst_address == 0)
-              continue;
-
-          if (top.target == dst)
-              return dst_address;
-          
-          search_state s(top.target,dst_address);
-
-          visited_t::iterator pos = std::lower_bound(
-              visited.begin(), visited.end(), s);
-
-          // If already visited, continue
-          if (pos != visited.end() && *pos == s)
-              continue;
-          
-          visited.insert(pos, s); // mark it
-
-          // expand it:
-          smart_graph::out_edges_t edges = out_edges(s.first, g.topology());
-          for (cast_graph::out_edge_iterator p = edges.first
-                   , finish = edges.second
-                   ; p != finish
-                   ; ++p
-              )
-          {
-              edge_t e = *p;
-              q.push(q_elt(
-                         d[target(e, g.topology())]
-                         , dst_address
-                         , target(e, g.topology())
-                         , boost::get(casts, e)));
-          }
-      }
-      return 0;
-  }
-
-  struct cache_element
-  {
-      typedef tuples::tuple<
-          class_id              // source static type
-          , class_id            // target type
-          , std::ptrdiff_t      // offset within source object
-          , class_id            // source dynamic type
-          >::inherited key_type;
-
-      cache_element(key_type const& k)
-          : key(k)
-          , offset(0)
-      {}
-      
-      key_type key;
-      std::ptrdiff_t offset;
-
-      BOOST_STATIC_CONSTANT(
-          std::ptrdiff_t, not_found = integer_traits<std::ptrdiff_t>::const_min);
-      
-      bool operator<(cache_element const& rhs) const
-      {
-          return this->key < rhs.key;
-      }
-
-      bool unreachable() const
-      {
-          return offset == not_found;
-      }
-  };
-  
-  enum { kdst_t = ksrc_static_t + 1, koffset, ksrc_dynamic_t };
-  typedef std::vector<cache_element> cache_t;
-
-  cache_t& cache()
-  {
-      static cache_t x;
-      return x;
-  }
-
-  inline void* convert_type(void* const p, class_id src_t, class_id dst_t, bool polymorphic)
-  {
-      // Quickly rule out unregistered types
-      index_entry* src_p = seek_type(src_t);
-      if (src_p == 0)
-          return 0;
-
-      index_entry* dst_p = seek_type(dst_t);
-      if (dst_p == 0)
-          return 0;
-    
-      // Look up the dynamic_id function and call it to get the dynamic
-      // info
-      boost::python::objects::dynamic_id_t dynamic_id = polymorphic
-          ? tuples::get<kdynamic_id>(*src_p)(p)
-          : std::make_pair(p, src_t);
-    
-      // Look in the cache first for a quickie address translation
-      std::ptrdiff_t offset = (char*)p - (char*)dynamic_id.first;
-
-      cache_element seek(boost::make_tuple(src_t, dst_t, offset, dynamic_id.second));
-      cache_t& c = cache();
-      cache_t::iterator const cache_pos
-          = std::lower_bound(c.begin(), c.end(), seek);
-                      
-
-      // if found in the cache, we're done
-      if (cache_pos != c.end() && cache_pos->key == seek.key)
-      {
-          return cache_pos->offset == cache_element::not_found
-              ? 0 : (char*)p + cache_pos->offset;
-      }
-
-      // If we are starting at the most-derived type, only look in the up graph
-      smart_graph const& g = polymorphic && dynamic_id.second != src_t
-          ? full_graph() : up_graph();
-    
-      void* result = search(
-          g, p, tuples::get<kvertex>(*src_p)
-          , tuples::get<kvertex>(*dst_p));
-
-      // update the cache
-      c.insert(cache_pos, seek)->offset
-          = (result == 0) ? cache_element::not_found : (char*)result - (char*)p;
-
-      return result;
-  }
-}
-
-namespace python { namespace objects {
-
-BOOST_PYTHON_DECL void* find_dynamic_type(void* p, class_id src_t, class_id dst_t)
-{
-    return convert_type(p, src_t, dst_t, true);
-}
-
-BOOST_PYTHON_DECL void* find_static_type(void* p, class_id src_t, class_id dst_t)
-{
-    return convert_type(p, src_t, dst_t, false);
-}
-
-BOOST_PYTHON_DECL void add_cast(
-    class_id src_t, class_id dst_t, cast_function cast, bool is_downcast)
-{
-    // adding an edge will invalidate any record of unreachability in
-    // the cache.
-    static std::size_t expected_cache_len = 0;
-    cache_t& c = cache();
-    if (c.size() > expected_cache_len)
-    {
-        c.erase(std::remove_if(
-                    c.begin(), c.end(),
-                    mem_fn(&cache_element::unreachable))
-                , c.end());
-
-        // If any new cache entries get added, we'll have to do this
-        // again when the next edge is added
-        expected_cache_len = c.size();
-    }
-    
-    type_index_iterator_pair types = demand_types(src_t, dst_t);
-    vertex_t src = tuples::get<kvertex>(*types.first);
-    vertex_t dst = tuples::get<kvertex>(*types.second);
-
-    cast_graph* const g[2] = { &up_graph().topology(), &full_graph().topology() };
-    
-    for (cast_graph*const* p = g + (is_downcast ? 1 : 0); p < g + 2; ++p)
-    {
-        edge_t e;
-        bool added;
-
-        tie(e, added) = add_edge(src, dst, **p);
-        assert(added);
-
-        put(get(edge_cast, **p), e, cast);
-        put(get(edge_index, **p), e, num_edges(full_graph().topology()) - 1);
-    }
-}
-
-BOOST_PYTHON_DECL void register_dynamic_id_aux(
-    class_id static_id, dynamic_id_function get_dynamic_id)
-{
-    tuples::get<kdynamic_id>(*demand_type(static_id)) = get_dynamic_id;
-}
-
-}}} // namespace boost::python::objects
diff --git a/src/object/iterator.cpp b/src/object/iterator.cpp
deleted file mode 100644
index a919e788..00000000
--- a/src/object/iterator.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/object/iterator_core.hpp>
-#include <boost/python/object/function_object.hpp>
-#include <boost/bind.hpp>
-#include <boost/mpl/vector/vector10.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-namespace
-{
-  PyObject* identity(PyObject* args_, PyObject*)
-  {
-      PyObject* x = PyTuple_GET_ITEM(args_,0);
-      Py_INCREF(x);
-      return x;
-  }
-}
-
-BOOST_PYTHON_DECL object const& identity_function()
-{
-    static object result(
-        function_object(
-            py_function(&identity, mpl::vector2<PyObject*,PyObject*>())
-        )
-    );
-    return result;
-}
-
-void stop_iteration_error()
-{
-    PyErr_SetObject(PyExc_StopIteration, Py_None);
-    throw_error_already_set();
-}
-
-}}} // namespace boost::python::objects
diff --git a/src/object/life_support.cpp b/src/object/life_support.cpp
deleted file mode 100644
index cada3bd6..00000000
--- a/src/object/life_support.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/object/life_support.hpp>
-#include <boost/python/detail/none.hpp>
-#include <boost/python/refcount.hpp>
-
-namespace boost { namespace python { namespace objects { 
-
-struct life_support
-{
-    PyObject_HEAD
-    PyObject* patient;
-};
-
-extern "C"
-{
-    static void
-    life_support_dealloc(PyObject* self)
-    {
-        Py_XDECREF(((life_support*)self)->patient);
-        self->ob_type->tp_free(self);
-    }
-
-    static PyObject *
-    life_support_call(PyObject *self, PyObject *arg, PyObject *kw)
-    {
-        // Let the patient die now
-        Py_XDECREF(((life_support*)self)->patient);
-        ((life_support*)self)->patient = 0;
-        // Let the weak reference die. This probably kills us.
-        Py_XDECREF(PyTuple_GET_ITEM(arg, 0));
-        return detail::none();
-    }
-}
-
-PyTypeObject life_support_type = {
-    PyObject_HEAD_INIT(0)//(&PyType_Type)
-    0,
-    "Boost.Python.life_support",
-    sizeof(life_support),
-    0,
-    life_support_dealloc,               /* tp_dealloc */
-    0,                                  /* tp_print */
-    0,                                  /* tp_getattr */
-    0,                                  /* tp_setattr */
-    0,                                  /* tp_compare */
-    0, //(reprfunc)func_repr,                   /* tp_repr */
-    0,                                  /* tp_as_number */
-    0,                                  /* tp_as_sequence */
-    0,                                  /* tp_as_mapping */
-    0,                                  /* tp_hash */
-    life_support_call,                  /* tp_call */
-    0,                                  /* tp_str */
-    0, // PyObject_GenericGetAttr,            /* tp_getattro */
-    0, // PyObject_GenericSetAttr,            /* tp_setattro */
-    0,                                  /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT /* | Py_TPFLAGS_HAVE_GC */,/* tp_flags */
-    0,                                  /* tp_doc */
-    0, // (traverseproc)func_traverse,          /* tp_traverse */
-    0,                                  /* tp_clear */
-    0,                                  /* tp_richcompare */
-    0, //offsetof(PyLife_SupportObject, func_weakreflist), /* tp_weaklistoffset */
-    0,                                  /* tp_iter */
-    0,                                  /* tp_iternext */
-    0,                                  /* tp_methods */
-    0, // func_memberlist,                      /* tp_members */
-    0, //func_getsetlist,                       /* tp_getset */
-    0,                                  /* tp_base */
-    0,                                  /* tp_dict */
-    0,                                  /* tp_descr_get */
-    0,                                  /* tp_descr_set */
-    0, //offsetof(PyLife_SupportObject, func_dict),      /* tp_dictoffset */
-    0,                                      /* tp_init */
-    0,                                      /* tp_alloc */
-    0,
-    0                                       /* tp_new */
-};
-
-PyObject* make_nurse_and_patient(PyObject* nurse, PyObject* patient)
-{
-    if (nurse == Py_None)
-        return nurse;
-    
-    if (life_support_type.ob_type == 0)
-    {
-        life_support_type.ob_type = &PyType_Type;
-        PyType_Ready(&life_support_type);
-    }
-    
-    life_support* system = PyObject_New(life_support, &life_support_type);
-    if (!system)
-        return 0;
-
-    system->patient = 0;
-    
-    // We're going to leak this reference, but don't worry; the
-    // life_support system decrements it when the nurse dies.
-    PyObject* weakref = PyWeakref_NewRef(nurse, (PyObject*)system);
-
-    // weakref has either taken ownership, or we have to release it
-    // anyway
-    Py_DECREF(system);
-    if (!weakref)
-        return 0;
-    
-    system->patient = patient;
-    Py_XINCREF(patient); // hang on to the patient until death
-    return weakref;
-}
-
-}}} // namespace boost::python::objects
diff --git a/src/object/pickle_support.cpp b/src/object/pickle_support.cpp
deleted file mode 100644
index 6f37517f..00000000
--- a/src/object/pickle_support.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-//  (C) Copyright R.W. Grosse-Kunstleve 2002.
-//  Permission to copy, use, modify, sell and distribute this software
-//  is granted provided this copyright notice appears in all copies. This
-//  software is provided "as is" without express or implied warranty, and
-//  with no claim as to its suitability for any purpose.
-
-#include <boost/python/make_function.hpp>
-#include <boost/python/object/class.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/list.hpp>
-#include <boost/python/dict.hpp>
-#include <boost/python/detail/api_placeholder.hpp>
-
-namespace boost { namespace python {
-
-namespace {
-
-  tuple instance_reduce(object instance_obj)
-  {
-      list result;
-      object instance_class(instance_obj.attr("__class__"));
-      result.append(instance_class);
-      object none;
-      object getinitargs = getattr(instance_obj, "__getinitargs__", none);
-      tuple initargs;
-      if (getinitargs.ptr() != none.ptr()) {
-          initargs = tuple(getinitargs());
-      }
-      result.append(initargs);
-      object getstate = getattr(instance_obj, "__getstate__", none);
-      object instance_dict = getattr(instance_obj, "__dict__", none);
-      long len_instance_dict = 0;
-      if (instance_dict.ptr() != none.ptr()) {
-          len_instance_dict = len(instance_dict);
-      }
-      if (getstate.ptr() != none.ptr()) {
-          if (len_instance_dict > 0) {
-              object getstate_manages_dict = getattr(
-                instance_obj, "__getstate_manages_dict__", none);
-              if (getstate_manages_dict.ptr() == none.ptr()) {
-                  PyErr_SetString(PyExc_RuntimeError,
-                    "Incomplete pickle support"
-                    " (__getstate_manages_dict__ not set)");
-                  throw_error_already_set();
-              }
-          }
-          result.append(getstate());
-      }
-      else if (len_instance_dict > 0) {
-          result.append(instance_dict);
-      }
-      return tuple(result);
-  }
-
-} // namespace
-
-object const& make_instance_reduce_function()
-{
-    static object result(&instance_reduce);
-    return result;
-}
-
-}} // namespace boost::python
diff --git a/src/object_operators.cpp b/src/object_operators.cpp
deleted file mode 100644
index 40cdeba3..00000000
--- a/src/object_operators.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/object_operators.hpp>
-#include <boost/python/detail/raw_pyobject.hpp>
-
-namespace boost { namespace python { namespace api {
-
-#define BOOST_PYTHON_BINARY_OPERATOR(op, name)                          \
-BOOST_PYTHON_DECL object operator op(object const& l, object const& r)  \
-{                                                                       \
-    return object(                                                      \
-        detail::new_reference(                                          \
-            PyNumber_##name(l.ptr(), r.ptr()))                          \
-        );                                                              \
-}
-
-BOOST_PYTHON_BINARY_OPERATOR(+, Add)
-BOOST_PYTHON_BINARY_OPERATOR(-, Subtract)
-BOOST_PYTHON_BINARY_OPERATOR(*, Multiply)
-BOOST_PYTHON_BINARY_OPERATOR(/, Divide)
-BOOST_PYTHON_BINARY_OPERATOR(%, Remainder)
-BOOST_PYTHON_BINARY_OPERATOR(<<, Lshift)
-BOOST_PYTHON_BINARY_OPERATOR(>>, Rshift)
-BOOST_PYTHON_BINARY_OPERATOR(&, And)
-BOOST_PYTHON_BINARY_OPERATOR(^, Xor)
-BOOST_PYTHON_BINARY_OPERATOR(|, Or)
-#undef BOOST_PYTHON_BINARY_OPERATOR
-
-#define BOOST_PYTHON_INPLACE_OPERATOR(op, name)                         \
-BOOST_PYTHON_DECL object& operator op##=(object& l, object const& r)    \
-{                                                                       \
-    return l = object(                                                  \
-        (detail::new_reference)                                         \
-            PyNumber_InPlace##name(l.ptr(), r.ptr()));                  \
-}
-    
-BOOST_PYTHON_INPLACE_OPERATOR(+, Add)
-BOOST_PYTHON_INPLACE_OPERATOR(-, Subtract)
-BOOST_PYTHON_INPLACE_OPERATOR(*, Multiply)
-BOOST_PYTHON_INPLACE_OPERATOR(/, Divide)
-BOOST_PYTHON_INPLACE_OPERATOR(%, Remainder)
-BOOST_PYTHON_INPLACE_OPERATOR(<<, Lshift)
-BOOST_PYTHON_INPLACE_OPERATOR(>>, Rshift)
-BOOST_PYTHON_INPLACE_OPERATOR(&, And)
-BOOST_PYTHON_INPLACE_OPERATOR(^, Xor)
-BOOST_PYTHON_INPLACE_OPERATOR(|, Or)
-#undef BOOST_PYTHON_INPLACE_OPERATOR
-
-object::object(handle<> const& x)
-     : object_base(python::incref(python::expect_non_null(x.get())))
-{}
-
-}}} // namespace boost::python
diff --git a/src/object_protocol.cpp b/src/object_protocol.cpp
deleted file mode 100755
index 11979f8f..00000000
--- a/src/object_protocol.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/object_protocol.hpp>
-#include <boost/python/errors.hpp>
-#include <boost/python/object.hpp>
-
-namespace boost { namespace python { namespace api {
-
-BOOST_PYTHON_DECL object getattr(object const& target, object const& key)
-{
-    return object(detail::new_reference(PyObject_GetAttr(target.ptr(), key.ptr())));
-}
-    
-BOOST_PYTHON_DECL object getattr(object const& target, object const& key, object const& default_)
-{
-    PyObject* result = PyObject_GetAttr(target.ptr(), key.ptr());
-    if (result == NULL && PyErr_ExceptionMatches(PyExc_AttributeError))
-    {
-        PyErr_Clear();
-        return default_;
-    }
-    return object(detail::new_reference(result));
-}
-        
-BOOST_PYTHON_DECL void setattr(object const& target, object const& key, object const& value)
-{
-    if (PyObject_SetAttr(target.ptr(), key.ptr(), value.ptr()) == -1)
-        throw_error_already_set();
-}
-
-BOOST_PYTHON_DECL void delattr(object const& target, object const& key)
-{
-    if (PyObject_DelAttr(target.ptr(), key.ptr()) == -1)
-        throw_error_already_set();
-}
-
-BOOST_PYTHON_DECL object getattr(object const& target, char const* key)
-{
-    return object(
-        detail::new_reference(
-            PyObject_GetAttrString(target.ptr(), const_cast<char*>(key))
-        ));
-}
-    
-BOOST_PYTHON_DECL object getattr(object const& target, char const* key, object const& default_)
-{
-    PyObject* result = PyObject_GetAttrString(target.ptr(), const_cast<char*>(key));
-    if (result == NULL && PyErr_ExceptionMatches(PyExc_AttributeError))
-    {
-        PyErr_Clear();
-        return default_;
-    }
-    return object(detail::new_reference(result));
-    
-}
-BOOST_PYTHON_DECL void setattr(object const& target, char const* key, object const& value)
-{
-    if (PyObject_SetAttrString(
-            target.ptr(), const_cast<char*>(key), value.ptr()) == -1
-        )
-    {
-        throw_error_already_set();
-    }
-}
-
-BOOST_PYTHON_DECL void delattr(object const& target, char const* key)
-{
-    if (PyObject_DelAttrString(
-            target.ptr(), const_cast<char*>(key)) == -1
-        )
-    {
-        throw_error_already_set();
-    }
-}
-
-BOOST_PYTHON_DECL object getitem(object const& target, object const& key)
-{
-    return object(detail::new_reference(
-                      PyObject_GetItem(target.ptr(), key.ptr())));
-}
-    
-BOOST_PYTHON_DECL void setitem(object const& target, object const& key, object const& value)
-{
-    if (PyObject_SetItem(target.ptr(), key.ptr(), value.ptr()) == -1)
-        throw_error_already_set();
-}
-    
-BOOST_PYTHON_DECL void delitem(object const& target, object const& key)
-{
-    if (PyObject_DelItem(target.ptr(), key.ptr()) == -1)
-        throw_error_already_set();
-}
-
-namespace // slicing code copied directly out of the Python implementation
-{
-  #undef ISINT
-  #define ISINT(x) ((x) == NULL || PyInt_Check(x) || PyLong_Check(x))
-
-  static PyObject *
-  apply_slice(PyObject *u, PyObject *v, PyObject *w) /* return u[v:w] */
-  {
-      PyTypeObject *tp = u->ob_type;
-      PySequenceMethods *sq = tp->tp_as_sequence;
-
-      if (sq && sq->sq_slice && ISINT(v) && ISINT(w)) {
-          int ilow = 0, ihigh = INT_MAX;
-          if (!_PyEval_SliceIndex(v, &ilow))
-              return NULL;
-          if (!_PyEval_SliceIndex(w, &ihigh))
-              return NULL;
-          return PySequence_GetSlice(u, ilow, ihigh);
-      }
-      else {
-          PyObject *slice = PySlice_New(v, w, NULL);
-          if (slice != NULL) {
-              PyObject *res = PyObject_GetItem(u, slice);
-              Py_DECREF(slice);
-              return res;
-          }
-          else
-              return NULL;
-      }
-  }
-
-  static int
-  assign_slice(PyObject *u, PyObject *v, PyObject *w, PyObject *x)
-      /* u[v:w] = x */
-  {
-      PyTypeObject *tp = u->ob_type;
-      PySequenceMethods *sq = tp->tp_as_sequence;
-
-      if (sq && sq->sq_slice && ISINT(v) && ISINT(w)) {
-          int ilow = 0, ihigh = INT_MAX;
-          if (!_PyEval_SliceIndex(v, &ilow))
-              return -1;
-          if (!_PyEval_SliceIndex(w, &ihigh))
-              return -1;
-          if (x == NULL)
-              return PySequence_DelSlice(u, ilow, ihigh);
-          else
-              return PySequence_SetSlice(u, ilow, ihigh, x);
-      }
-      else {
-          PyObject *slice = PySlice_New(v, w, NULL);
-          if (slice != NULL) {
-              int res;
-              if (x != NULL)
-                  res = PyObject_SetItem(u, slice, x);
-              else
-                  res = PyObject_DelItem(u, slice);
-              Py_DECREF(slice);
-              return res;
-          }
-          else
-              return -1;
-      }
-  }
-}
-
-BOOST_PYTHON_DECL object getslice(object const& target, handle<> const& begin, handle<> const& end)
-{
-    return object(
-        detail::new_reference(
-            apply_slice(target.ptr(), begin.get(), end.get())));
-}
-
-BOOST_PYTHON_DECL void setslice(object const& target, handle<> const& begin, handle<> const& end, object const& value)
-{
-    if (assign_slice(
-            target.ptr(), begin.get(), end.get(), value.ptr()) == -1
-        )
-    {
-        throw_error_already_set();
-    }
-}
-
-BOOST_PYTHON_DECL void delslice(object const& target, handle<> const& begin, handle<> const& end)
-{
-    if (assign_slice(
-            target.ptr(), begin.get(), end.get(), 0) == -1
-        )
-    {
-        throw_error_already_set();
-    }
-}
-
-}}} // namespace boost::python::api
diff --git a/src/str.cpp b/src/str.cpp
deleted file mode 100644
index c2d41a8e..00000000
--- a/src/str.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-#include <boost/python/str.hpp>
-#include <boost/python/extract.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-detail::new_reference str_base::call(object const& arg_)
-{
-    return (detail::new_reference)PyObject_CallFunction(
-        (PyObject*)&PyString_Type, "(O)", 
-        arg_.ptr());
-} 
-
-str_base::str_base()
-  : object(detail::new_reference(::PyString_FromString("")))
-{}
-
-str_base::str_base(const char* s)
-  : object(detail::new_reference(::PyString_FromString(s)))
-{}
-
-str_base::str_base(char const* start, char const* finish)
-    : object(
-        detail::new_reference(
-            ::PyString_FromStringAndSize(start, finish - start)
-        )
-    )
-{}
-
-str_base::str_base(char const* start, std::size_t length) // new str
-    : object(
-        detail::new_reference(
-            ::PyString_FromStringAndSize(start, length)
-        )
-    )
-{}
-
-str_base::str_base(object_cref other)
-    : object(str_base::call(other))
-{}
-
-#define BOOST_PYTHON_FORMAT_OBJECT(z, n, data) "O"
-#define BOOST_PYTHON_OBJECT_PTR(z, n, data) , x##n .ptr()
-
-#define BOOST_PYTHON_DEFINE_STR_METHOD(name, arity)                             \
-str str_base:: name ( BOOST_PP_ENUM_PARAMS(arity, object_cref x) ) const        \
-{                                                                               \
-    return str(new_reference(                                                   \
-       expect_non_null(                                                         \
-           PyObject_CallMethod(                                                 \
-               this->ptr(), #name,                                              \
-              "(" BOOST_PP_REPEAT(arity, BOOST_PYTHON_FORMAT_OBJECT, _) ")"     \
-               BOOST_PP_REPEAT_1(arity, BOOST_PYTHON_OBJECT_PTR, _)))));        \
-}
-
-BOOST_PYTHON_DEFINE_STR_METHOD(capitalize, 0)
-BOOST_PYTHON_DEFINE_STR_METHOD(center, 1)
-
-long str_base::count(object_cref sub) const
-{
-    return extract<long>(this->attr("count")(sub));
-}
-
-long str_base::count(object_cref sub, object_cref start) const
-{
-    return extract<long>(this->attr("count")(sub,start));
-}
-
-long str_base::count(object_cref sub, object_cref start, object_cref end) const
-{
-    return extract<long>(this->attr("count")(sub,start,end));
-}
-
-object str_base::decode() const
-{
-    return this->attr("decode")();
-}
-
-object str_base::decode(object_cref encoding) const
-{
-    return this->attr("decode")(encoding);
-}
-
-object str_base::decode(object_cref encoding, object_cref errors) const
-{
-    return this->attr("decode")(encoding,errors);
-}
-
-object str_base::encode() const
-{
-    return this->attr("encode")();
-}
-
-object str_base::encode(object_cref encoding) const
-{
-    return this->attr("encode")(encoding);
-}
-
-object str_base::encode(object_cref encoding, object_cref errors) const
-{
-    return this->attr("encode")(encoding,errors);
-}
-
-bool str_base::endswith(object_cref suffix) const
-{
-    bool result = PyInt_AsLong(this->attr("endswith")(suffix).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-BOOST_PYTHON_DEFINE_STR_METHOD(expandtabs, 0)
-BOOST_PYTHON_DEFINE_STR_METHOD(expandtabs, 1)
-
-long str_base::find(object_cref sub) const
-{
-    long result = PyInt_AsLong(this->attr("find")(sub).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-long str_base::find(object_cref sub, object_cref start) const
-{
-    long result = PyInt_AsLong(this->attr("find")(sub,start).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-long str_base::find(object_cref sub, object_cref start, object_cref end) const
-{
-    long result = PyInt_AsLong(this->attr("find")(sub,start,end).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-long str_base::index(object_cref sub) const
-{
-    long result = PyInt_AsLong(this->attr("index")(sub).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-long str_base::index(object_cref sub, object_cref start) const
-{
-    long result = PyInt_AsLong(this->attr("index")(sub,start).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-long str_base::index(object_cref sub, object_cref start, object_cref end) const
-{
-    long result = PyInt_AsLong(this->attr("index")(sub,start,end).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-bool str_base::isalnum() const
-{
-    bool result = PyInt_AsLong(this->attr("isalnum")().ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-bool str_base::isalpha() const
-{
-    bool result = PyInt_AsLong(this->attr("isalpha")().ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-bool str_base::isdigit() const
-{
-    bool result = PyInt_AsLong(this->attr("isdigit")().ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-bool str_base::islower() const
-{
-    bool result = PyInt_AsLong(this->attr("islower")().ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-bool str_base::isspace() const
-{
-    bool result = PyInt_AsLong(this->attr("isspace")().ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-bool str_base::istitle() const
-{
-    bool result = PyInt_AsLong(this->attr("istitle")().ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-bool str_base::isupper() const
-{
-    bool result = PyInt_AsLong(this->attr("isupper")().ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-BOOST_PYTHON_DEFINE_STR_METHOD(join, 1)
-BOOST_PYTHON_DEFINE_STR_METHOD(ljust, 1)
-BOOST_PYTHON_DEFINE_STR_METHOD(lower, 0)
-BOOST_PYTHON_DEFINE_STR_METHOD(lstrip, 0)
-BOOST_PYTHON_DEFINE_STR_METHOD(replace, 2)
-BOOST_PYTHON_DEFINE_STR_METHOD(replace, 3)
-
-long str_base::rfind(object_cref sub) const
-{
-    long result = PyInt_AsLong(this->attr("rfind")(sub).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-long str_base::rfind(object_cref sub, object_cref start) const
-{
-    long result = PyInt_AsLong(this->attr("rfind")(sub,start).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-long str_base::rfind(object_cref sub, object_cref start, object_cref end) const
-{
-    long result = PyInt_AsLong(this->attr("rfind")(sub,start,end).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-long str_base::rindex(object_cref sub) const
-{
-    long result = PyInt_AsLong(this->attr("rindex")(sub).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-long str_base::rindex(object_cref sub, object_cref start) const
-{
-    long result = PyInt_AsLong(this->attr("rindex")(sub,start).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-long str_base::rindex(object_cref sub, object_cref start, object_cref end) const
-{
-    long result = PyInt_AsLong(this->attr("rindex")(sub,start,end).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-BOOST_PYTHON_DEFINE_STR_METHOD(rjust, 1)
-BOOST_PYTHON_DEFINE_STR_METHOD(rstrip, 0)
-
-list str_base::split() const
-{
-    return list(this->attr("split")());
-}
-
-list str_base::split(object_cref sep) const
-{
-    return list(this->attr("split")(sep));
-}
-
-list str_base::split(object_cref sep, object_cref maxsplit) const
-{
-    return list(this->attr("split")(sep,maxsplit));
-}
-
-list str_base::splitlines() const
-{
-    return list(this->attr("splitlines")());
-}
-
-list str_base::splitlines(object_cref keepends) const
-{
-    return list(this->attr("splitlines")(keepends));
-}
-
-bool str_base::startswith(object_cref prefix) const
-{
-    bool result = PyInt_AsLong(this->attr("startswith")(prefix).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-bool str_base::startswith(object_cref prefix, object_cref start) const
-{
-    bool result = PyInt_AsLong(this->attr("startswith")(prefix,start).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-bool str_base::startswith(object_cref prefix, object_cref start, object_cref end) const
-{
-    bool result = PyInt_AsLong(this->attr("startswith")(prefix,start,end).ptr());
-    if (PyErr_Occurred())
-        throw_error_already_set();
-    return result;
-}
-
-BOOST_PYTHON_DEFINE_STR_METHOD(strip, 0)
-BOOST_PYTHON_DEFINE_STR_METHOD(swapcase, 0)
-BOOST_PYTHON_DEFINE_STR_METHOD(title, 0)
-BOOST_PYTHON_DEFINE_STR_METHOD(translate, 1)
-BOOST_PYTHON_DEFINE_STR_METHOD(translate, 2)
-BOOST_PYTHON_DEFINE_STR_METHOD(upper, 0)
-    
-}}}  // namespace boost::python
diff --git a/src/tuple.cpp b/src/tuple.cpp
deleted file mode 100644
index 2762ab27..00000000
--- a/src/tuple.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <boost/python/tuple.hpp>
-
-namespace boost { namespace python { namespace detail {
-
-detail::new_reference tuple_base::call(object const& arg_)
-{
-    return (detail::new_reference)PyObject_CallFunction(
-        (PyObject*)&PyTuple_Type, "(O)", 
-        arg_.ptr());
-}
-    
-tuple_base::tuple_base()
-    : object(detail::new_reference(PyTuple_New(0)))
-{}
-    
-tuple_base::tuple_base(object_cref sequence)
-    : object(call(sequence))
-{}
-
-}}}  // namespace boost::python
diff --git a/test/Jamfile b/test/Jamfile
deleted file mode 100644
index af1bec54..00000000
--- a/test/Jamfile
+++ /dev/null
@@ -1,201 +0,0 @@
-#
-# To run all tests quietly: jam test
-# To run all tests with verbose output: jam -sPYTHON_TEST_ARGS=-v test
-#
-subproject libs/python/test ;
-
-# bring in the rules for python and testing
-import python testing ;
-
-# Convenience rule makes declaring tests faster
-rule bpl-test ( name ? : files * : requirements * )
-{
-    files ?= $(name).py $(name).cpp ;
-
-    local modules ;
-    local py ;
-    for local f in $(files)
-    {
-        if $(f:S) = .py
-        {
-            if $(py)
-            {
-                EXIT too many python drivers specified: "$(py)" "$(f)" ;
-            }
-            py = $(f) ;
-        }
-    }
-
-    name ?= $(py:S=) ;
-
-    for local f in $(files)
-    {
-        if $(f:S) != .py
-        {
-            local m = $(f:S=) ;
-
-            if $(m) = $(py:S=)
-            {
-                m = $(name) ;
-
-                if $(m) = $(py:S=)
-                {
-                    m = $(m)_ext ;
-                }
-            }
-            extension $(m) : $(f) <dll>../build/boost_python : $(requirements) ;
-            modules += $(m) ;
-        }
-    }
-
-    boost-python-runtest $(name) : $(py) <pyd>$(modules) ;
-}
-
-run ../test/embedding.cpp <lib>../build/boost_python
-  : # program args
-  : # input files
-  : # requirements
-  $(PYTHON_PROPERTIES)
-    <define>BOOST_PYTHON_STATIC_LIB
-    <define>BOOST_PYTHON_STATIC_MODULE
-    <library-path>$(PYTHON_LIB_PATH)
-      <$(gcc-compilers)><debug-python><library-path>$(CYGWIN_PYTHON_DEBUG_DLL_PATH)
-        <$(gcc-compilers)><*><library-path>$(CYGWIN_PYTHON_DLL_PATH)
-          <find-library>$(PYTHON_EMBEDDED_LIBRARY) ;
-
-bpl-test crossmod_exception
-  : crossmod_exception.py crossmod_exception_a.cpp crossmod_exception_b.cpp
-  ;
-
-bpl-test injected ;
-bpl-test properties ;
-bpl-test return_arg ;
-bpl-test staticmethod ;
-bpl-test shared_ptr ;
-bpl-test polymorphism ;
-bpl-test auto_ptr ;
-bpl-test minimal ;
-bpl-test args ;
-bpl-test numpy ;
-bpl-test enum ;
-bpl-test exception_translator ;
-bpl-test pearu1 : test_cltree.py cltree.cpp ;
-bpl-test try : newtest.py m1.cpp m2.cpp ;
-
-bpl-test keywords : keywords.cpp keywords_test.py ;
-
-extension builtin_converters : test_builtin_converters.cpp <dll>../build/boost_python ;
-boost-python-runtest builtin_converters : test_builtin_converters.py <pyd>builtin_converters  ;
-
-bpl-test test_pointer_adoption ;
-bpl-test operators ;
-bpl-test callbacks ;
-bpl-test defaults ;
-
-bpl-test object ;
-bpl-test list ;
-bpl-test long ;
-bpl-test dict ;
-bpl-test tuple ;
-bpl-test str ;
-
-bpl-test virtual_functions ;
-bpl-test back_reference ;
-bpl-test implicit ;
-bpl-test data_members ;
-
-bpl-test ben_scott1 ;
-
-bpl-test bienstman1 ;
-bpl-test bienstman2 ;
-bpl-test bienstman3 ;
-
-# A bug in the Win32 intel compilers causes compilation of one of our
-# tests to take forever when debug symbols are enabled. This rule
-# turns them off when added to the requirements section
-rule turn-off-intel-debug-symbols ( toolset variant : properties * )
-{
-    if $(NT) && [ MATCH (.*intel.*) : $(toolset) ]
-    {
-        properties = [ difference $(properties) : <debug-symbols>on ] <debug-symbols>off ;
-    }
-    return $(properties) ;
-}
-  
-bpl-test multi_arg_constructor
-  : # files
-  : # requirements
-  turn-off-intel-debug-symbols ; # debug symbols slow the build down too much
-
-bpl-test iterator : iterator.py iterator.cpp input_iterator.cpp ;
-
-bpl-test extract ;
-
-bpl-test opaque ;
-
-bpl-test pickle1 ;
-bpl-test pickle2 ;
-bpl-test pickle3 ;
-
-bpl-test nested ;
-
-bpl-test docstring ;
-
-bpl-test vector_indexing_suite ;
-bpl-test map_indexing_suite ;
-
-if $(TEST_BIENSTMAN_NON_BUGS)
-{
-    bpl-test bienstman4 ;
-    bpl-test bienstman5 ;
-}
-
-# --- unit tests of library components ---
-
-local UNIT_TEST_PROPERTIES = $(PYTHON_PROPERTIES) <define>BOOST_PYTHON_SUPPRESS_REGISTRY_INITIALIZATION
-  [ difference $(PYTHON_PROPERTIES) : <define>BOOST_PYTHON_DYNAMIC_LIB ] <define>BOOST_PYTHON_STATIC_LIB ;
-
-run indirect_traits_test.cpp ;
-run destroy_test.cpp ;
-run pointer_type_id_test.cpp  <lib>../../test/build/boost_test_exec_monitor : : : $(UNIT_TEST_PROPERTIES) ;
-run bases.cpp : : : $(UNIT_TEST_PROPERTIES) ;
-run if_else.cpp ;
-run pointee.cpp : : : $(UNIT_TEST_PROPERTIES) ;
-run result.cpp ;
-
-compile string_literal.cpp ;
-compile borrowed.cpp : $(UNIT_TEST_PROPERTIES) ;
-compile object_manager.cpp : $(UNIT_TEST_PROPERTIES) ;
-compile copy_ctor_mutates_rhs.cpp : $(UNIT_TEST_PROPERTIES) ;
-
-run upcast.cpp  <lib>../../test/build/boost_test_exec_monitor
-  : # command-line args
-  : # input files
-  : $(UNIT_TEST_PROPERTIES)
-    ;
-
-run select_holder.cpp  <lib>../../test/build/boost_test_exec_monitor
-  : # command-line args
-  : # input files
-  : $(UNIT_TEST_PROPERTIES)
-    ;
-
-
-run select_from_python_test.cpp ../src/converter/type_id.cpp  <lib>../../test/build/boost_test_exec_monitor
-  : # command-line args
-  : # input files
-  : $(UNIT_TEST_PROPERTIES)
-    ;
-
-run select_arg_to_python_test.cpp ../src/converter/type_id.cpp  <lib>../../test/build/boost_test_exec_monitor
-  : # command-line args
-  : # input files
-  : $(UNIT_TEST_PROPERTIES)
-    ;
-
-compile-fail ./raw_pyobject_fail1.cpp : $(PYTHON_PROPERTIES) ;
-compile-fail ./raw_pyobject_fail2.cpp : $(PYTHON_PROPERTIES) ;
-compile-fail ./as_to_python_function.cpp : $(PYTHON_PROPERTIES) ;
-compile-fail ./object_fail1.cpp : $(PYTHON_PROPERTIES) ;
-
-
diff --git a/test/args.cpp b/test/args.cpp
deleted file mode 100644
index c494b9d7..00000000
--- a/test/args.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/args.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/overloads.hpp>
-#include <boost/python/raw_function.hpp>
-#include <boost/python/return_internal_reference.hpp>
-#include "test_class.hpp"
-
-using namespace boost::python;
-
-tuple f(int x = 1, double y = 4.25, char const* z = "wow")
-{
-    return make_tuple(x, y, z);
-}
-
-BOOST_PYTHON_FUNCTION_OVERLOADS(f_overloads, f, 0, 3)
-    
-typedef test_class<> Y;
-
-struct X
-{
-    X(int a0 = 0, int a1 = 1) : inner0(a0), inner1(a1) {}
-    tuple f(int x = 1, double y = 4.25, char const* z = "wow")
-    {
-        return make_tuple(x, y, z);
-    }
-
-    Y const& inner(bool n) const { return n ? inner1 : inner0; }
-    
-    Y inner0;
-    Y inner1;
-};
-
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_f_overloads, X::f, 0, 3)
-
-
-tuple raw_func(tuple args, dict kw)
-{
-    return make_tuple(args, kw);
-}
-
-BOOST_PYTHON_MODULE(args_ext)
-{
-    def("f", f, args("x", "y", "z")
-        , "This is f's docstring"
-        );
-
-    def("raw", raw_function(raw_func));
-    
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1200
-    // MSVC6 gives a fatal error LNK1179: invalid or corrupt file:
-    // duplicate comdat error if we try to re-use the exact type of f
-    // here, so substitute long for int.
-    tuple (*f)(long,double,char const*) = 0;
-#endif 
-    def("f1", f, f_overloads("f1's docstring", args("x", "y", "z")));
-    def("f2", f, f_overloads(args("x", "y", "z")));
-    def("f3", f, f_overloads(args("x", "y", "z"), "f3's docstring"));
-    
-    class_<Y>("Y", init<int>(args("value"), "Y's docstring"))
-        .def("value", &Y::value)
-        .def("raw", raw_function(raw_func))
-        ;
-            
-    class_<X>("X", "This is X's docstring")
-        .def(init<int, optional<int> >(args("a0", "a1")))
-        .def("f", &X::f
-             , "This is X.f's docstring"
-             , args("x", "y", "z"))
-
-        // Just to prove that all the different argument combinations work
-        .def("inner0", &X::inner, return_internal_reference<>(), args("n"), "docstring")
-        .def("inner1", &X::inner, return_internal_reference<>(), "docstring", args("n"))
-
-        .def("inner2", &X::inner, args("n"), return_internal_reference<>(), "docstring")
-        .def("inner3", &X::inner, "docstring", return_internal_reference<>(), args("n"))
-
-        .def("inner4", &X::inner, args("n"), "docstring", return_internal_reference<>())
-        .def("inner5", &X::inner, "docstring", args("n"), return_internal_reference<>())
-
-        .def("f1", &X::f, X_f_overloads(args("x", "y", "z")))
-        ;
-
-    def("inner", &X::inner, "docstring", args("self", "n"), return_internal_reference<>());
-}
-
-#include "module_tail.cpp"
diff --git a/test/args.py b/test/args.py
deleted file mode 100644
index 6cb66226..00000000
--- a/test/args.py
+++ /dev/null
@@ -1,179 +0,0 @@
-"""
->>> from args_ext import *
-
->>> raw(3, 4, foo = 'bar', baz = 42)
-((3, 4), {'foo': 'bar', 'baz': 42})
-
-   Prove that we can handle empty keywords and non-keywords
-   
->>> raw(3, 4)
-((3, 4), {})
-
->>> raw(foo = 'bar')
-((), {'foo': 'bar'})
-
->>> f(x= 1, y = 3, z = 'hello')
-(1, 3.0, 'hello')
-
->>> f(z = 'hello', x = 3, y = 2.5)
-(3, 2.5, 'hello')
-
->>> f(1, z = 'hi', y = 3)
-(1, 3.0, 'hi')
-
->>> try: f(1, 2, 'hello', bar = 'baz')
-... except TypeError: pass
-... else: print 'expected an exception: unknown keyword'
-
-
-   Exercise the functions using default stubs
-
->>> f1(z = 'nix', y = .125, x = 2)
-(2, 0.125, 'nix')
->>> f1(y = .125, x = 2)
-(2, 0.125, 'wow')
->>> f1(x = 2)
-(2, 4.25, 'wow')
->>> f1()
-(1, 4.25, 'wow')
-
->>> f2(z = 'nix', y = .125, x = 2)
-(2, 0.125, 'nix')
->>> f2(y = .125, x = 2)
-(2, 0.125, 'wow')
->>> f2(x = 2)
-(2, 4.25, 'wow')
->>> f2()
-(1, 4.25, 'wow')
-
->>> f3(z = 'nix', y = .125, x = 2)
-(2, 0.125, 'nix')
->>> f3(y = .125, x = 2)
-(2, 0.125, 'wow')
->>> f3(x = 2)
-(2, 4.25, 'wow')
->>> f3()
-(1, 4.25, 'wow')
-
-   Member function tests
-
->>> q = X()
->>> q.f(x= 1, y = 3, z = 'hello')
-(1, 3.0, 'hello')
-
->>> q.f(z = 'hello', x = 3, y = 2.5)
-(3, 2.5, 'hello')
-
->>> q.f(1, z = 'hi', y = 3)
-(1, 3.0, 'hi')
-
->>> try: q.f(1, 2, 'hello', bar = 'baz')
-... except TypeError: pass
-... else: print 'expected an exception: unknown keyword'
-
-   Exercise member functions using default stubs
-   
->>> q.f1(z = 'nix', y = .125, x = 2)
-(2, 0.125, 'nix')
->>> q.f1(y = .125, x = 2)
-(2, 0.125, 'wow')
->>> q.f1(x = 2)
-(2, 4.25, 'wow')
->>> q.f1()
-(1, 4.25, 'wow')
-
->>> X.f.__doc__
-"This is X.f's docstring"
-
->>> xfuncs = (X.inner0, X.inner1, X.inner2, X.inner3, X.inner4, X.inner5)
->>> for f in xfuncs:
-...    print f(q,1).value(),
-...    print f(q, n = 1).value(),
-...    print f(q, n = 0).value(),
-...    print f.__doc__
-1 1 0 docstring
-1 1 0 docstring
-1 1 0 docstring
-1 1 0 docstring
-1 1 0 docstring
-1 1 0 docstring
-
->>> x = X(a1 = 44, a0 = 22)
->>> x.inner0(0).value()
-22
->>> x.inner0(1).value()
-44
-
->>> x = X(a0 = 7)
->>> x.inner0(0).value()
-7
->>> x.inner0(1).value()
-1
-
->>> inner(n = 1, self = q).value()
-1
-
->>> y = Y(value = 33)
->>> y.raw(this = 1, that = 'the other')[1]
-{'this': 1, 'that': 'the other'}
-
-"""
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/as_to_python_function.cpp b/test/as_to_python_function.cpp
deleted file mode 100644
index 814749d1..00000000
--- a/test/as_to_python_function.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/converter/to_python_function_type.hpp>
-
-struct hopefully_illegal
-{
-    static PyObject* convert(int&);
-};
-
-PyObject* x = boost::python::converter::as_to_python_function<int, hopefully_illegal>::convert(0);
diff --git a/test/auto_ptr.cpp b/test/auto_ptr.cpp
deleted file mode 100644
index 22e2df73..00000000
--- a/test/auto_ptr.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/extract.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/implicit.hpp>
-
-#include <boost/detail/workaround.hpp>
-
-#include "test_class.hpp"
-#include <memory>
-
-using namespace boost::python;
-
-typedef test_class<> X;
-
-struct Y : X
-{
-    Y(int n) : X(n) {};
-};
-
-int look(std::auto_ptr<X> const& x)
-{
-    return (x.get()) ? x->value() : -1;
-}
-
-int steal(std::auto_ptr<X> x)
-{
-    return x->value();
-}
-
-int maybe_steal(std::auto_ptr<X>& x, bool doit)
-{
-    int n = x->value();
-    if (doit)
-        x.release();
-    return n;
-}
-
-std::auto_ptr<X> make()
-{
-    return std::auto_ptr<X>(new X(77));
-}
-
-std::auto_ptr<X> callback(object f)
-{
-    std::auto_ptr<X> x(new X(77));
-    return call<std::auto_ptr<X> >(f.ptr(), x);
-}
-
-std::auto_ptr<X> extract_(object o)
-{
-    return extract<std::auto_ptr<X>&>(o)
-#if BOOST_MSVC <= 1300
-        ()
-#endif 
-        ;
-}
-
-BOOST_PYTHON_MODULE(auto_ptr_ext)
-{
-    class_<X, std::auto_ptr<X>, boost::noncopyable>("X", init<int>())
-        .def("value", &X::value)
-        ;
-    
-    class_<Y, std::auto_ptr<Y>, bases<X>, boost::noncopyable>("Y", init<int>())
-        ;
-
-    // VC6 auto_ptrs do not have converting constructors    
-#if BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, < 306)
-    scope().attr("broken_auto_ptr") = 1;
-#else
-    scope().attr("broken_auto_ptr") = 0;
-    implicitly_convertible<std::auto_ptr<Y>, std::auto_ptr<X> >();
-#endif
-    
-    def("look", look);
-    def("steal", steal);
-    def("maybe_steal", maybe_steal);
-    def("make", make);
-    def("callback", callback);
-    def("extract", extract_);
-}
-
-#include "module_tail.cpp"
-
diff --git a/test/auto_ptr.py b/test/auto_ptr.py
deleted file mode 100644
index d8e416e9..00000000
--- a/test/auto_ptr.py
+++ /dev/null
@@ -1,79 +0,0 @@
-'''
->>> from auto_ptr_ext import *
->>> x = X(42)
->>> x.value()
-42
->>> look(x), look(x)
-(42, 42)
-
->>> maybe_steal(x, 0)
-42
->>> look(x)
-42
-
->>> maybe_steal(x, 1)
-42
->>> broken_auto_ptr and -1 or look(x)
--1
-
->>> x = X(69)
->>> steal(x)
-69
->>> broken_auto_ptr and -1 or look(x)
--1
-
->>> if not broken_auto_ptr:
-...     try: x.value()
-...     except TypeError: pass
-...     else: print 'expected a TypeError exception'
-
->>> x = make()
->>> look(x)
-77
-
->>> z = callback(lambda z: z)
->>> z.value()
-77
-
->>> extract(x).value()
-77
-
-#
-# Test derived to base conversions
-#
-
->>> y = Y(42)
->>> y.value()
-42
-
->>> try: maybe_steal(y, 0)
-... except TypeError: pass
-... else: print 'expected a TypeError exception'
-
->>> y.value()
-42
-
->>> broken_auto_ptr and 42 or steal(y)
-42
-
->>> if not broken_auto_ptr:
-...     try: y.value()
-...     except TypeError: pass
-...     else: print 'expected a TypeError exception'
-
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/back_reference.cpp b/test/back_reference.cpp
deleted file mode 100644
index f2545f57..00000000
--- a/test/back_reference.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/class.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/has_back_reference.hpp>
-#include <boost/python/back_reference.hpp>
-#include <boost/ref.hpp>
-#include <boost/utility.hpp>
-#include <memory>
-#include <cassert>
-#include <boost/python/copy_const_reference.hpp>
-#include <boost/python/return_value_policy.hpp>
-#include <boost/mpl/bool.hpp>
-
-// This test shows that a class can be wrapped "as itself" but also
-// acquire a back-reference iff has_back_reference<> is appropriately
-// specialized.
-using namespace boost::python;
-
-struct X
-{
-    explicit X(int x) : x(x), magic(7654321) { ++counter; }
-    X(X const& rhs) : x(rhs.x), magic(7654321) { ++counter; }
-    virtual ~X() { assert(magic == 7654321); magic = 6666666; x = 9999; --counter; }
-
-    void set(int x) { assert(magic == 7654321); this->x = x; }
-    int value() const { assert(magic == 7654321); return x; }
-    static int count() { return counter; }
- private:
-    void operator=(X const&);
- private:
-    int x;
-    long magic;
-    static int counter;
-};
-
-int X::counter;
-
-struct Y : X
-{
-    Y(PyObject* self, int x) : X(x) {};
-    Y(PyObject* self, Y const& rhs) : X(rhs), self(self) {};
- private:
-    Y(Y const&);
-    PyObject* self;
-};
-
-struct Z : X
-{
-    Z(PyObject* self, int x) : X(x) {};
-    Z(PyObject* self, Z const& rhs) : X(rhs), self(self) {};
- private:
-    Z(Z const&);
-    PyObject* self;
-};
-
-Y const& copy_Y(Y const& y) { return y; }
-Z const& copy_Z(Z const& z) { return z; }
-
-namespace boost { namespace python
-{
-  template <>
-  struct has_back_reference<Y>
-      : mpl::true_
-  {
-  };
-
-  template <>
-  struct has_back_reference<Z>
-      : mpl::true_
-  {
-  };
-}}
-
-// prove that back_references get initialized with the right PyObject*
-object y_identity(back_reference<Y const&> y)
-{
-    return y.source();
-}
-
-// prove that back_references contain the right value
-bool y_equality(back_reference<Y const&> y1, Y const& y2)
-{
-    return &y1.get() == &y2;
-}
-
-BOOST_PYTHON_MODULE(back_reference_ext)
-{
-    def("copy_Y", copy_Y, return_value_policy<copy_const_reference>());
-    def("copy_Z", copy_Z, return_value_policy<copy_const_reference>());
-    def("x_instances", &X::count);
-    
-    class_<Y>("Y", init<int>())
-        .def("value", &Y::value)
-        .def("set", &Y::set)
-        ;
-
-    class_<Z,std::auto_ptr<Z> >("Z", init<int>())
-        .def("value", &Z::value)
-        .def("set", &Z::set)
-        ;
-
-    def("y_identity", y_identity);
-    def("y_equality", y_equality);
-
-}
-
-#include "module_tail.cpp"
diff --git a/test/back_reference.py b/test/back_reference.py
deleted file mode 100644
index 61a56a62..00000000
--- a/test/back_reference.py
+++ /dev/null
@@ -1,31 +0,0 @@
-'''
->>> from back_reference_ext import *
->>> y = Y(3)
->>> z = Z(4)
->>> x_instances()
-2
->>> y2 = copy_Y(y)
->>> x_instances()
-3
->>> z2 = copy_Z(z)
->>> x_instances()
-4
->>> assert y_identity(y) is y
->>> y_equality(y, y)
-1
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/bases.cpp b/test/bases.cpp
deleted file mode 100644
index e4f91990..00000000
--- a/test/bases.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/bases.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/same_traits.hpp>
-
-struct A;
-struct B;
-
-template <class X, class Y, class Z>
-struct choose_bases
-    : boost::python::detail::select_bases<
-    X
-    , typename boost::python::detail::select_bases<
-        Y
-        , typename boost::python::detail::select_bases<Z>::type
-    >::type>
-{
-    
-};
-
-int main()
-{
-    BOOST_STATIC_ASSERT((boost::python::detail::specifies_bases<
-                         boost::python::bases<A,B> >::value));
-
-    BOOST_STATIC_ASSERT((!boost::python::detail::specifies_bases<
-                         boost::python::bases<A,B>& >::value));
-
-    BOOST_STATIC_ASSERT((!boost::python::detail::specifies_bases<
-                         void* >::value));
-
-    BOOST_STATIC_ASSERT((!boost::python::detail::specifies_bases<
-                         int >::value));
-
-    BOOST_STATIC_ASSERT((!boost::python::detail::specifies_bases<
-                         int[5] >::value));
-
-    typedef boost::python::detail::select_bases<
-        int
-        , boost::python::detail::select_bases<char*>::type > collected1;
-
-    BOOST_STATIC_ASSERT((boost::is_same<collected1::type,boost::python::bases<> >::value));
-    BOOST_STATIC_ASSERT((boost::is_same<choose_bases<int,char*,long>::type,boost::python::bases<> >::value));
-    
-    typedef boost::python::detail::select_bases<
-        int
-        , boost::python::detail::select_bases<
-                boost::python::bases<A,B>
-                , boost::python::detail::select_bases<
-                        A
-            >::type
-         >::type
-     > collected2;
-
-    BOOST_STATIC_ASSERT((boost::is_same<collected2::type,boost::python::bases<A,B> >::value));
-    BOOST_STATIC_ASSERT((boost::is_same<choose_bases<int,boost::python::bases<A,B>,long>::type,boost::python::bases<A,B> >::value));
-    
-    return 0;
-}
diff --git a/test/ben_scott1.cpp b/test/ben_scott1.cpp
deleted file mode 100644
index 3c0d5522..00000000
--- a/test/ben_scott1.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <boost/python.hpp>
-#include <iostream>
-using namespace boost::python;
-using namespace boost;
-
-struct Product {};
-typedef shared_ptr<Product> ProductPtr;
-
-
-struct Creator
-{
-   virtual ~Creator() {}
-   virtual ProductPtr create() = 0;
-};
-
-
-struct Factory
-{
-   void reg(Creator* c) { mC = c; }
-   ProductPtr create()
-   {
-      std::cout << "Name: " << (typeid(*mC)).name() << std::endl;
-      return mC->create();
-   }
-
-private:
-   Creator* mC;
-};
-
-struct CreatorWrap : public Creator
-{
-   CreatorWrap(PyObject* self) : mSelf(self) {}
-   ProductPtr create() { return call_method<ProductPtr>(mSelf, "create"); }
-   PyObject* mSelf;
-};
-
-BOOST_PYTHON_MODULE(ben_scott1_ext)
-{
-   class_<Product, ProductPtr>("Product");
-
-   class_<Creator, CreatorWrap, noncopyable>("Creator")
-       .def("create", &CreatorWrap::create)
-       ;
-
-   class_<Factory>("Factory")
-      .def("reg", &Factory::reg, with_custodian_and_ward<1,2>())
-      .def("create", &Factory::create)
-       ;
-}
-
-#include "../test/module_tail.cpp"
diff --git a/test/ben_scott1.py b/test/ben_scott1.py
deleted file mode 100644
index 1475e3d0..00000000
--- a/test/ben_scott1.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# This regression test checks that call_method<T>(...) where T is a
-# non-reference, non-pointer type that happens to be held inside the
-# result object (and thus is found as an lvalue) works.
-from ben_scott1_ext import *
-
-class CreatorImpl(Creator):
-   def create(self):
-      return Product()
-
-factory = Factory()
-c = CreatorImpl()
-factory.reg(c)
-
-a = factory.create()
diff --git a/test/bienstman1.cpp b/test/bienstman1.cpp
deleted file mode 100644
index 4f3b107d..00000000
--- a/test/bienstman1.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/reference_existing_object.hpp>
-#include <boost/python/return_value_policy.hpp>
-
-struct A {};
-
-struct V 
-{
-
- virtual void f() = 0;
-
- const A* inside() {return &a;}
-
- A a;
-};
-
-const A* outside(const V& v) {return &v.a;}
-
-BOOST_PYTHON_MODULE(bienstman1_ext)
-{
-  using namespace boost::python;
-  using boost::shared_ptr;
-  using boost::python::return_value_policy;
-  using boost::python::reference_existing_object;
-
-  class_<A>("A");
-
-  class_<V, boost::noncopyable>("V", no_init)
-      .def("inside", &V::inside, 
-           return_value_policy<reference_existing_object>())
-      .def("outside", outside, 
-           return_value_policy<reference_existing_object>())
-      ;
-}
-
diff --git a/test/bienstman1.py b/test/bienstman1.py
deleted file mode 100644
index 14773617..00000000
--- a/test/bienstman1.py
+++ /dev/null
@@ -1,20 +0,0 @@
-'''
-# Try to reproduce a Numeric interaction bug if Numeric is installed.
->>> from bienstman1_ext import *
->>> try: from Numeric import *
-... except: pass
-'''
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/bienstman2.cpp b/test/bienstman2.cpp
deleted file mode 100644
index 17ade499..00000000
--- a/test/bienstman2.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-
-struct C {};
-
-struct D {};
-
-struct E
-{
-   const D fe (const C&)           {return D();}
-   const D fe2(const C&, const C&) {return D();}
-};
-
-BOOST_PYTHON_MODULE(bienstman2_ext)
-{
-  using namespace boost::python;
-
-  class_<C>("C");
-  class_<D>("D");
-  class_<E>("E")
-      .def("fe",  &E::fe)  // this compiles.
-      .def("fe2", &E::fe2) // this doesn't... well, now it does ;-)
-      ;
-}
diff --git a/test/bienstman2.py b/test/bienstman2.py
deleted file mode 100644
index b1945331..00000000
--- a/test/bienstman2.py
+++ /dev/null
@@ -1,17 +0,0 @@
-'''
->>> import bienstman2_ext
-'''
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/bienstman3.cpp b/test/bienstman3.cpp
deleted file mode 100644
index 9248ef8f..00000000
--- a/test/bienstman3.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-
-struct V 
-{
- virtual void f() = 0;
-};
-
-struct B 
-{
-    B(const V&) {}    
-};
-
-BOOST_PYTHON_MODULE(bienstman3_ext)
-{
-  using namespace boost::python;
-
-  class_<V, boost::noncopyable>("V", no_init);
-  class_<B>("B", init<const V&>());
-
-}
diff --git a/test/bienstman3.py b/test/bienstman3.py
deleted file mode 100644
index 4629607a..00000000
--- a/test/bienstman3.py
+++ /dev/null
@@ -1,27 +0,0 @@
-'''
->>> from bienstman3_ext import *
-
->>> try:
-...    V()
-... except RuntimeError, x:
-...    print x
-... else:
-...    print 'expected an exception'
-...
-This class cannot be instantiated from Python
-
-'''
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/bienstman4.cpp b/test/bienstman4.cpp
deleted file mode 100644
index 124d76a5..00000000
--- a/test/bienstman4.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/implicit.hpp>
-#include <boost/mpl/list.hpp>
-
-struct Type1 {};
-
-struct Term {Term(Type1 const&) {} };
-
-struct Expression {void add(Term const&) {} };
-
-BOOST_PYTHON_MODULE(bienstman4_ext)
-{
-  using namespace boost::python;
-  using boost::mpl::list;
-
-  implicitly_convertible<Type1,Term>();
-
-  class_<Expression>("Expression")
-      .def("add", &Expression::add)
-      ;
-  
-  class_<Type1>("T1")
-      ;
-  
-  class_<Term>("Term", init<Type1&>())
-      ;
-  
-  Type1 t1;
-  Expression e;
-  e.add(t1);
-}
-
diff --git a/test/bienstman4.py b/test/bienstman4.py
deleted file mode 100644
index a42ea7f3..00000000
--- a/test/bienstman4.py
+++ /dev/null
@@ -1,20 +0,0 @@
-'''
->>> from bienstman4_ext import *
->>> t1 = T1()
->>> e = Expression()
->>> e.add(t1)
-'''
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/bienstman5.cpp b/test/bienstman5.cpp
deleted file mode 100644
index 72875663..00000000
--- a/test/bienstman5.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/mpl/list.hpp>
-
-#include <complex>
-
-struct M {M(const std::complex<double>&) {} };
-
-BOOST_PYTHON_MODULE(bienstman5_ext)
-{
-  using namespace boost::python;
-
-  class_<M>("M", init<std::complex<double> const&>())
-      ;
-}
-
-
diff --git a/test/bienstman5.py b/test/bienstman5.py
deleted file mode 100644
index 4e35d970..00000000
--- a/test/bienstman5.py
+++ /dev/null
@@ -1,18 +0,0 @@
-'''
->>> from bienstman5_ext import *
->>> m = M(1j)
-'''
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/borrowed.cpp b/test/borrowed.cpp
deleted file mode 100755
index 0f8d3112..00000000
--- a/test/borrowed.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/detail/wrap_python.hpp>
-#include <boost/python/borrowed.hpp>
-#include <boost/static_assert.hpp>
-
-using namespace boost::python;
-
-template <class T>
-void assert_borrowed_ptr(T const& x)
-{
-    BOOST_STATIC_ASSERT(boost::python::detail::is_borrowed_ptr<T>::value);
-}
-    
-template <class T>
-void assert_not_borrowed_ptr(T const& x)
-{
-    BOOST_STATIC_ASSERT(!boost::python::detail::is_borrowed_ptr<T>::value);
-}
-    
-int main()
-{
-    assert_borrowed_ptr(borrowed((PyObject*)0));
-    assert_borrowed_ptr(borrowed((PyTypeObject*)0));
-    assert_borrowed_ptr((detail::borrowed<PyObject> const*)0);
-    assert_borrowed_ptr((detail::borrowed<PyObject> volatile*)0);
-    assert_borrowed_ptr((detail::borrowed<PyObject> const volatile*)0);
-    assert_not_borrowed_ptr((PyObject*)0);
-    assert_not_borrowed_ptr(0);
-    return 0;
-}
diff --git a/test/callbacks.cpp b/test/callbacks.cpp
deleted file mode 100644
index 1cfe2914..00000000
--- a/test/callbacks.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/ref.hpp>
-#include <boost/python/ptr.hpp>
-#include <boost/python/return_value_policy.hpp>
-#include <boost/python/reference_existing_object.hpp>
-#include <boost/python/call.hpp>
-#include <boost/python/object.hpp>
-
-using namespace boost::python;
-BOOST_STATIC_ASSERT(converter::is_object_manager<handle<> >::value);
-
-int apply_int_int(PyObject* f, int x)
-{
-    return call<int>(f, x);
-}
-
-void apply_void_int(PyObject* f, int x)
-{
-    call<void>(f, x);
-}
-
-struct X
-{
-    explicit X(int x) : x(x), magic(7654321) { ++counter; }
-    X(X const& rhs) : x(rhs.x), magic(7654321) { ++counter; }
-    ~X() { assert(magic == 7654321); magic = 6666666; x = 9999; --counter; }
-
-    void set(int x) { assert(magic == 7654321); this->x = x; }
-    int value() const { assert(magic == 7654321); return x; }
-    static int count() { return counter; }
- private:
-    void operator=(X const&);
- private:
-    int x;
-    long magic;
-    static int counter;
-};
-
-X apply_X_X(PyObject* f, X x)
-{
-    return call<X>(f, x);
-}
-
-void apply_void_X_ref(PyObject* f, X& x)
-{
-    call<void>(f, boost::ref(x));
-}
-
-X& apply_X_ref_handle(PyObject* f, handle<> obj)
-{
-    return call<X&>(f, obj);
-}
-
-X* apply_X_ptr_handle_cref(PyObject* f, handle<> const& obj)
-{
-    return call<X*>(f, obj);
-}
-
-void apply_void_X_cref(PyObject* f, X const& x)
-{
-    call<void>(f, boost::cref(x));
-}
-
-void apply_void_X_ptr(PyObject* f, X* x)
-{
-    call<void>(f, ptr(x));
-}
-
-void apply_void_X_deep_ptr(PyObject* f, X* x)
-{
-    call<void>(f, x);
-}
-
-char const* apply_cstring_cstring(PyObject* f, char const* s)
-{
-    return call<char const*>(f, s);
-}
-
-char const* apply_cstring_pyobject(PyObject* f, PyObject* s)
-{
-    return call<char const*>(f, borrowed(s));
-}
-
-char apply_char_char(PyObject* f, char c)
-{
-    return call<char>(f, c);
-}
-
-char const* apply_to_string_literal(PyObject* f)
-{
-    return call<char const*>(f, "hello, world");
-}
-
-handle<> apply_to_own_type(handle<> x)
-{
-    // Tests that we can return handle<> from a callback and that we
-    // can pass arbitrary handle<T>.
-    return call<handle<> >(x.get(), type_handle(borrowed(x->ob_type)));
-}
-
-object apply_object_object(PyObject* f, object x)
-{
-    return call<object>(f, x);
-}
-
-int X::counter;
-
-BOOST_PYTHON_MODULE(callbacks_ext)
-{
-    def("apply_object_object", apply_object_object);
-    def("apply_to_own_type", apply_to_own_type);
-    def("apply_int_int", apply_int_int);
-    def("apply_void_int", apply_void_int);
-    def("apply_X_X", apply_X_X);
-    def("apply_void_X_ref", apply_void_X_ref);
-    def("apply_void_X_cref", apply_void_X_cref);
-    def("apply_void_X_ptr", apply_void_X_ptr);
-    def("apply_void_X_deep_ptr", apply_void_X_deep_ptr);
-        
-    def("apply_X_ptr_handle_cref", apply_X_ptr_handle_cref
-        , return_value_policy<reference_existing_object>());
-        
-    def("apply_X_ref_handle", apply_X_ref_handle
-        , return_value_policy<reference_existing_object>());
-        
-    def("apply_cstring_cstring", apply_cstring_cstring);
-    def("apply_cstring_pyobject", apply_cstring_pyobject);
-    def("apply_char_char", apply_char_char);
-    def("apply_to_string_literal", apply_to_string_literal);
-        
-    
-    class_<X>("X", init<int>())
-        .def(init<X const&>())
-        .def("value", &X::value)
-        .def("set", &X::set)
-        ;
-
-    def("x_count", &X::count);
-}
-
-#include "module_tail.cpp"
diff --git a/test/callbacks.py b/test/callbacks.py
deleted file mode 100644
index 83e78099..00000000
--- a/test/callbacks.py
+++ /dev/null
@@ -1,144 +0,0 @@
-'''
->>> from callbacks_ext import *
-
->>> def double(x):
-...     return x + x
-...
->>> apply_int_int(double, 42)
-84
->>> apply_void_int(double, 42)
-
->>> def identity(x):
-...     return x
-
-Once we have array conversion support, this test will fail. Er,
-succeed<wink>:
-
->>> try: apply_to_string_literal(identity)
-... except ReferenceError: pass # expected
-... else: print 'expected an exception!'
-
->>> try: apply_X_ref_handle(lambda ignored:X(42), None)
-... except ReferenceError: pass # expected
-... else: print 'expected an exception!'
-
->>> x = X(42)
->>> x.y = X(7)
->>> apply_X_ref_handle(lambda z:z.y, x).value()
-7
-
->>> x = apply_X_X(identity, X(42))
->>> x.value()
-42
->>> x_count()
-1
->>> del x
->>> x_count()
-0
-
->>> def increment(x):
-...     x.set(x.value() + 1)
-...
->>> x = X(42)
->>> apply_void_X_ref(increment, x)
->>> x.value()
-43
-
->>> apply_void_X_cref(increment, x) 
->>> x.value()  # const-ness is not respected, sorry!
-44
-
->>> last_x = 1
->>> def decrement(x):
-...     global last_x
-...     last_x = x
-...     if x is not None:
-...         x.set(x.value() - 1)
-
->>> apply_void_X_ptr(decrement, x)
->>> x.value()
-43
->>> last_x.value()
-43
->>> increment(last_x)
->>> x.value()
-44
->>> last_x.value()
-44
-
->>> apply_void_X_ptr(decrement, None)
->>> assert last_x is None
->>> x.value()
-44
-
->>> last_x = 1
->>> apply_void_X_deep_ptr(decrement, None)
->>> assert last_x is None
->>> x.value()
-44
-
->>> apply_void_X_deep_ptr(decrement, x)
->>> x.value()
-44
->>> last_x.value()
-43
-
->>> y = apply_X_ref_handle(identity, x)
->>> assert y.value() == x.value()
->>> increment(x)
->>> assert y.value() == x.value()
-
->>> y = apply_X_ptr_handle_cref(identity, x)
->>> assert y.value() == x.value()
->>> increment(x)
->>> assert y.value() == x.value()
-
->>> y = apply_X_ptr_handle_cref(identity, None)
->>> y
-
->>> def new_x(ignored):
-...     return X(666)
-...
->>> try: apply_X_ref_handle(new_x, 1)
-... except ReferenceError: pass
-... else: print 'no error'
-
->>> try: apply_X_ptr_handle_cref(new_x, 1)
-... except ReferenceError: pass
-... else: print 'no error'
-
->>> try: apply_cstring_cstring(identity, 'hello')
-... except ReferenceError: pass
-... else: print 'no error'
-
->>> apply_char_char(identity, 'x')
-'x'
-
->>> apply_cstring_pyobject(identity, 'hello')
-'hello'
-
->>> apply_cstring_pyobject(identity, None)
-
-
->>> apply_char_char(identity, 'x')
-'x'
-
->>> assert apply_to_own_type(identity) is type(identity)
-
->>> assert apply_object_object(identity, identity) is identity
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/cltree.cpp b/test/cltree.cpp
deleted file mode 100755
index 099d5cb7..00000000
--- a/test/cltree.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/utility.hpp>
-
-/*  Non-modifiable definitions */
-
-class basic {
-public:
-  basic() { name = "cltree.basic"; }
-  std::string repr() { return name+"()"; }
-protected:
-  std::string name;
-};
-
-class constant: public basic {
-public:
-  constant() { name = "cltree.constant"; }
-};
-
-class symbol: public basic {
-public:
-  symbol() { name = "cltree.symbol"; }
-};
-
-class variable: public basic {
-public:
-  variable() { name = "cltree.variable"; }
-};
-
-/*  EOF: Non-modifiable definitions */
-
-class symbol_wrapper: public symbol {
-public:
-  symbol_wrapper(PyObject* self): symbol() { 
-    name = "cltree.wrapped_symbol"; 
-  }
-};
-
-class variable_wrapper: public variable {
-public:
-  variable_wrapper(PyObject* self): variable() { 
-    name = "cltree.wrapped_variable";
-  }
-
-  // This constructor is introduced only because cannot use
-  // boost::noncopyable, see below.
-  variable_wrapper(PyObject* self,variable v): variable(v) {} 
-
-};
-
-BOOST_PYTHON_MODULE(cltree)
-{
-    boost::python::class_<basic>("basic")
-        .def("__repr__",&basic::repr)
-        ;
-
-    boost::python::class_<constant, boost::python::bases<basic>, boost::noncopyable>("constant")
-        ;
-
-
-    boost::python::class_<symbol, symbol_wrapper, boost::noncopyable>("symbol")
-        ;
-
-    boost::python::class_<variable, boost::python::bases<basic>, variable_wrapper>("variable")
-        ;
-}
-
-#include "module_tail.cpp"
-
diff --git a/test/complicated.hpp b/test/complicated.hpp
deleted file mode 100644
index 123c53fe..00000000
--- a/test/complicated.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef COMPLICATED_DWA20011215_HPP
-# define COMPLICATED_DWA20011215_HPP
-# include <iostream>
-
-# include "simple_type.hpp"
-
-struct complicated
-{
-    complicated(simple const&, int = 0);
-    ~complicated();
-
-    int get_n() const;
-
-    char* s;
-    int n;
-};
-
-inline complicated::complicated(simple const&s, int n)
-    : s(s.s), n(n)
-{
-    std::cout << "constructing complicated: " << this->s << ", " << n << std::endl;
-}
-
-inline complicated::~complicated()
-{
-    std::cout << "destroying complicated: " << this->s << ", " << n << std::endl;
-}
-
-inline int complicated::get_n() const
-{
-    return n;
-}
-
-#endif // COMPLICATED_DWA20011215_HPP
diff --git a/test/copy_ctor_mutates_rhs.cpp b/test/copy_ctor_mutates_rhs.cpp
deleted file mode 100755
index 7244ab0e..00000000
--- a/test/copy_ctor_mutates_rhs.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/detail/copy_ctor_mutates_rhs.hpp>
-#include <boost/static_assert.hpp>
-#include <memory>
-#include <string>
-
-struct foo
-{
-    operator std::auto_ptr<int>&() const;
-};
-
-int main()
-{
-    using namespace boost::python::detail;
-    BOOST_STATIC_ASSERT(!copy_ctor_mutates_rhs<int>::value);
-    BOOST_STATIC_ASSERT(copy_ctor_mutates_rhs<std::auto_ptr<int> >::value);
-    BOOST_STATIC_ASSERT(!copy_ctor_mutates_rhs<std::string>::value);
-    BOOST_STATIC_ASSERT(!copy_ctor_mutates_rhs<foo>::value);
-    return 0;
-}
diff --git a/test/crossmod_exception.py b/test/crossmod_exception.py
deleted file mode 100644
index c8430849..00000000
--- a/test/crossmod_exception.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2003 Rational Discovery LLC
-# Permission to copy, use, modify, sell and distribute this software
-# is granted provided this copyright notice appears in all
-# copies. This software is provided "as is" without express or
-# implied warranty, and with no claim as to its suitability for any
-# purpose.
-
-print "running..."
-
-import crossmod_exception_a
-import crossmod_exception_b
-
-try:
-  crossmod_exception_b.tossit()
-except IndexError:
-  pass
-try:
-  crossmod_exception_a.tossit()
-except IndexError:
-  pass
-
-print "Done."
diff --git a/test/crossmod_exception_a.cpp b/test/crossmod_exception_a.cpp
deleted file mode 100755
index c39c41a9..00000000
--- a/test/crossmod_exception_a.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (C) 2003 Rational Discovery LLC
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all
-// copies. This software is provided "as is" without express or
-// implied warranty, and with no claim as to its suitability for any
-// purpose.
-
-#include <boost/python.hpp>
-
-namespace python = boost::python;
-
-void tossit(){
-  PyErr_SetString(PyExc_IndexError,"a-blah!");
-  throw python::error_already_set();
-}
-
-BOOST_PYTHON_MODULE(crossmod_exception_a)
-{
-    python::def("tossit",tossit);
-}
diff --git a/test/crossmod_exception_b.cpp b/test/crossmod_exception_b.cpp
deleted file mode 100755
index 17c88617..00000000
--- a/test/crossmod_exception_b.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (C) 2003 Rational Discovery LLC
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all
-// copies. This software is provided "as is" without express or
-// implied warranty, and with no claim as to its suitability for any
-// purpose.
-
-#include <boost/python.hpp>
-
-namespace python = boost::python;
-
-void tossit(){
-  PyErr_SetString(PyExc_IndexError,"b-blah!");
-  throw python::error_already_set();
-}
-
-BOOST_PYTHON_MODULE(crossmod_exception_b)
-{
-    python::def("tossit",tossit);
-}
diff --git a/test/data_members.cpp b/test/data_members.cpp
deleted file mode 100644
index d4b95fce..00000000
--- a/test/data_members.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/class.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/return_value_policy.hpp>
-#include <boost/python/return_by_value.hpp>
-#include "test_class.hpp"
-
-#if defined(_AIX) && defined(__EDG_VERSION__) && __EDG_VERSION__ < 245
-# include <iostream> // works around a KCC intermediate code generation bug
-#endif
-
-
-using namespace boost::python;
-
-typedef test_class<> X;
-
-struct Y : test_class<1>
-{
-    Y(int v) : test_class<1>(v) {}
-    Y& operator=(Y const& rhs) { x = rhs.x; return *this; }
-};
-
-double get_fair_value(X const& x) { return x.value(); }
-
-
-struct VarBase
-{
-    VarBase(std::string name_) : name(name_) {}
-    
-    std::string const name;
-    std::string get_name1() const { return name; }
-    
-};
-
-struct Var : VarBase
-{
-    Var(std::string name_) : VarBase(name_), value(), name2(name.c_str()), y(6) {}
-    std::string const& get_name2() const { return name; }
-    float value;
-    char const* name2;
-    Y y;
-
-    static int static1;
-    static Y static2;
-};
-
-int Var::static1 = 0;
-Y Var::static2(0);
-
-// Compilability regression tests
-namespace
-{
-  struct trivial
-  {
-    trivial() : value(123) {}
-    double value;
-  };
-
-  struct Color3
-  {
-    static const Color3 black;
-  };
-
-  const Color3 Color3::black
-#if BOOST_WORKAROUND(__GNUC__, BOOST_TESTED_AT(3))
-  = {}
-#endif 
-      ;
-
-  void compilability_test()
-  {
-    class_<trivial>("trivial")
-      .add_property("property", make_getter(&trivial::value, return_value_policy<return_by_value>()))
-      .def_readonly("readonly", &trivial::value)
-    ;
-
-    class_< Color3 >("Color3", init< const Color3 & >())
-        .def_readonly("BLACK", &Color3::black)   // line 17
-        ;
-  }
-}
-
-BOOST_PYTHON_MODULE(data_members_ext)
-{
-    class_<X>("X", init<int>())
-        .def("value", &X::value)
-        .def("set", &X::set)
-        .def_readonly("x", &X::x)
-        .add_property("fair_value", get_fair_value)
-        ;
-
-    class_<Y>("Y", init<int>())
-        .def("value", &Y::value)
-        .def("set", &Y::set)
-        .def_readwrite("x", &Y::x)
-        ;
-
-    class_<Var>("Var", init<std::string>())
-        .def_readonly("name", &Var::name)
-        .def_readonly("name2", &Var::name2)
-        .def_readwrite("value", &Var::value)
-        .def_readonly("y", &Var::y)
-        
-        // Test return_by_value for plain values and for
-        // pointers... return_by_value was implemented as a
-        // side-effect of implementing data member support, so it made
-        // sense to add the test here.
-        .def("get_name1", &Var::get_name1, return_value_policy<return_by_value>())
-        .def("get_name2", &Var::get_name2, return_value_policy<return_by_value>())
-        
-        .add_property("name3", &Var::get_name1)
-
-        // Test static data members
-        .def_readonly("ro1a", &Var::static1)
-        .def_readonly("ro1b", Var::static1)
-        .def_readwrite("rw1a", &Var::static1)
-        .def_readwrite("rw1b", Var::static1)
-
-        .def_readonly("ro2a", &Var::static2)
-        .def_readonly("ro2b", Var::static2)
-        .def_readwrite("rw2a", &Var::static2)
-        .def_readwrite("rw2b", Var::static2)
-        ;
-}
-
-#include "module_tail.cpp"
diff --git a/test/data_members.py b/test/data_members.py
deleted file mode 100644
index ad6cf3c3..00000000
--- a/test/data_members.py
+++ /dev/null
@@ -1,203 +0,0 @@
-'''
->>> from data_members_ext import *
-
-        ---- Test static data members ---
-
->>> v = Var('slim shady')
-
->>> Var.ro2a.x
-0
->>> Var.ro2b.x
-0
->>> Var.rw2a.x
-0
->>> Var.rw2b.x
-0
->>> v.ro2a.x
-0
->>> v.ro2b.x
-0
->>> v.rw2a.x
-0
->>> v.rw2b.x
-0
->>> Var.rw2a.x = 777
->>> Var.ro2a.x
-777
->>> Var.ro2b.x
-777
->>> Var.rw2a.x
-777
->>> Var.rw2b.x
-777
->>> v.ro2a.x
-777
->>> v.ro2b.x
-777
->>> v.rw2a.x
-777
->>> v.rw2b.x
-777
->>> Var.rw2b = Y(888)
->>> Var.ro2a.x
-888
->>> Var.ro2b.x
-888
->>> Var.rw2a.x
-888
->>> Var.rw2b.x
-888
->>> v.ro2a.x
-888
->>> v.ro2b.x
-888
->>> v.rw2a.x
-888
->>> v.rw2b.x
-888
->>> v.rw2b.x = 999
->>> Var.ro2a.x
-999
->>> Var.ro2b.x
-999
->>> Var.rw2a.x
-999
->>> Var.rw2b.x
-999
->>> v.ro2a.x
-999
->>> v.ro2b.x
-999
->>> v.rw2a.x
-999
->>> v.rw2b.x
-999
-
-
->>> Var.ro1a
-0
->>> Var.ro1b
-0
->>> Var.rw1a
-0
->>> Var.rw1b
-0
->>> v.ro1a
-0
->>> v.ro1b
-0
->>> v.rw1a
-0
->>> v.rw1b
-0
->>> Var.rw1a = 777
->>> Var.ro1a
-777
->>> Var.ro1b
-777
->>> Var.rw1a
-777
->>> Var.rw1b
-777
->>> v.ro1a
-777
->>> v.ro1b
-777
->>> v.rw1a
-777
->>> v.rw1b
-777
->>> Var.rw1b = 888
->>> Var.ro1a
-888
->>> Var.ro1b
-888
->>> Var.rw1a
-888
->>> Var.rw1b
-888
->>> v.ro1a
-888
->>> v.ro1b
-888
->>> v.rw1a
-888
->>> v.rw1b
-888
->>> v.rw1b = 999
->>> Var.ro1a
-999
->>> Var.ro1b
-999
->>> Var.rw1a
-999
->>> Var.rw1b
-999
->>> v.ro1a
-999
->>> v.ro1b
-999
->>> v.rw1a
-999
->>> v.rw1b
-999
-
-
-
-        -----------------
-        
->>> x = X(42)
->>> x.x
-42
->>> try: x.x = 77
-... except AttributeError: pass
-... else: print 'no error'
-
->>> x.fair_value
-42.0
->>> y = Y(69)
->>> y.x
-69
->>> y.x = 77
->>> y.x
-77
-
->>> v = Var("pi")
->>> v.value = 3.14
->>> v.name
-'pi'
->>> v.name2
-'pi'
-
->>> v.get_name1()
-'pi'
-
->>> v.get_name2()
-'pi'
-
->>> v.y.x
-6
->>> v.y.x = -7
->>> v.y.x
--7
-
->>> v.name3
-'pi'
-
-
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/defaults.cpp b/test/defaults.cpp
deleted file mode 100644
index 1c173a79..00000000
--- a/test/defaults.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/def.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/list.hpp>
-#include <boost/python/overloads.hpp>
-#include <boost/python/return_internal_reference.hpp>
-
-#if defined(_AIX) && defined(__EDG_VERSION__) && __EDG_VERSION__ < 245
-# include <iostream> // works around a KCC intermediate code generation bug
-#endif
-
-using namespace boost::python;
-
-char const* const format = "int(%s); char(%s); string(%s); double(%s); ";
-
-///////////////////////////////////////////////////////////////////////////////
-//
-//  Overloaded functions
-//
-///////////////////////////////////////////////////////////////////////////////
-object
-bar(int a, char b, std::string c, double d)
-{
-    return format % make_tuple(a, b, c, d);
-}
-
-object
-bar(int a, char b, std::string c)
-{
-    return format % make_tuple(a, b, c, 0.0);
-}
-
-object
-bar(int a, char b)
-{
-    return format % make_tuple(a, b, "default", 0.0);
-}
-
-object
-bar(int a)
-{
-    return format % make_tuple(a, 'D', "default", 0.0);
-}
-
-BOOST_PYTHON_FUNCTION_OVERLOADS(bar_stubs, bar, 1, 4)
-
-///////////////////////////////////////////////////////////////////////////////
-//
-//  Functions with default arguments
-//
-///////////////////////////////////////////////////////////////////////////////
-object
-foo(int a, char b = 'D', std::string c = "default", double d = 0.0)
-{
-    return format % make_tuple(a, b, c, d);
-}
-
-BOOST_PYTHON_FUNCTION_OVERLOADS(foo_stubs, foo, 1, 4)
-
-///////////////////////////////////////////////////////////////////////////////
-//
-//  Overloaded member functions with default arguments
-//
-///////////////////////////////////////////////////////////////////////////////
-struct Y {
-
-    Y() {}
-
-    object
-    get_state() const
-    {
-        return format % make_tuple(a, b, c, d);
-    }
-
-    int a; char b; std::string c; double d;
-};
-
-
-struct X {
-
-    X() {}
-
-    X(int a, char b = 'D', std::string c = "constructor", double d = 0.0)
-    : state(format % make_tuple(a, b, c, d))
-    {}
-
-    X(std::string s, bool b)
-    : state("Got exactly two arguments from constructor: string(%s); bool(%s); " % make_tuple(s, b))
-    {}
-
-    object
-    bar(int a, char b = 'D', std::string c = "default", double d = 0.0) const
-    {
-        return format % make_tuple(a, b, c, d);
-    }
-
-    Y const&
-    bar2(int a = 0, char b = 'D', std::string c = "default", double d = 0.0)
-    {
-        // tests zero arg member function and return_internal_reference policy
-        y.a = a;
-        y.b = b;
-        y.c = c;
-        y.d = d;
-        return y;
-    }
-
-    object
-    foo(int a, bool b=false) const
-    {
-        return "int(%s); bool(%s); " % make_tuple(a, b);
-    }
-
-    object
-    foo(std::string a, bool b=false) const
-    {
-        return "string(%s); bool(%s); " % make_tuple(a, b);
-    }
-
-    object
-    foo(list a, list b, bool c=false) const
-    {
-        return "list(%s); list(%s); bool(%s); " % make_tuple(a, b, c);
-    }
-
-    object
-    get_state() const
-    {
-        return state;
-    }
-
-    Y y;
-    object state;
-};
-
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_bar_stubs, bar, 1, 4)
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_bar_stubs2, bar2, 0, 4)
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_foo_2_stubs, foo, 1, 2)
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(X_foo_3_stubs, foo, 2, 3)
-
-///////////////////////////////////////////////////////////////////////////////
-
-BOOST_PYTHON_MODULE(defaults_ext)
-{
-    def("foo", foo, foo_stubs());
-    def("bar", (object(*)(int, char, std::string, double))0, bar_stubs());
-
-    class_<Y>("Y", init<>("doc of Y init")) // this should work
-	    .def("get_state", &Y::get_state)
-        ;
-
-    class_<X>("X")
-
-        .def(init<int, optional<char, std::string, double> >("doc of init"))
-        .def(init<std::string, bool>()[default_call_policies()]) // what's a good policy here?
-        .def("get_state", &X::get_state)
-        .def("bar", &X::bar, X_bar_stubs())
-        .def("bar2", &X::bar2, X_bar_stubs2("doc of X::bar2")[return_internal_reference<>()])
-        .def("foo", (object(X::*)(std::string, bool) const)0, X_foo_2_stubs())
-        .def("foo", (object(X::*)(int, bool) const)0, X_foo_2_stubs())
-        .def("foo", (object(X::*)(list, list, bool) const)0, X_foo_3_stubs())
-        ;
-}
-
-#include "module_tail.cpp"
-
diff --git a/test/defaults.py b/test/defaults.py
deleted file mode 100644
index 26c7fc30..00000000
--- a/test/defaults.py
+++ /dev/null
@@ -1,176 +0,0 @@
-"""
->>> False = 0 # Python 2.2 needs these
->>> True = 1
-
->>> from defaults_ext import *
->>> bar(1)
-'int(1); char(D); string(default); double(0.0); '
-
->>> bar(2, 'X')
-'int(2); char(X); string(default); double(0.0); '
-
->>> bar(3, 'Y', "Hello World")
-'int(3); char(Y); string(Hello World); double(0.0); '
-
->>> bar(4, 'Z', "Hi There", 3.3)
-'int(4); char(Z); string(Hi There); double(3.3); '
-
->>> foo(1)
-'int(1); char(D); string(default); double(0.0); '
-
->>> foo(2, 'X')
-'int(2); char(X); string(default); double(0.0); '
-
->>> foo(3, 'Y', "Hello World")
-'int(3); char(Y); string(Hello World); double(0.0); '
-
->>> foo(4, 'Z', "Hi There", 3.3)
-'int(4); char(Z); string(Hi There); double(3.3); '
-
->>> x = X()
->>> x.bar(1)
-'int(1); char(D); string(default); double(0.0); '
-
->>> x.bar(2, 'X')
-'int(2); char(X); string(default); double(0.0); '
-
->>> x.bar(3, 'Y', "Hello World")
-'int(3); char(Y); string(Hello World); double(0.0); '
-
->>> x.bar(4, 'Z', "Hi There", 3.3)
-'int(4); char(Z); string(Hi There); double(3.3); '
-
->>> x.foo(5)
-'int(5); bool(0); '
-
->>> x.foo(6, 0)
-'int(6); bool(0); '
-
->>> x.foo(7, 1)
-'int(7); bool(1); '
-
->>> x.foo("A")
-'string(A); bool(0); '
-
->>> x.foo("B", False)
-'string(B); bool(0); '
-
->>> x.foo("C", True)
-'string(C); bool(1); '
-
->>> x.foo([0,1,2], [2,3,4])
-'list([0, 1, 2]); list([2, 3, 4]); bool(0); '
-
->>> x.foo([0,1,2], [2,3,4], False)
-'list([0, 1, 2]); list([2, 3, 4]); bool(0); '
-
->>> x.foo([0,1,2], [2,3,4], True)
-'list([0, 1, 2]); list([2, 3, 4]); bool(1); '
-
->>> x = X(1)
->>> x.get_state()
-'int(1); char(D); string(constructor); double(0.0); '
-
->>> x = X(1, 'X')
->>> x.get_state()
-'int(1); char(X); string(constructor); double(0.0); '
-
->>> x = X(1, 'X', "Yabadabadoo")
->>> x.get_state()
-'int(1); char(X); string(Yabadabadoo); double(0.0); '
-
->>> x = X(1, 'X', "Phoenix", 3.65)
->>> x.get_state()
-'int(1); char(X); string(Phoenix); double(3.65); '
-
->>> x.bar2().get_state()
-'int(0); char(D); string(default); double(0.0); '
-
->>> x.bar2(1).get_state()
-'int(1); char(D); string(default); double(0.0); '
-
->>> x.bar2(1, 'K').get_state()
-'int(1); char(K); string(default); double(0.0); '
-
->>> x.bar2(1, 'K', "Kim").get_state()
-'int(1); char(K); string(Kim); double(0.0); '
-
->>> x.bar2(1, 'K', "Kim", 9.9).get_state()
-'int(1); char(K); string(Kim); double(9.9); '
-
->>> x = X("Phoenix", 1)
->>> x.get_state()
-'Got exactly two arguments from constructor: string(Phoenix); bool(1); '
-
->>> def printdoc(x):
-...     print x.__doc__
-
->>> printdoc(X.__init__)
-doc of init
-
->>> printdoc(Y.__init__)
-doc of Y init
-
->>> printdoc(X.bar2)
-doc of X::bar2
-
-"""
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/destroy_test.cpp b/test/destroy_test.cpp
deleted file mode 100644
index eaf121aa..00000000
--- a/test/destroy_test.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <boost/python/detail/destroy.hpp>
-#include <cassert>
-
-int count;
-int marks[] = {
-    -1
-    , -1, -1
-    , -1, -1, -1, -1
-    , -1
-};
-int* kills = marks;
-
-struct foo
-{
-    foo() : n(count++) {}
-    ~foo()
-    {
-        *kills++ = n;
-    }
-    int n;
-};
-
-void assert_destructions(int n)
-{
-    for (int i = 0; i < n; ++i)
-        assert(marks[i] == i);
-    assert(marks[n] == -1);
-}
-
-int main()
-{
-    assert_destructions(0);
-    typedef int a[2];
-    
-    foo* f1 = new foo;
-    boost::python::detail::destroy_referent<foo const volatile&>(f1);
-    assert_destructions(1);
-    
-    foo* f2 = new foo[2];
-    typedef foo x[2];
-    
-    boost::python::detail::destroy_referent<x const&>(f2);
-    assert_destructions(3);
-
-    typedef foo y[2][2];
-    x* f3 = new y;
-    boost::python::detail::destroy_referent<y&>(f3);
-    assert_destructions(7);
-
-    return 0;
-}
diff --git a/test/dict.cpp b/test/dict.cpp
deleted file mode 100644
index de6d4a86..00000000
--- a/test/dict.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/dict.hpp>
-#include <exception>
-#include <string>
-
-using namespace boost::python;
-
-object new_dict()
-{
-    return dict();
-}
-
-object data_dict()
-{
-    dict tmp1;
-    tmp1["key1"] = "value1";
-
-    dict tmp2;
-    tmp2["key2"] = "value2";
-    tmp1[1] = tmp2;
-    return tmp1;
-}
-
-object dict_from_sequence(object sequence)
-{
-    return dict(sequence);
-}
-
-object dict_keys(dict data)
-{
-    return data.keys();
-}
-
-object dict_values(dict data)
-{
-    return data.values();
-}
-
-object dict_items(dict data)
-{
-    return data.items();
-}
-
-void work_with_dict(dict data1, dict data2)
-{
-    if (!data1.has_key("k1")) {
-        throw std::runtime_error("dict does not have key 'k1'");
-    }
-    data1.update(data2);
-}
-
-void test_templates(object print)
-{
-    std::string key = "key";
-    
-    dict tmp;
-    tmp[1] = "a test string";
-    print(tmp.get(1));
-    //print(tmp[1]);
-    tmp[1.5] = 13;
-    print(tmp.get(1.5));
-    print(tmp.get(44));
-    print(tmp);
-    print(tmp.get(2,"default"));
-    print(tmp.has_key(key));
-    print(tmp.setdefault(3,"default"));
-    //print(tmp[3]);
-}
-    
-BOOST_PYTHON_MODULE(dict_ext)
-{
-    def("new_dict", new_dict);
-    def("data_dict", data_dict);
-    def("dict_keys", dict_keys);
-    def("dict_values", dict_values);
-    def("dict_items", dict_items);
-    def("dict_from_sequence", dict_from_sequence);
-    def("work_with_dict", work_with_dict);
-    def("test_templates", test_templates);
-}
diff --git a/test/dict.py b/test/dict.py
deleted file mode 100644
index 2b003afa..00000000
--- a/test/dict.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""
->>> from dict_ext import *
->>> def printer(*args):
-...     for x in args: print x,
-...     print
-...
->>> print new_dict()
-{}
->>> print data_dict()
-{1: {'key2': 'value2'}, 'key1': 'value1'}
->>> tmp = data_dict()
->>> print dict_keys(tmp)
-[1, 'key1']
->>> print dict_values(tmp)
-[{'key2': 'value2'}, 'value1']
->>> print dict_items(tmp)
-[(1, {'key2': 'value2'}), ('key1', 'value1')]
->>> print dict_from_sequence([(1,1),(2,2),(3,3)])
-{1: 1, 2: 2, 3: 3}
->>> test_templates(printer)
-a test string
-13
-None
-{1.5: 13, 1: 'a test string'}
-default
-0
-default
-"""
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/docstring.cpp b/test/docstring.cpp
deleted file mode 100644
index 6501e10f..00000000
--- a/test/docstring.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/operators.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/scope.hpp>
-#include <boost/python/manage_new_object.hpp>
-#include "test_class.hpp"
-
-// Just use math.h here; trying to use std::pow() causes too much
-// trouble for non-conforming compilers and libraries.
-#include <math.h>
-
-using namespace boost::python;
-
-typedef test_class<> X;
-
-X* create(int x)
-{
-    return new X(x);
-}
-
-unsigned long fact(unsigned long n)
-{
-    return n <= 1 ? n : n * fact(n - 1);
-}
-
-BOOST_PYTHON_MODULE(docstring_ext)
-{
-    scope().attr("__doc__") =
-        "A simple test module for documentation strings\n"
-        "Exercised by docstring.py"
-        ;
-
-    class_<X>("X",
-              "A simple class wrapper around a C++ int\n"
-              "includes some error-checking"
-
-              , init<int>(
-                  "this is the __init__ function\n"
-                  "its documentation has two lines."
-                )
-
-        )
-        .def("value", &X::value,
-             "gets the value of the object")
-        ;
-
-    def("create", create, return_value_policy<manage_new_object>(),
-        "creates a new X object");
-
-    def("fact", fact, "compute the factorial");
-}
-
-#include "module_tail.cpp"
diff --git a/test/docstring.py b/test/docstring.py
deleted file mode 100644
index 9c948bec..00000000
--- a/test/docstring.py
+++ /dev/null
@@ -1,56 +0,0 @@
-'''
->>> from docstring_ext import *
-
->>> def printdoc(x):
-...     print x.__doc__
-
->>> printdoc(X)
-A simple class wrapper around a C++ int
-includes some error-checking
-
->>> printdoc(X.__init__)
-this is the __init__ function
-its documentation has two lines.
-
->>> printdoc(X.value)
-gets the value of the object
-
->>> printdoc(create)
-creates a new X object
-
->>> printdoc(fact)
-compute the factorial
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-        
-    import docstring_ext
-    
-    result = doctest.testmod(sys.modules.get(__name__))
-    
-    import pydoc
-    import re
-    docmodule = lambda m: re.sub(".\10", "", pydoc.text.docmodule(m))
-    try:
-        print 'printing module help:'
-        print docmodule(docstring_ext)
-    except object, x:
-        print '********* failed **********'
-        print x
-        result = list(result)
-        result[0] += 1
-        return tuple(result)
-        
-    return result
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/embedding.cpp b/test/embedding.cpp
deleted file mode 100644
index e3940c50..00000000
--- a/test/embedding.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-// embedded_hello -- A simple Boost.Python embedding example -- by
-// Dirk Gerrits
-
-#include <boost/python.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <iostream>
-#include <stdexcept>
-
-namespace python = boost::python;
-
-// An abstract base class
-class Base : public boost::noncopyable
-{
-public:
-    virtual ~Base() {};
-
-    virtual std::string hello() = 0;
-};
-
-// C++ derived class
-class CppDerived : public Base
-{
-public:
-    virtual ~CppDerived() {}
-    
-    std::string hello()
-    {
-        return "Hello from C++!";
-    }
-};
-
-// Familiar Boost.Python wrapper class for Base
-struct BaseWrap : public Base
-{
-    BaseWrap(PyObject* self_)
-        : self(self_) {}
-
-    std::string hello() { return python::call_method<std::string>(self, "hello"); }
-
-    PyObject* self;
-};
-
-// Pack the Base class wrapper into a module
-BOOST_PYTHON_MODULE(embedded_hello)
-{
-    python::class_<Base, BaseWrap, boost::noncopyable>("Base")
-        ;
-
-}
-
-
-void test()
-{
-//- INITIALIZATION -----------------------------------------------------------//
-
-    // Register the module with the interpreter
-    if (PyImport_AppendInittab("embedded_hello", initembedded_hello) == -1)
-        throw std::runtime_error("Failed to add embedded_hello to the interpreter's "
-                                 "builtin modules");
-
-    // Initialize the interpreter
-    Py_Initialize();
-
-    // Retrieve the main module
-    python::handle<> main_module(
-        python::borrowed(PyImport_AddModule("__main__")) );
-
-    // Retrieve the main modules namespace
-    python::handle<> main_namespace(
-        python::borrowed(PyModule_GetDict(main_module.get())) );
-
-    // Define the derived class in Python.
-    // (You'll normally want to put this in a .py file.)
-    python::handle<> result(
-        PyRun_String(
-        "from embedded_hello import *        \n"
-        "class PythonDerived(Base):          \n"
-        "    def hello(self):                \n"
-        "        return 'Hello from Python!' \n", 
-        Py_file_input, main_namespace.get(), main_namespace.get())
-        );
-    // Result is not needed
-    result.reset();
-
-    // Extract the raw Python object representing the just defined derived class
-    python::handle<> class_ptr( 
-        PyRun_String("PythonDerived\n", Py_eval_input, 
-                     main_namespace.get(), main_namespace.get()) );
-
-    // Wrap the raw Python object in a Boost.Python object
-    python::object PythonDerived(class_ptr);
-
-//- MAIN PROGRAM -------------------------------------------------------------//
-
-    // Creating and using instances of the C++ class is as easy as always.
-    CppDerived cpp;
-    std::cout << cpp.hello() << std::endl;
-
-    // But now creating and using instances of the Python class is almost 
-    // as easy!
-    python::object py_base = PythonDerived();
-    Base& py = python::extract<Base&>(py_base)();
-    std::cout << py.hello() << std::endl;
-}
-
-int main()
-{
-    if (python::handle_exception(test))
-    {
-        if (PyErr_Occurred())
-            PyErr_Print();
-        return 1;
-    }
-    return 0;
-}
-#include "module_tail.cpp"
diff --git a/test/enum.cpp b/test/enum.cpp
deleted file mode 100644
index 9569e3b3..00000000
--- a/test/enum.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/enum.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#if BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
-# include <boost/type_traits/is_enum.hpp>
-# include <boost/mpl/bool.hpp>
-#endif 
-using namespace boost::python;
-
-enum color { red = 1, green = 2, blue = 4 };
-
-#if BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
-namespace boost  // Pro7 has a hard time detecting enums
-{
-  template <> struct is_enum<color> : boost::mpl::true_ {};
-}
-#endif 
-
-color identity_(color x) { return x; }
-
-struct colorized {
-    colorized() : x(red) {}
-    color x;
-};
-
-BOOST_PYTHON_MODULE(enum_ext)
-{
-    enum_<color>("color")
-        .value("red", red)
-        .value("green", green)
-        .value("blue", blue)
-        .export_values()
-        ;
-    
-    def("identity", identity_);
-
-#if BOOST_WORKAROUND(__MWERKS__, <=0x2407)
-    color colorized::*px = &colorized::x;
-    class_<colorized>("colorized")
-        .def_readwrite("x", px)
-        ;
-#else 
-    class_<colorized>("colorized")
-        .def_readwrite("x", &colorized::x)
-        ;
-#endif 
-}
-
-#include "module_tail.cpp"
diff --git a/test/enum.py b/test/enum.py
deleted file mode 100644
index 19107037..00000000
--- a/test/enum.py
+++ /dev/null
@@ -1,61 +0,0 @@
-'''
->>> from enum_ext import *
-
->>> identity(color.red)
-enum_ext.color.red
-
->>> identity(color.green)
-enum_ext.color.green
-
->>> identity(color.blue)
-enum_ext.color.blue
-
->>> identity(color(1))
-enum_ext.color.red
-
->>> identity(color(2))
-enum_ext.color.green
-
->>> identity(color(3))
-enum_ext.color(3)
-
->>> identity(color(4))
-enum_ext.color.blue
-
-  --- check export to scope ---
-
->>> identity(red)
-enum_ext.color.red
-
->>> identity(green)
-enum_ext.color.green
-
->>> identity(blue)
-enum_ext.color.blue
-
->>> try: identity(1)
-... except TypeError: pass
-... else: print 'expected a TypeError'
-
->>> c = colorized()
->>> c.x
-enum_ext.color.red
->>> c.x = green
->>> c.x
-enum_ext.color.green
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/exception_translator.cpp b/test/exception_translator.cpp
deleted file mode 100644
index f9c38ab9..00000000
--- a/test/exception_translator.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/exception_translator.hpp>
-
-struct error {};
-
-void translate(error const& e)
-{
-    PyErr_SetString(PyExc_RuntimeError, "!!!error!!!");
-}
-
-void throw_error()
-{
-    throw error();
-    
-}
-
-BOOST_PYTHON_MODULE(exception_translator_ext)
-{
-  using namespace boost::python;
-  register_exception_translator<error>(&translate);
-  
-  def("throw_error", throw_error);
-}
-
diff --git a/test/exception_translator.py b/test/exception_translator.py
deleted file mode 100644
index 835c7172..00000000
--- a/test/exception_translator.py
+++ /dev/null
@@ -1,24 +0,0 @@
-'''
->>> from exception_translator_ext import *
->>> try:
-...     throw_error();
-... except RuntimeError, x:
-...     print x
-... else:
-...     print 'Expected a RuntimeError!'
-!!!error!!!
-'''
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/extract.cpp b/test/extract.cpp
deleted file mode 100644
index b0b28342..00000000
--- a/test/extract.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/extract.hpp>
-#include <boost/python/list.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/reference_existing_object.hpp>
-#include <boost/python/return_value_policy.hpp>
-#include <boost/python/implicit.hpp>
-#include <string>
-#include <boost/lexical_cast.hpp>
-#include <cassert>
-#include "test_class.hpp"
-
-using namespace boost::python;
-
-typedef test_class<> X;
-
-bool extract_bool(object x) { return extract<bool>(x); }
-
-boost::python::list extract_list(object x)
-{
-    extract<list> get_list((x));
-
-    // Make sure we always have the right idea about whether it's a list
-    bool is_list_1 = get_list.check();
-    bool is_list_2 = PyObject_IsInstance(x.ptr(), (PyObject*)&PyList_Type);
-    assert(is_list_1 == is_list_2);
-    
-    return get_list();
-}
-
-char const* extract_cstring(object x)
-{
-    return extract<char const*>(x);
-}
-
-std::string extract_string(object x)
-{
-    std::string s = extract<std::string>(x);
-    return s;
-}
-
-std::string const& extract_string_cref(object x)
-{
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
-# pragma warning(push)
-# pragma warning(disable:4172) // msvc lies about returning a reference to temporary
-#elif defined(_MSC_VER) && defined(__ICL) && __ICL <= 700
-# pragma warning(push)
-# pragma warning(disable:473) // intel/win32 does too
-#endif 
-    
-    return extract<std::string const&>(x);
-    
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(_MSC_VER) && defined(__ICL) && __ICL <= 700
-# pragma warning(pop)
-#endif 
-}
-
-X extract_X(object x)
-{
-    return extract<X>(x);
-}
-
-X* extract_X_ptr(object x) { return extract<X*>(x); }
-
-X& extract_X_ref(object x)
-{
-    extract<X&> get_x(x);
-    return get_x;
-}
-
-int double_X(object n)
-{
-    extract<X> x(n);
-    return x().value() + x().value();
-}
-
-bool check_bool(object x) { return extract<bool>(x).check(); }
-bool check_list(object x) { return extract<list>(x).check(); }
-bool check_cstring(object x) { return extract<char const*>(x).check(); }
-bool check_string(object x) { return extract<std::string>(x).check(); }
-bool check_string_cref(object x) { return extract<std::string const&>(x).check(); }
-bool check_X(object x) { return extract<X>(x).check(); }
-bool check_X_ptr(object x) { return extract<X*>(x).check(); }
-bool check_X_ref(object x) { return extract<X&>(x).check(); }
-
-std::string x_rep(X const& x)
-{
-    return "X("  + boost::lexical_cast<std::string>(x.value()) + ")";
-}
-
-BOOST_PYTHON_MODULE(extract_ext)
-{
-    implicitly_convertible<int, X>();
-
-    def("extract_bool", extract_bool);
-    def("extract_list", extract_list);
-    def("extract_cstring", extract_cstring);
-    def("extract_string", extract_string);
-    def("extract_string_cref", extract_string_cref, return_value_policy<reference_existing_object>());
-    def("extract_X", extract_X);
-    def("extract_X_ptr", extract_X_ptr, return_value_policy<reference_existing_object>());
-    def("extract_X_ref", extract_X_ref, return_value_policy<reference_existing_object>());
-
-    def("check_bool", check_bool);
-    def("check_list", check_list);
-    def("check_cstring", check_cstring);
-    def("check_string", check_string);
-    def("check_string_cref", check_string_cref);
-    def("check_X", check_X);
-    def("check_X_ptr", check_X_ptr);
-    def("check_X_ref", check_X_ref);
-
-    def("double_X", double_X);
-
-    def("count_Xs", &X::count);
-        ;
-
-    object x_class(
-        class_<X>("X", init<int>())
-            .def( "__repr__", x_rep));
-        
-    // Instantiate an X object through the Python interface
-    object x_obj = x_class(3);
-
-    // Get the C++ object out of the Python object
-    X const& x = extract<X&>(x_obj);
-    assert(x.value() == 3);
-}
-
-
-#include "module_tail.cpp"
-
diff --git a/test/extract.py b/test/extract.py
deleted file mode 100644
index 505bdf07..00000000
--- a/test/extract.py
+++ /dev/null
@@ -1,104 +0,0 @@
-'''
-    >>> from extract_ext import *
-
-Just about anything has a truth value in Python
-
-    >>> assert check_bool(None)
-    >>> extract_bool(None)
-    0
-
-    >>> assert check_bool(2)
-    >>> extract_bool(2)
-    1
-
-    >>> assert not check_bool('')
-
-Check that object manager types work properly. These are a different
-case because they wrap Python objects instead of being wrapped by them.
-
-    >>> assert not check_list(2)
-    >>> try: x = extract_list(2)
-    ... except TypeError, x:
-    ...     if str(x) != 'Expecting an object of type list; got an object of type int instead':
-    ...         print x
-    ... else:
-    ...     print 'expected an exception, got', x, 'instead'
-
-Can't extract a list from a tuple. Use list(x) to convert a sequence
-to a list:
-    
-    >>> assert not check_list((1, 2, 3))
-    >>> assert check_list([1, 2, 3])
-    >>> extract_list([1, 2, 3])
-    [1, 2, 3]
-
-Can get a char const* from a Python string:
-
-    >>> assert check_cstring('hello')
-    >>> extract_cstring('hello')
-    'hello'
-
-Can't get a char const* from a Python int:
-    
-    >>> assert not check_cstring(1)
-    >>> try: x = extract_cstring(1)
-    ... except TypeError: pass
-    ... else:
-    ...     print 'expected an exception, got', x, 'instead'
-
-Extract an std::string (class) rvalue from a native Python type
-
-    >>> assert check_string('hello')
-    >>> extract_string('hello')
-    'hello'
-
-Constant references are not treated as rvalues for the purposes of
-extract:
-
-    >>> assert not check_string_cref('hello')
-
-We can extract lvalues where appropriate:
-
-    >>> x = X(42)
-    >>> check_X(x)
-    1
-    >>> extract_X(x)
-    X(42)
-
-    >>> check_X_ptr(x)
-    1
-    >>> extract_X_ptr(x)
-    X(42)
-    >>> extract_X_ref(x)
-    X(42)
-
-Demonstrate that double-extraction of an rvalue works, and all created
-copies of the object are destroyed:
-
-    >>> n = count_Xs()
-    >>> double_X(333)
-    666
-    >>> count_Xs() - n
-    0
-
-General check for cleanliness:
-
-    >>> del x
-    >>> count_Xs()
-    0
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/if_else.cpp b/test/if_else.cpp
deleted file mode 100644
index e2b50f28..00000000
--- a/test/if_else.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/static_assert.hpp>
-#include <boost/python/detail/if_else.hpp>
-#include <boost/type_traits/same_traits.hpp>
-
-    typedef char c1;
-    typedef char c2[2];
-    typedef char c3[3];
-    typedef char c4[4];
-
-template <unsigned size>
-struct choose
-{
-    typedef typename boost::python::detail::if_<
-        (sizeof(c1) == size)
-    >::template then<
-        c1
-    >::template elif<
-        (sizeof(c2) == size)
-    >::template then<
-        c2
-    >::template elif<
-        (sizeof(c3) == size)
-    >::template then<
-        c3
-    >::template elif<
-        (sizeof(c4) == size)
-    >::template then<
-        c4
-    >::template else_<void*>::type type;
-};
-
-int main()
-{
-    BOOST_STATIC_ASSERT((boost::is_same<choose<1>::type,c1>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<choose<2>::type,c2>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<choose<3>::type,c3>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<choose<4>::type,c4>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<choose<5>::type,void*>::value));
-    return 0;
-}
diff --git a/test/implicit.cpp b/test/implicit.cpp
deleted file mode 100644
index c4728548..00000000
--- a/test/implicit.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/class.hpp>
-#include <boost/python/implicit.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include "test_class.hpp"
-
-using namespace boost::python;
-
-typedef test_class<> X;
-
-int x_value(X const& x)
-{
-    return x.value();
-}
-
-X make_x(int n) { return X(n); }
-
-
-// foo/bar -- a regression for a vc7 bug workaround
-struct bar {};
-struct foo
-{
-    virtual void f() = 0;
-    operator bar() const { return bar(); }
-};
-
-BOOST_PYTHON_MODULE(implicit_ext)
-{
-    implicitly_convertible<foo,bar>();
-    implicitly_convertible<int,X>();
-    
-    def("x_value", x_value);
-    def("make_x", make_x);
-
-    class_<X>("X", init<int>())
-        .def("value", &X::value)
-        .def("set", &X::set)
-        ;
-    
-    implicitly_convertible<X,int>();
-}
-
-#include "module_tail.cpp"
diff --git a/test/implicit.py b/test/implicit.py
deleted file mode 100644
index 90a6b09e..00000000
--- a/test/implicit.py
+++ /dev/null
@@ -1,28 +0,0 @@
-'''
->>> from implicit_ext import *
->>> x_value(X(42))
-42
->>> x_value(42)
-42
->>> x = make_x(X(42))
->>> x.value()
-42
->>> try: make_x('fool')
-... except TypeError: pass
-... else: print 'no error'
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/indirect_traits_test.cpp b/test/indirect_traits_test.cpp
deleted file mode 100644
index 26c6e895..00000000
--- a/test/indirect_traits_test.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-//#include <stdio.h>
-#include <cassert>
-#include <boost/python/detail/indirect_traits.hpp>
-
-//#define print(expr) printf("%s ==> %s\n", #expr, expr)
-
-// not all the compilers can handle an incomplete class type here.
-struct X {};
-
-int main()
-{
-    using namespace boost::python::detail;
-
-    typedef void (X::*pmf)();
-
-    assert(is_reference_to_function<int (&)()>::value);
-    assert(!is_reference_to_function<int (*)()>::value);
-    assert(!is_reference_to_function<int&>::value);
-    assert(!is_reference_to_function<pmf>::value);
-    
-    assert(!is_pointer_to_function<int (&)()>::value);
-    assert(is_pointer_to_function<int (*)()>::value);
-    assert(!is_pointer_to_function<int (*&)()>::value);
-    assert(!is_pointer_to_function<int (*const&)()>::value);
-    assert(!is_pointer_to_function<pmf>::value);
-    
-    assert(!is_reference_to_function_pointer<int (&)()>::value);
-    assert(!is_reference_to_function_pointer<int (*)()>::value);
-    assert(!is_reference_to_function_pointer<int&>::value);
-    assert(is_reference_to_function_pointer<int (*&)()>::value);
-    assert(is_reference_to_function_pointer<int (*const&)()>::value);
-    assert(!is_reference_to_function_pointer<pmf>::value);
-
-    assert(is_reference_to_pointer<int*&>::value);
-    assert(is_reference_to_pointer<int* const&>::value);
-    assert(is_reference_to_pointer<int*volatile&>::value);
-    assert(is_reference_to_pointer<int*const volatile&>::value);
-    assert(is_reference_to_pointer<int const*&>::value);
-    assert(is_reference_to_pointer<int const* const&>::value);
-    assert(is_reference_to_pointer<int const*volatile&>::value);
-    assert(is_reference_to_pointer<int const*const volatile&>::value);
-    assert(!is_reference_to_pointer<pmf>::value);
-    
-    assert(!is_reference_to_pointer<int const volatile>::value);
-    assert(!is_reference_to_pointer<int>::value);
-    assert(!is_reference_to_pointer<int*>::value);
-
-    assert(!is_reference_to_const<int*&>::value);
-    assert(is_reference_to_const<int* const&>::value);
-    assert(!is_reference_to_const<int*volatile&>::value);
-    assert(is_reference_to_const<int*const volatile&>::value);
-    
-    assert(!is_reference_to_const<int const volatile>::value);
-    assert(!is_reference_to_const<int>::value);
-    assert(!is_reference_to_const<int*>::value);
-
-    assert(is_reference_to_non_const<int*&>::value);
-    assert(!is_reference_to_non_const<int* const&>::value);
-    assert(is_reference_to_non_const<int*volatile&>::value);
-    assert(!is_reference_to_non_const<int*const volatile&>::value);
-    
-    assert(!is_reference_to_non_const<int const volatile>::value);
-    assert(!is_reference_to_non_const<int>::value);
-    assert(!is_reference_to_non_const<int*>::value);
-    
-    assert(!is_reference_to_volatile<int*&>::value);
-    assert(!is_reference_to_volatile<int* const&>::value);
-    assert(is_reference_to_volatile<int*volatile&>::value);
-    assert(is_reference_to_volatile<int*const volatile&>::value);
-    
-    assert(!is_reference_to_volatile<int const volatile>::value);
-    assert(!is_reference_to_volatile<int>::value);
-    assert(!is_reference_to_volatile<int*>::value);
-
-    assert(!is_reference_to_class<int>::value);
-    assert(!is_reference_to_class<int&>::value);
-    assert(!is_reference_to_class<int*>::value);
-    
-    assert(!is_reference_to_class<X>::value);
-    assert(is_reference_to_class<X&>::value);
-    assert(is_reference_to_class<X const&>::value);
-    assert(is_reference_to_class<X volatile&>::value);
-    assert(is_reference_to_class<X const volatile&>::value);
-    
-    assert(!is_pointer_to_class<int>::value);
-    assert(!is_pointer_to_class<int*>::value);
-    assert(!is_pointer_to_class<int&>::value);
-    
-    assert(!is_pointer_to_class<X>::value);
-    assert(!is_pointer_to_class<X&>::value);
-    assert(is_pointer_to_class<X*>::value);
-    assert(is_pointer_to_class<X const*>::value);
-    assert(is_pointer_to_class<X volatile*>::value);
-    assert(is_pointer_to_class<X const volatile*>::value);
-
-    assert(is_reference_to_member_function_pointer<pmf&>::value);
-    assert(is_reference_to_member_function_pointer<pmf const&>::value);
-    assert(is_reference_to_member_function_pointer<pmf volatile&>::value);
-    assert(is_reference_to_member_function_pointer<pmf const volatile&>::value);
-    assert(!is_reference_to_member_function_pointer<pmf[2]>::value);
-    assert(!is_reference_to_member_function_pointer<pmf(&)[2]>::value);
-    assert(!is_reference_to_member_function_pointer<pmf>::value);
-    
-    return 0;
-}
diff --git a/test/injected.cpp b/test/injected.cpp
deleted file mode 100755
index c78dc259..00000000
--- a/test/injected.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright David Abrahams 2003. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include "test_class.hpp"
-#include <memory>
-#include <boost/shared_ptr.hpp>
-#include <boost/python/make_constructor.hpp>
-
-using namespace boost::python;
-
-typedef test_class<> X;
-
-X* empty() { return new X(1000); }
-
-std::auto_ptr<X> sum(int a, int b) { return std::auto_ptr<X>(new X(a+b)); }
-
-boost::shared_ptr<X> product(int a, int b, int c)
-{
-    return boost::shared_ptr<X>(new X(a*b*c));
-}
-
-BOOST_PYTHON_MODULE(injected_ext)
-{
-    class_<X>("X", init<int>())
-        .def("__init__", make_constructor(empty))
-        .def("__init__", make_constructor(sum))
-        .def("__init__", make_constructor(product))
-        .def("value", &X::value)
-        ;
-}
diff --git a/test/injected.py b/test/injected.py
deleted file mode 100644
index 3507b6e1..00000000
--- a/test/injected.py
+++ /dev/null
@@ -1,25 +0,0 @@
-'''
->>> from injected_ext import *
->>> X(3,5).value() - (3+5)
-0
->>> X(3,5,7).value() - (3*5*7)
-0
->>> X().value()
-1000
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
-
diff --git a/test/input_iterator.cpp b/test/input_iterator.cpp
deleted file mode 100644
index e4021e83..00000000
--- a/test/input_iterator.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/iterator.hpp>
-#include <boost/iterator/transform_iterator.hpp>
-#include <list>
-
-using namespace boost::python;
-
-typedef std::list<int> list_int;
-
-// Prove that we can handle InputIterators which return rvalues.
-struct doubler
-{
-    typedef int result_type;
-    int operator()(int x) const { return x * 2; }
-};
-
-typedef boost::transform_iterator<doubler, list_int::iterator> doubling_iterator;
-typedef std::pair<doubling_iterator,doubling_iterator> list_range2;
-
-list_range2 range2(list_int& x)
-{
-    return list_range2(
-        boost::make_transform_iterator<doubler>(x.begin(), doubler())
-      , boost::make_transform_iterator<doubler>(x.end(), doubler()));
-}
-
-// We do this in a separate module from iterators_ext (iterators.cpp)
-// to work around an MSVC6 linker bug, which causes it to complain
-// about a "duplicate comdat" if the input iterator is instantiated in
-// the same module with the others.
-BOOST_PYTHON_MODULE(input_iterator)
-{
-    def("range2", &::range2);
-    
-    class_<list_range2>("list_range2")
-        // We can wrap InputIterators which return by-value
-        .def("__iter__"
-             , range(&list_range2::first, &list_range2::second))
-        ;
-}
-
-#include "module_tail.cpp"
diff --git a/test/iterator.cpp b/test/iterator.cpp
deleted file mode 100644
index a52e0710..00000000
--- a/test/iterator.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/return_internal_reference.hpp>
-#include <boost/python/copy_non_const_reference.hpp>
-#include <boost/python/return_value_policy.hpp>
-#include <boost/python/iterator.hpp>
-#include <list>
-#include <utility>
-#include <iterator>
-#include <algorithm>
-
-using namespace boost::python;
-
-typedef std::list<int> list_int;
-typedef std::list<list_int> list_list;
-
-
-void push_back(list_int& x, int y)
-{
-    x.push_back(y);
-}
-
-void push_list_back(list_list& x, list_int const& y)
-{
-    x.push_back(y);
-}
-
-int back(list_int& x)
-{
-    return x.back();
-}
-
-typedef std::pair<list_int::iterator,list_int::iterator> list_range;
-
-struct list_range2 : list_range
-{
-    list_int::iterator& begin() { return this->first; }
-    list_int::iterator& end() { return this->second; }
-};
-
-list_range range(list_int& x)
-{
-    return list_range(x.begin(), x.end());
-}
-
-struct two_lists
-{
-    two_lists()
-    {
-        int primes[] = { 2, 3, 5, 7, 11, 13 };
-        std::copy(primes, primes + sizeof(primes)/sizeof(*primes), std::back_inserter(one));
-        int evens[] = { 2, 4, 6, 8, 10, 12 };
-        std::copy(evens, evens + sizeof(evens)/sizeof(*evens), std::back_inserter(two));
-    }
-
-    struct two_start
-    {
-        typedef list_int::iterator result_type;
-        result_type operator()(two_lists& ll) const { return ll.two.begin(); }
-    };
-    friend struct two_start;
-    
-    list_int::iterator one_begin() { return one.begin(); }
-    list_int::iterator two_begin() { return two.begin(); }
-
-    list_int::iterator one_end() { return one.end(); }
-    list_int::iterator two_end() { return two.end(); }
-        
-private:
-    list_int one;
-    list_int two;
-};
-
-BOOST_PYTHON_MODULE(iterator_ext)
-{
-    using boost::python::iterator; // gcc 2.96 bug workaround
-    def("range", &::range);
-
-    class_<list_int>("list_int")
-        .def("push_back", push_back)
-        .def("back", back)
-        .def("__iter__", iterator<list_int>())
-        ;
-
-    class_<list_range>("list_range")
-
-        // We can specify data members
-        .def("__iter__"
-             , range(&list_range::first, &list_range::second))
-        ;
-
-    // No runtime tests for this one yet
-    class_<list_range2>("list_range2")
-
-        // We can specify member functions returning a non-const reference
-        .def("__iter__", range(&list_range2::begin, &list_range2::end))
-        ;
-
-    class_<two_lists>("two_lists")
-
-        // We can spcify member functions
-        .add_property(
-            "primes"
-            , range(&two_lists::one_begin, &two_lists::one_end))
-
-        // Prove that we can explicitly specify call policies
-        .add_property(
-            "evens"
-            , range<return_value_policy<copy_non_const_reference> >(
-                &two_lists::two_begin, &two_lists::two_end))
-
-        // Prove that we can specify call policies and target
-        .add_property(
-            "twosies"
-            , range<return_value_policy<copy_non_const_reference>, two_lists>(
-                // And we can use adaptable function objects when
-                // partial specialization is available.
-# ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-                two_lists::two_start()
-# else
-                &two_lists::two_begin
-# endif 
-                , &two_lists::two_end))
-        ;
-
-    class_<list_list>("list_list")
-        .def("push_back", push_list_back)
-        .def("__iter__", iterator<list_list,return_internal_reference<> >())
-        ;
-}
-
-#include "module_tail.cpp"
diff --git a/test/iterator.py b/test/iterator.py
deleted file mode 100644
index 28153e6c..00000000
--- a/test/iterator.py
+++ /dev/null
@@ -1,74 +0,0 @@
-'''
->>> from iterator_ext import *
->>> from input_iterator import *
->>> x = list_int()
->>> x.push_back(1)
->>> x.back()
-1
->>> x.push_back(3)
->>> x.push_back(5)
->>> for y in x:
-...     print y
-1
-3
-5
->>> z = range(x)
->>> for y in z:
-...     print y
-1
-3
-5
-
-   Range2 wraps a transform_iterator which doubles the elements it
-   traverses. This proves we can wrap input iterators
-   
->>> z2 = range2(x)
->>> for y in z2:
-...     print y
-2
-6
-10
-
->>> l2 = two_lists()
->>> for y in l2.primes:
-...     print y
-2
-3
-5
-7
-11
-13
->>> for y in l2.evens:
-...     print y
-2
-4
-6
-8
-10
-12
->>> ll = list_list()
->>> ll.push_back(x)
->>> x.push_back(7)
->>> ll.push_back(x)
->>> for a in ll:
-...     for b in a:
-...         print b,
-...     print
-...
-1 3 5
-1 3 5 7
-'''
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/keywords.cpp b/test/keywords.cpp
deleted file mode 100755
index 36205656..00000000
--- a/test/keywords.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python.hpp>
-#include <string>
-
-struct Foo
-{
-    Foo(
-        int a = 0
-        , double b = 0
-        , const std::string &n = std::string()
-        ) : 
-    a_(a)
-        , b_(b)
-        , n_(n)
-    {}
-
-    void set(int a=0, double b=0, const std::string &n=std::string()) 
-    {
-        a_ = a; 
-        b_ = b;
-        n_ = n;
-    }
-
-    int geta() const { return a_; }
-
-    double getb() const { return b_; }
-
-    std::string getn() const { return n_; }
-
-private:
-    int a_;
-    double b_;
-    std::string n_;
-};
-
-struct Bar
-{
-    Bar(
-        int a = 0
-        , double b = 0
-        , const std::string &n = std::string()
-        ) : 
-    a_(a)
-        , b_(b)
-        , n_(n)
-    {}
-
-    void set(int a=0, double b=0, const std::string &n=std::string()) 
-    {
-        a_ = a; 
-        b_ = b;
-        n_ = n;
-    }
-
-    int geta() const { return a_; }
-
-    double getb() const { return b_; }
-
-    std::string getn() const { return n_; }
-
-private:
-    int a_;
-    double b_;
-    std::string n_;
-};
-
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(bar_set, Bar::set, 0,3)
-
-using namespace boost::python;
-#if BOOST_WORKAROUND(__GNUC__, == 2)
-using boost::python::arg;
-#endif 
-BOOST_PYTHON_MODULE(keywords)
-{
-   class_<Foo>("Foo" , init<
-                          int
-                        , double
-                        , const std::string &
-                      >(
-                        (  arg("a") = 0
-                          , arg("b") = 0.0
-                          , arg("n") = std::string()
-                        )
-                       ))
-
-      .def("set", &Foo::set, (arg("a") = 0, arg("b") = 0.0, arg("n") = std::string()) )
-      .def("a", &Foo::geta)
-      .def("b", &Foo::getb)
-      .def("n", &Foo::getn)
-      ;
-
-   class_<Bar>("Bar" , init<optional<
-                          int
-                        , double
-                        , const std::string &
-                        >
-                      >()
-                       )
-
-      .def("set", &Bar::set, bar_set())
-      .def("a", &Bar::geta)
-      .def("b", &Bar::getb)
-      .def("n", &Bar::getn)
-      ;
-
-}
-
-
-
-#include "module_tail.cpp"
diff --git a/test/keywords_test.py b/test/keywords_test.py
deleted file mode 100644
index 79cdf148..00000000
--- a/test/keywords_test.py
+++ /dev/null
@@ -1,96 +0,0 @@
-'''
->>> from keywords import *
->>> f = Foo()
->>> f.a(), f.b(), f.n()
-(0, 0.0, '')
->>> f = Foo(1)
->>> f.a(), f.b(), f.n()
-(1, 0.0, '')
->>> f = Foo(1,1.0)
->>> f.a(), f.b(), f.n()
-(1, 1.0, '')
->>> f = Foo(1,1.0,"1")
->>> f.a(), f.b(), f.n()
-(1, 1.0, '1')
->>> f = Foo(a=1)
->>> f.a(), f.b(), f.n()
-(1, 0.0, '')
->>> f = Foo(b=1)
->>> f.a(), f.b(), f.n()
-(0, 1.0, '')
->>> f = Foo(n="1")
->>> f.a(), f.b(), f.n()
-(0, 0.0, '1')
->>> f = Foo(1,n="1")
->>> f.a(), f.b(), f.n()
-(1, 0.0, '1')
->>> f.set()
->>> f.a(), f.b(), f.n()
-(0, 0.0, '')
->>> f.set(1)
->>> f.a(), f.b(), f.n()
-(1, 0.0, '')
->>> f.set(1,1.0)
->>> f.a(), f.b(), f.n()
-(1, 1.0, '')
->>> f.set(1,1.0,"1")
->>> f.a(), f.b(), f.n()
-(1, 1.0, '1')
->>> f.set(a=1)
->>> f.a(), f.b(), f.n()
-(1, 0.0, '')
->>> f.set(b=1)
->>> f.a(), f.b(), f.n()
-(0, 1.0, '')
->>> f.set(n="1")
->>> f.a(), f.b(), f.n()
-(0, 0.0, '1')
->>> f.set(1,n="1")
->>> f.a(), f.b(), f.n()
-(1, 0.0, '1')
-
-# lets see how badly we've broken the 'regular' functions
->>> f = Bar()
->>> f.a(), f.b(), f.n()
-(0, 0.0, '')
->>> f = Bar(1)
->>> f.a(), f.b(), f.n()
-(1, 0.0, '')
->>> f = Bar(1,1.0)
->>> f.a(), f.b(), f.n()
-(1, 1.0, '')
->>> f = Bar(1,1.0,"1")
->>> f.a(), f.b(), f.n()
-(1, 1.0, '1')
->>> f.set()
->>> f.a(), f.b(), f.n()
-(0, 0.0, '')
->>> f.set(1)
->>> f.a(), f.b(), f.n()
-(1, 0.0, '')
->>> f.set(1,1.0)
->>> f.a(), f.b(), f.n()
-(1, 1.0, '')
->>> f.set(1,1.0,"1")
->>> f.a(), f.b(), f.n()
-(1, 1.0, '1')
-'''
-
-
-
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
-
diff --git a/test/list.cpp b/test/list.cpp
deleted file mode 100644
index 15871e6a..00000000
--- a/test/list.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/list.hpp>
-#include <boost/python/make_function.hpp>
-#include <boost/lexical_cast.hpp>
-#include "test_class.hpp"
-
-using namespace boost::python;
-
-object new_list()
-{
-    return list();
-}
-
-list listify(object x)
-{
-    return list(x);
-}
-
-object listify_string(char const* s)
-{
-    return list(s);
-}
-
-std::string x_rep(test_class<> const& x)
-{
-    return "X("  + boost::lexical_cast<std::string>(x.value()) + ")";
-}
-
-object apply_object_list(object f, list x)
-{
-    return f(x);
-}
-
-list apply_list_list(object f, list x)
-{
-    return call<list>(f.ptr(), x);
-}
-
-void append_object(list& x, object y)
-{
-    x.append(y);
-}
-
-void append_list(list& x, list const& y)
-{
-    x.append(y);
-}
-
-typedef test_class<> X;
-
-int notcmp(object const& x, object const& y)
-{
-    return y < x ? -1 : y > x ? 1 : 0;
-}
-
-void exercise(list x, object y, object print)
-{
-    x.append(y);
-    x.append(5);
-    x.append(X(3));
-    
-    print("after append:");
-    print(x);
-    
-    print("number of", y, "instances:", x.count(y));
-    
-    print("number of 5s:", x.count(5));
-
-    x.extend("xyz");
-    print("after extend:");
-    print(x);
-    print("index of", y, "is:", x.index(y));
-    print("index of 'l' is:", x.index("l"));
-    
-    x.insert(4, 666);
-    print("after inserting 666:");
-    print(x);
-    print("inserting with object as index:");
-    x.insert(x[x.index(5)], "---");
-    print(x);
-    
-    print("popping...");
-    x.pop();
-    print(x);
-    x.pop(x[x.index(5)]);
-    print(x);
-    x.pop(x.index(5));
-    print(x);
-
-    print("removing", y);
-    x.remove(y);
-    print(x);
-    print("removing", 666);
-    x.remove(666);
-    print(x);
-
-    print("reversing...");
-    x.reverse();
-    print(x);
-
-    print("sorted:");
-    x.pop(2); // make sorting predictable
-    x.sort();
-    print(x);
-
-    print("reverse sorted:");
-    x.sort(&notcmp);
-    print(x);
-
-    list w;
-    w.append(5);
-    w.append(6);
-    w += "hi";
-    assert(w[0] == 5);
-    assert(w[1] == 6);
-    assert(w[2] == 'h');
-    assert(w[3] == 'i');
-}
-
-BOOST_PYTHON_MODULE(list_ext)
-{
-    def("new_list", new_list);
-    def("listify", listify);
-    def("listify_string", listify_string);
-    def("apply_object_list", apply_object_list);
-    def("apply_list_list", apply_list_list);
-        
-    def("append_object", append_object);
-    def("append_list", append_list);
-
-    def("exercise", exercise);
-    
-    class_<X>("X", init<int>())
-        .def( "__repr__", x_rep)
-        ;
-}
-
diff --git a/test/list.py b/test/list.py
deleted file mode 100644
index 194eef32..00000000
--- a/test/list.py
+++ /dev/null
@@ -1,115 +0,0 @@
-'''
->>> from list_ext import *
-
->>> new_list()
-[]
-
->>> listify((1,2,3))
-[1, 2, 3]
-
->>> letters = listify_string('hello')
->>> letters
-['h', 'e', 'l', 'l', 'o']
-
->>> X(22)
-X(22)
-
->>> def identity(x):
-...     return x
->>> assert apply_object_list(identity, letters) is letters
-
-  5 is not convertible to a list
-
->>> try: result = apply_object_list(identity, 5)
-... except TypeError: pass
-... else: print 'expected an exception, got', result, 'instead'
-
->>> assert apply_list_list(identity, letters) is letters
-
-  5 is not convertible to a list as a return value
-
->>> try: result = apply_list_list(len, letters)
-... except TypeError: pass
-... else: print 'expected an exception, got', result, 'instead'
-
->>> append_object(letters, '.')
->>> letters
-['h', 'e', 'l', 'l', 'o', '.']
-
-  tuples do not automatically convert to lists when passed as arguments
-  
->>> try: append_list(letters, (1,2))
-... except TypeError: pass
-... else: print 'expected an exception'
-
->>> append_list(letters, [1,2])
->>> letters
-['h', 'e', 'l', 'l', 'o', '.', [1, 2]]
-
-    Check that subclass functions are properly called
-    
->>> class mylist(list):
-...     def append(self, o):
-...         list.append(self, o)
-...         if not hasattr(self, 'nappends'):
-...             self.nappends = 1
-...         else:
-...             self.nappends += 1
-...
->>> l2 = mylist()
->>> append_object(l2, 'hello')
->>> append_object(l2, 'world')
->>> l2
-['hello', 'world']
->>> l2.nappends
-2
-
->>> def printer(*args):
-...     for x in args: print x,
-...     print
-...
-
->>> y = X(42)
->>> exercise(letters, y, printer)
-after append:
-['h', 'e', 'l', 'l', 'o', '.', [1, 2], X(42), 5, X(3)]
-number of X(42) instances: 1
-number of 5s: 1
-after extend:
-['h', 'e', 'l', 'l', 'o', '.', [1, 2], X(42), 5, X(3), 'x', 'y', 'z']
-index of X(42) is: 7
-index of 'l' is: 2
-after inserting 666:
-['h', 'e', 'l', 'l', 666, 'o', '.', [1, 2], X(42), 5, X(3), 'x', 'y', 'z']
-inserting with object as index:
-['h', 'e', 'l', 'l', 666, '---', 'o', '.', [1, 2], X(42), 5, X(3), 'x', 'y', 'z']
-popping...
-['h', 'e', 'l', 'l', 666, '---', 'o', '.', [1, 2], X(42), 5, X(3), 'x', 'y']
-['h', 'e', 'l', 'l', 666, 'o', '.', [1, 2], X(42), 5, X(3), 'x', 'y']
-['h', 'e', 'l', 'l', 666, 'o', '.', [1, 2], X(42), X(3), 'x', 'y']
-removing X(42)
-['h', 'e', 'l', 'l', 666, 'o', '.', [1, 2], X(3), 'x', 'y']
-removing 666
-['h', 'e', 'l', 'l', 'o', '.', [1, 2], X(3), 'x', 'y']
-reversing...
-['y', 'x', X(3), [1, 2], '.', 'o', 'l', 'l', 'e', 'h']
-sorted:
-[[1, 2], '.', 'e', 'h', 'l', 'l', 'o', 'x', 'y']
-reverse sorted:
-['y', 'x', 'o', 'l', 'l', 'h', 'e', '.', [1, 2]]
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/long.cpp b/test/long.cpp
deleted file mode 100644
index 1fb96e50..00000000
--- a/test/long.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/long.hpp>
-#include <boost/python/class.hpp>
-#include <cassert>
-
-using namespace boost::python;
-
-object new_long()
-{
-    return long_();
-}
-
-long_ longify(object x)
-{
-    return long_(x);
-}
-
-object longify_string(char const* s)
-{
-    return long_(s);
-}
-
-char const* is_long1(long_& x)
-{
-    long_ y = x;
-    x += 50;
-    assert(x == y + 50);
-    return "yes";
-}
-
-int is_long2(char const*)
-{
-    return 0;
-}
-
-// tests for accepting objects (and derived classes) in constructors
-// from "Milind Patil" <milind_patil-at-hotmail.com>
-
-struct Y
-{
-    Y(boost::python::long_) {}
-};
-
-BOOST_PYTHON_MODULE(long_ext)
-{
-    def("new_long", new_long);
-    def("longify", longify);
-    def("longify_string", longify_string);
-    def("is_long", is_long1);
-    def("is_long", is_long2);
-    
-    class_< Y >("Y", init< boost::python::long_ >())
-        ;
-}
-
diff --git a/test/long.py b/test/long.py
deleted file mode 100644
index 9aeab91c..00000000
--- a/test/long.py
+++ /dev/null
@@ -1,30 +0,0 @@
-'''
->>> from long_ext import *
->>> new_long()
-0L
->>> longify(42)
-42L
->>> longify_string('300')
-300L
->>> is_long(20L)
-'yes'
->>> is_long('20')
-0
-
->>> x = Y(4294967295)
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/m1.cpp b/test/m1.cpp
deleted file mode 100644
index 45dbf58b..00000000
--- a/test/m1.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-
-#include <boost/python/def.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/lvalue_from_pytype.hpp>
-#include <boost/python/copy_const_reference.hpp>
-#include <boost/python/return_value_policy.hpp>
-#include <boost/python/to_python_converter.hpp>
-#include <boost/python/errors.hpp>
-#include <boost/python/manage_new_object.hpp>
-#include <string.h>
-#include "simple_type.hpp"
-#include "complicated.hpp"
-
-// Declare some straightforward extension types
-extern "C" void
-dealloc(PyObject* self)
-{
-    PyObject_Del(self);
-}
-
-// Noddy is a type we got from one of the Python sample files
-struct NoddyObject : PyObject
-{
-    int x;
-};
-
-PyTypeObject NoddyType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
-    "Noddy",
-    sizeof(NoddyObject),
-    0,
-    dealloc, /*tp_dealloc*/
-    0,          /*tp_print*/
-    0,          /*tp_getattr*/
-    0,          /*tp_setattr*/
-    0,          /*tp_compare*/
-    0,          /*tp_repr*/
-    0,          /*tp_as_number*/
-    0,          /*tp_as_sequence*/
-    0,          /*tp_as_mapping*/
-    0,          /*tp_hash */
-};
-
-// Create a Noddy containing 42
-PyObject* new_noddy()
-{
-    NoddyObject* noddy = PyObject_New(NoddyObject, &NoddyType);
-    noddy->x = 42;
-    return (PyObject*)noddy;
-}
-
-// Simple is a wrapper around a struct simple, which just contains a char*
-struct SimpleObject
-{
-    PyObject_HEAD
-    simple x;
-};
-
-struct extract_simple_object
-{
-    static simple& execute(SimpleObject& o) { return o.x; }
-};
-
-PyTypeObject SimpleType = {
-    PyObject_HEAD_INIT(NULL)
-    0,
-    "Simple",
-    sizeof(SimpleObject),
-    0,
-    dealloc,    /*tp_dealloc*/
-    0,          /*tp_print*/
-    0,          /*tp_getattr*/
-    0,          /*tp_setattr*/
-    0,          /*tp_compare*/
-    0,          /*tp_repr*/
-    0,          /*tp_as_number*/
-    0,          /*tp_as_sequence*/
-    0,          /*tp_as_mapping*/
-    0,          /*tp_hash */
-};
-
-// Create a Simple containing "hello, world"
-PyObject* new_simple()
-{
-    SimpleObject* simple = PyObject_New(SimpleObject, &SimpleType);
-    simple->x.s = "hello, world";
-    return (PyObject*)simple;
-}
-
-//
-// Declare some wrappers/unwrappers to test the low-level conversion
-// mechanism. 
-//
-using boost::python::to_python_converter;
-
-// Wrap a simple by copying it into a Simple
-struct simple_to_python
-    : to_python_converter<simple, simple_to_python>
-{
-    static PyObject* convert(simple const& x)
-    {
-        SimpleObject* p = PyObject_New(SimpleObject, &SimpleType);
-        p->x = x;
-        return (PyObject*)p;
-    }
-};
-
-struct int_from_noddy
-{
-    static int& execute(NoddyObject& p)
-    {
-        return p.x;
-    }
-};
-
-//
-// Some C++ functions to expose to Python
-//
-
-// Returns the length of s's held string
-int f(simple const& s)
-{
-    return strlen(s.s);
-}
-
-int f_mutable_ref(simple& s)
-{
-    return strlen(s.s);
-}
-
-int f_mutable_ptr(simple* s)
-{
-    return strlen(s->s);
-}
-
-int f_const_ptr(simple const* s)
-{
-    return strlen(s->s);
-}
-
-int f2(SimpleObject const& s)
-{
-    return strlen(s.x.s);
-}
-
-// A trivial passthru function for simple objects
-simple const& g(simple const& x)
-{
-    return x;
-}
-
-struct A
-{
-    A() : x(0) {}
-    virtual ~A() {}
-    char const* name() { return "A"; }
-    int x;
-};
-
-struct B : A
-{
-    B() : x(1) {}
-    static char const* name(B*) { return "B"; }
-    int x;
-};
-
-struct C : A
-{
-    C() : x(2) {}
-    char const* name() { return "C"; }
-    virtual ~C() {}
-    int x;
-};
-
-struct D : B, C
-{
-    D() : x(3) {}
-    char const* name() { return "D"; }
-    int x;
-};
-
-A take_a(A const& a) { return a; }
-B take_b(B& b) { return b; }
-C take_c(C* c) { return *c; }
-D take_d(D* const& d) { return *d; }
-
-D take_d_shared_ptr(boost::shared_ptr<D> d) { return *d; }
-
-boost::shared_ptr<A> d_factory() { return boost::shared_ptr<B>(new D); }
-
-struct Unregistered {};
-Unregistered make_unregistered(int) { return Unregistered(); }
-
-Unregistered* make_unregistered2(int) { return new Unregistered; }
-
-BOOST_PYTHON_MODULE(m1)
-{
-    using namespace boost::python;
-    using boost::shared_ptr;
-    
-    simple_to_python();
-
-    lvalue_from_pytype<int_from_noddy,&NoddyType>();
-
-    lvalue_from_pytype<
-#if !defined(BOOST_MSVC) || BOOST_MSVC > 1300 // doesn't support non-type member pointer parameters
-        extract_member<SimpleObject, simple, &SimpleObject::x>
-#else 
-        extract_simple_object
-#endif 
-        , &SimpleType
-        >();
-
-    lvalue_from_pytype<extract_identity<SimpleObject>,&SimpleType>();
-    
-    def("new_noddy", new_noddy);
-    def("new_simple", new_simple);
-
-    def("make_unregistered", make_unregistered);
-    def("make_unregistered2", make_unregistered2, return_value_policy<manage_new_object>());
-
-      // Expose f() in all its variations
-    def("f", f);
-    def("f_mutable_ref", f_mutable_ref);
-    def("f_mutable_ptr", f_mutable_ptr);
-    def("f_const_ptr", f_const_ptr);
-
-    def("f2", f2);
-        
-      // Expose g()
-    def("g", g , return_value_policy<copy_const_reference>()
-        );
-
-    def("take_a", take_a);
-    def("take_b", take_b);
-    def("take_c", take_c);
-    def("take_d", take_d);
-
-
-    def("take_d_shared_ptr", take_d_shared_ptr);
-    def("d_factory", d_factory);
-
-    class_<A, shared_ptr<A> >("A")
-        .def("name", &A::name)
-        ;
-
-    // sequence points don't ensure that "A" is constructed before "B"
-    // or "C" below if we make them part of the same chain
-    class_<B,bases<A> >("B")
-        .def("name", &B::name)
-        ;
-        
-    class_<C,bases<A> >("C")
-        .def("name", &C::name)
-        ;
-
-    class_<D, bases<B,C> >("D")
-        .def("name", &D::name)
-        ;
-
-    class_<complicated>("complicated",
-                        init<simple const&,int>())
-        .def(init<simple const&>())
-        .def("get_n", &complicated::get_n)
-        ;
-}
-
-#include "module_tail.cpp"
diff --git a/test/m2.cpp b/test/m2.cpp
deleted file mode 100644
index 3108b2de..00000000
--- a/test/m2.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-// This module exercises the converters exposed in m1 at a low level
-// by exposing raw Python extension functions that use wrap<> and
-// unwrap<> objects.
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/copy_non_const_reference.hpp>
-#include <boost/python/copy_const_reference.hpp>
-#include <boost/python/return_value_policy.hpp>
-#include "simple_type.hpp"
-
-// Get a simple (by value) from the argument, and return the
-// string it holds.
-PyObject* unwrap_simple(simple x)
-{
-    return PyString_FromString(x.s);
-}
-
-// Likewise, but demands that its possible to get a non-const
-// reference to the simple.
-PyObject* unwrap_simple_ref(simple& x)
-{
-    return PyString_FromString(x.s);
-}
-
-// Likewise, with a const reference to the simple object.
-PyObject* unwrap_simple_const_ref(simple const& x)
-{
-    return PyString_FromString(x.s);
-}
-
-// Get an int (by value) from the argument, and convert it to a
-// Python Int.
-PyObject* unwrap_int(int x)
-{
-    return PyInt_FromLong(x);
-}
-
-// Get a non-const reference to an int from the argument
-PyObject* unwrap_int_ref(int& x)
-{
-    return PyInt_FromLong(x);
-}
-
-// Get a const reference to an  int from the argument.
-PyObject* unwrap_int_const_ref(int const& x)
-{
-    return PyInt_FromLong(x);
-}
-
-// rewrap<T> extracts a T from the argument, then converts the T back
-// to a PyObject* and returns it.
-template <class T>
-struct rewrap
-{
-    static T f(T x) { return x; }
-};
-
-BOOST_PYTHON_MODULE(m2)
-{
-    using boost::python::return_value_policy;
-    using boost::python::copy_const_reference;
-    using boost::python::copy_non_const_reference;
-    using boost::python::def;
-    
-    def("unwrap_int", unwrap_int);
-    def("unwrap_int_ref", unwrap_int_ref);
-    def("unwrap_int_const_ref", unwrap_int_const_ref);
-    def("unwrap_simple", unwrap_simple);
-    def("unwrap_simple_ref", unwrap_simple_ref);
-    def("unwrap_simple_const_ref", unwrap_simple_const_ref);
-
-    def("wrap_int", &rewrap<int>::f);
-        
-    def("wrap_int_ref", &rewrap<int&>::f
-        , return_value_policy<copy_non_const_reference>()
-        );
-        
-    def("wrap_int_const_ref", &rewrap<int const&>::f
-        , return_value_policy<copy_const_reference>()
-        );
-        
-    def("wrap_simple", &rewrap<simple>::f);
-        
-    def("wrap_simple_ref", &rewrap<simple&>::f
-        , return_value_policy<copy_non_const_reference>()
-        );
-        
-    def("wrap_simple_const_ref", &rewrap<simple const&>::f
-        , return_value_policy<copy_const_reference>()
-            );
-}
-
-#include "module_tail.cpp"
diff --git a/test/map_indexing_suite.cpp b/test/map_indexing_suite.cpp
deleted file mode 100644
index 757e1181..00000000
--- a/test/map_indexing_suite.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <boost/python/suite/indexing/map_indexing_suite.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/implicit.hpp>
-
-using namespace boost::python;
-
-struct X // a container element
-{
-    std::string s;
-    X():s("default") {}
-    X(std::string s):s(s) {}
-    std::string repr() const { return s; }
-    void reset() { s = "reset"; }
-    void foo() { s = "foo"; }
-    bool operator==(X const& x) const { return s == x.s; }
-    bool operator!=(X const& x) const { return s != x.s; }
-};
-
-std::string x_value(X const& x)
-{
-    return "gotya " + x.s;
-}
-
-BOOST_PYTHON_MODULE(map_indexing_suite_ext)
-{    
-    class_<X>("X")
-        .def(init<>())
-        .def(init<X>())
-        .def(init<std::string>())
-        .def("__repr__", &X::repr)
-        .def("reset", &X::reset)
-        .def("foo", &X::foo)
-    ;
-
-    def("x_value", x_value);
-    implicitly_convertible<std::string, X>();
-
-    class_<std::map<std::string, X> >("XMap")
-        .def(map_indexing_suite<std::map<std::string, X> >())
-    ;
-        
-    // Compile check only...
-    class_<std::map<int, int> >("IntMap")
-        .def(map_indexing_suite<std::map<int, int> >())
-    ;
-}
-
-#include "module_tail.cpp"
diff --git a/test/map_indexing_suite.py b/test/map_indexing_suite.py
deleted file mode 100644
index f6752684..00000000
--- a/test/map_indexing_suite.py
+++ /dev/null
@@ -1,209 +0,0 @@
-'''
-
-#####################################################################
-# Check an object that we will use as container element
-#####################################################################
-
->>> from map_indexing_suite_ext import *
->>> x = X('hi')
->>> x
-hi
->>> x.reset() # a member function that modifies X
->>> x
-reset
->>> x.foo() # another member function that modifies X
->>> x
-foo
-
-# test that a string is implicitly convertible
-# to an X
->>> x_value('bochi bochi') 
-'gotya bochi bochi'
-
-#####################################################################
-# Iteration
-#####################################################################
->>> def print_xmap(xmap):
-...     s = '[ '
-...     for x in xmap: 
-...         s += repr(x)
-...         s += ' ' 
-...     s += ']'
-...     print s
-
-#####################################################################
-# Setting (adding entries)
-#####################################################################
->>> xm = XMap()
->>> xm['joel'] = 'apple'
->>> xm['tenji'] = 'orange'
->>> xm['mariel'] = 'grape'
->>> xm['tutit'] = 'banana'
->>> xm['kim'] = 'kiwi'
-
->>> print_xmap(xm)
-[ (joel, apple) (kim, kiwi) (mariel, grape) (tenji, orange) (tutit, banana) ]
-
-#####################################################################
-# Changing an entry
-#####################################################################
->>> xm['joel'] = 'pineapple'
->>> print_xmap(xm)
-[ (joel, pineapple) (kim, kiwi) (mariel, grape) (tenji, orange) (tutit, banana) ]
-
-#####################################################################
-# Deleting an entry
-#####################################################################
->>> del xm['joel']
->>> print_xmap(xm)
-[ (kim, kiwi) (mariel, grape) (tenji, orange) (tutit, banana) ]
-
-#####################################################################
-# adding an entry
-#####################################################################
->>> xm['joel'] = 'apple'
->>> print_xmap(xm)
-[ (joel, apple) (kim, kiwi) (mariel, grape) (tenji, orange) (tutit, banana) ]
-
-#####################################################################
-# Indexing
-#####################################################################
->>> len(xm)
-5
->>> xm['joel']
-apple
->>> xm['tenji']
-orange
->>> xm['mariel']
-grape
->>> xm['tutit']
-banana
->>> xm['kim']
-kiwi
-
-#####################################################################
-# Calling a mutating function of a container element
-#####################################################################
->>> xm['joel'].reset()
->>> xm['joel']
-reset
-
-#####################################################################
-# Copying a container element
-#####################################################################
->>> x = X(xm['mariel'])
->>> x
-grape
->>> x.foo()
->>> x
-foo
->>> xm['mariel'] # should not be changed to 'foo'
-grape
-
-#####################################################################
-# Referencing a container element
-#####################################################################
->>> x = xm['mariel']
->>> x
-grape
->>> x.foo()
->>> x
-foo
->>> xm['mariel'] # should be changed to 'foo'
-foo
-
->>> xm['mariel'] = 'grape' # take it back
->>> xm['joel'] = 'apple' # take it back
-
-#####################################################################
-# Contains
-#####################################################################
->>> assert 'joel' in xm
->>> assert 'mariel' in xm
->>> assert 'tenji' in xm
->>> assert 'tutit' in xm
->>> assert 'kim' in xm
->>> assert not 'X' in xm
->>> assert not 12345 in xm
-
-#####################################################################
-# Some references to the container elements 
-#####################################################################
-
->>> z0 = xm['joel']
->>> z1 = xm['mariel']
->>> z2 = xm['tenji']
->>> z3 = xm['tutit']
->>> z4 = xm['kim']
-
->>> z0 # proxy
-apple
->>> z1 # proxy
-grape
->>> z2 # proxy
-orange
->>> z3 # proxy
-banana
->>> z4 # proxy
-kiwi
-
-#####################################################################
-# Delete some container element 
-#####################################################################
-
->>> del xm['tenji']
->>> print_xmap(xm)
-[ (joel, apple) (kim, kiwi) (mariel, grape) (tutit, banana) ]
-
->>> del xm['tutit']
->>> print_xmap(xm)
-[ (joel, apple) (kim, kiwi) (mariel, grape) ]
-
-#####################################################################
-# Show that the references are still valid 
-#####################################################################
->>> z0 # proxy
-apple
->>> z1 # proxy
-grape
->>> z2 # proxy detached
-orange
->>> z3 # proxy detached
-banana
->>> z4 # proxy
-kiwi
-
-#####################################################################
-# Show that iteration allows mutable access to the elements
-#####################################################################
->>> for x in xm:
-...     x.data().reset()
->>> print_xmap(xm)
-[ (joel, reset) (kim, reset) (mariel, reset) ]
-
-#####################################################################
-# END.... 
-#####################################################################
-
-'''
-
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argxm = args
-    return doctest.testmod(sys.modules.get(__name__))
-
-if __name__ == '__main__':
-    print 'running...'
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
-
-
-
-
-
diff --git a/test/minimal.cpp b/test/minimal.cpp
deleted file mode 100644
index ac6fb4ae..00000000
--- a/test/minimal.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-
-#if defined(_AIX) && defined(__EDG_VERSION__) && __EDG_VERSION__ < 245
-# include <iostream> // works around a KCC intermediate code generation bug
-#endif
-
-BOOST_PYTHON_MODULE(minimal_ext)
-{
-}
-
-#include "module_tail.cpp"
diff --git a/test/minimal.py b/test/minimal.py
deleted file mode 100644
index fde9840a..00000000
--- a/test/minimal.py
+++ /dev/null
@@ -1,4 +0,0 @@
-print "IMPORTING minimal_ext"
-import minimal_ext
-print "DONE IMPORTING minimal_ext"
-
diff --git a/test/module_tail.cpp b/test/module_tail.cpp
deleted file mode 100644
index 087f986a..00000000
--- a/test/module_tail.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#if defined(_WIN32)
-# ifdef __MWERKS__
-#  pragma ANSI_strict off
-# endif
-# include <windows.h>
-# ifdef __MWERKS__
-#  pragma ANSI_strict reset
-# endif
-
-# ifdef _MSC_VER
-#  pragma warning(push)
-#  pragma warning(disable:4297)
-extern "C" void straight_to_debugger(unsigned int, EXCEPTION_POINTERS*)
-{
-    throw;
-}
-extern "C" void (*old_translator)(unsigned, EXCEPTION_POINTERS*)
-         = _set_se_translator(straight_to_debugger);
-#  pragma warning(pop)
-# endif
-
-#endif // _WIN32
-
diff --git a/test/multi_arg_constructor.cpp b/test/multi_arg_constructor.cpp
deleted file mode 100644
index 8c3e8846..00000000
--- a/test/multi_arg_constructor.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-
-struct A
-{
-    A(const double, const double, const double, const double, const double
-      , const double, const double
-      , const double, const double
-        ) {}
-};
-
-BOOST_PYTHON_MODULE(multi_arg_constructor_ext)
-{
-  using namespace boost::python;
-
-  class_<A>(
-      "A"
-      , init<double, double, double, double, double, double, double, double, double>()
-      )
-      ;
-
-}
-
diff --git a/test/multi_arg_constructor.py b/test/multi_arg_constructor.py
deleted file mode 100644
index 0c0164a2..00000000
--- a/test/multi_arg_constructor.py
+++ /dev/null
@@ -1,18 +0,0 @@
-'''
->>> from multi_arg_constructor_ext import *
->>> a = A(1.0, 2, 3, 4, 5, 6, 7.0, 8.1, 9.3)
-'''
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/nested.cpp b/test/nested.cpp
deleted file mode 100644
index 2ccea6f2..00000000
--- a/test/nested.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/operators.hpp>
-#include <boost/python/scope.hpp>
-#include "test_class.hpp"
-#if __GNUC__ != 2
-# include <ostream>
-#else
-# include <ostream.h>
-#endif
-
-typedef test_class<> X;
-typedef test_class<1> Y;
-
-std::ostream& operator<<(std::ostream& s, X const& x)
-{
-    return s << x.value();
-}
-
-std::ostream& operator<<(std::ostream& s, Y const& x)
-{
-    return s << x.value();
-}
-
-
-BOOST_PYTHON_MODULE(nested_ext)
-{
-    using namespace boost::python;
-
-    // Establish X as the current scope.
-    scope x_class
-        = class_<X>("X", init<int>())
-          .def(str(self))
-        ;
-
-
-    // Y will now be defined in the current scope
-    class_<Y>("Y", init<int>())
-        .def(str(self))
-        ;
-}
-
-
-#include "module_tail.cpp"
-
-
-
diff --git a/test/nested.py b/test/nested.py
deleted file mode 100644
index e10d4582..00000000
--- a/test/nested.py
+++ /dev/null
@@ -1,37 +0,0 @@
-'''
-    >>> from nested_ext import *
-    
-    >>> X
-    <class 'nested_ext.X'>
-    
-    >>> X.__module__
-    'nested_ext'
-    
-    >>> X.__name__
-    'X'
-    
-    >>> X.Y
-    <class 'nested_ext.Y'>
-    
-    >>> X.Y.__module__
-    'nested_ext'
-    
-    >>> X.Y.__name__
-    'Y'
-    
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/newtest.py b/test/newtest.py
deleted file mode 100644
index 29ff271b..00000000
--- a/test/newtest.py
+++ /dev/null
@@ -1,201 +0,0 @@
-"""
->>> from m1 import *
-
->>> from m2 import *
-
-   Prove that we get an appropriate error from trying to return a type
-   for which we have no registered to_python converter
-
->>> def check_unregistered(f, msgprefix):   
-...     try:
-...         f(1)
-...     except TypeError, x:
-...         if not str(x).startswith(msgprefix):
-...             print str(x)
-...     else:
-...         print 'expected a TypeError'
-...
->>> check_unregistered(make_unregistered, 'No to_python (by-value) converter found for C++ type')
->>> check_unregistered(make_unregistered2, 'No Python class registered for C++ class')
-
->>> n = new_noddy()
->>> s = new_simple()
->>> unwrap_int(n)
-42
->>> unwrap_int_ref(n)
-42
->>> unwrap_int_const_ref(n)
-42
->>> unwrap_simple(s)
-'hello, world'
->>> unwrap_simple_ref(s)
-'hello, world'
->>> unwrap_simple_const_ref(s)
-'hello, world'
->>> unwrap_int(5)
-5
-
-Can't get a non-const reference to a built-in integer object
->>> try:
-...     unwrap_int_ref(7)
-... except: pass
-... else: print 'no exception'
-
->>> unwrap_int_const_ref(9)
-9
-
->>> wrap_int(n)
-42
-
-try: wrap_int_ref(n)
-... except: pass
-... else: print 'no exception'
-
->>> wrap_int_const_ref(n)
-42
-
->>> unwrap_simple_ref(wrap_simple(s))
-'hello, world'
-
->>> unwrap_simple_ref(wrap_simple_ref(s))
-'hello, world'
-
->>> unwrap_simple_ref(wrap_simple_const_ref(s))
-'hello, world'
-
->>> f(s)
-12
-
->>> unwrap_simple(g(s))
-'hello, world'
-
->>> f(g(s))
-12
-
->>> f_mutable_ref(g(s))
-12
-
->>> f_const_ptr(g(s))
-12
-
->>> f_mutable_ptr(g(s))
-12
-
->>> f2(g(s))
-12
-
-Create an extension class which wraps "complicated" (init1 and get_n)
-are a complicated constructor and member function, respectively.
-
->>> c1 = complicated(s, 99)
->>> c1.get_n()
-99
->>> c2 = complicated(s)
->>> c2.get_n()
-0
-
-     a quick regression test for a bug where None could be converted
-     to the target of any member function. To see it, we need to
-     access the __dict__ directly, to bypass the type check supplied
-     by the Method property which wraps the method when accessed as an
-     attribute. 
-
->>> try: A.__dict__['name'](None)
-... except TypeError: pass
-... else: print 'expected an exception!'
-
-
->>> a = A()
->>> b = B()
->>> c = C()
->>> d = D()
-
-
->>> take_a(a).name()
-'A'
-
->>> try:
-...     take_b(a)
-... except: pass
-... else: print 'no exception'
-
->>> try:
-...     take_c(a)
-... except: pass
-... else: print 'no exception'
-
->>> try:
-...     take_d(a)
-... except: pass
-... else: print 'no exception'
-
-------
->>> take_a(b).name()
-'A'
-
->>> take_b(b).name()
-'B'
-
->>> try:
-...     take_c(b)
-... except: pass
-... else: print 'no exception'
-
->>> try:
-...     take_d(b)
-... except: pass
-... else: print 'no exception'
-
--------
->>> take_a(c).name()
-'A'
-
->>> try:
-...     take_b(c)
-... except: pass
-... else: print 'no exception'
-
->>> take_c(c).name()
-'C'
-
->>> try:
-...     take_d(c)
-... except: pass
-... else: print 'no exception'
-
--------
->>> take_a(d).name()
-'A'
->>> take_b(d).name()
-'B'
->>> take_c(d).name()
-'C'
->>> take_d(d).name()
-'D'
-
->>> take_d_shared_ptr(d).name()
-'D'
-
->>> d_as_a = d_factory()
->>> dd = take_d(d_as_a)
->>> dd.name()
-'D'
-
-"""
-
-def run(args = None):
-
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/numpy.cpp b/test/numpy.cpp
deleted file mode 100644
index 8a02f6ee..00000000
--- a/test/numpy.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/numeric.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-
-using namespace boost::python;
-
-// See if we can invoke array() from C++
-object new_array()
-{
-    return numeric::array(
-        make_tuple(
-            make_tuple(1,2,3)
-          , make_tuple(4,5,6)
-          , make_tuple(7,8,9)
-            )
-        );
-}
-
-// test argument conversion
-void take_array(numeric::array x)
-{
-}
-
-// A separate function to invoke the info() member. Must happen
-// outside any doctests since this prints directly to stdout and the
-// result text includes the address of the 'self' array.
-void info(numeric::array const& z)
-{
-    z.info();
-}
-
-// Tests which work on both Numeric and numarray array objects. Of
-// course all of the operators "just work" since numeric::array
-// inherits that behavior from object.
-void exercise(numeric::array& y, object check)
-{
-    y[make_tuple(2,1)] = 3;
-    check(y);
-    check(y.astype('D'));
-    check(y.copy());
-    check(y.typecode());
-}
-
-// numarray-specific tests.  check is a callable object which we can
-// use to record intermediate results, which are later compared with
-// the results of corresponding python operations.
-void exercise_numarray(numeric::array& y, object check)
-{
-    check(y.astype());
-    
-    check(y.argmax());
-    check(y.argmax(0));
-    
-    check(y.argmin());
-    check(y.argmin(0));
-    
-    check(y.argsort());
-    check(y.argsort(1));
-
-    y.byteswap();
-    check(y);
-    
-    check(y.diagonal());
-    check(y.diagonal(1));
-    check(y.diagonal(0, 1));
-    check(y.diagonal(0, 1, 0));
-
-    check(y.is_c_array());
-    check(y.isbyteswapped());
-
-    check(y.trace());
-    check(y.trace(1));
-    check(y.trace(0, 1));
-    check(y.trace(0, 1, 0));
-
-    check(y.new_('D'));
-    y.sort();
-    check(y);
-    check(y.type());
-
-    check(y.factory(make_tuple(1.2, 3.4)));
-    check(y.factory(make_tuple(1.2, 3.4), "Double"));
-    check(y.factory(make_tuple(1.2, 3.4), "Double", make_tuple(1,2,1)));
-    check(y.factory(make_tuple(1.2, 3.4), "Double", make_tuple(2,1,1), false));
-    check(y.factory(make_tuple(1.2, 3.4), "Double", make_tuple(2), true, true));
-}
-
-BOOST_PYTHON_MODULE(numpy_ext)
-{
-    def("new_array", new_array);
-    def("take_array", take_array);
-    def("exercise", exercise);
-    def("exercise_numarray", exercise_numarray);
-    def("set_module_and_type", &numeric::array::set_module_and_type);
-    def("info", info);
-}
-
-#include "module_tail.cpp"
diff --git a/test/numpy.py b/test/numpy.py
deleted file mode 100644
index c81c8f82..00000000
--- a/test/numpy.py
+++ /dev/null
@@ -1,177 +0,0 @@
-def numeric_tests():
-    '''
-    >>> from numpy_ext import *
-    >>> x = new_array()
-    >>> x[1,1] = 0.0
-
-    >>> try: take_array(3)
-    ... except TypeError: pass
-    ... else: print 'expected a TypeError'
-
-    >>> take_array(x)
-
-    >>> print x
-    [[1 2 3]
-     [4 0 6]
-     [7 8 9]]
-
-    >>> y = x.copy()
-
-
-    >>> p = _printer()
-    >>> check = p.check
-    >>> exercise(x, p)
-    >>> y[2,1] = 3
-    >>> check(y);
-
-    >>> check(y.astype('D'));
-
-    >>> check(y.copy());
-
-    >>> check(y.typecode());
-
-    >>> p.results
-    []
-    >>> del p
-    '''
-    pass
-
-def _numarray_tests():
-    '''
-    >>> from numpy_ext import *
-    >>> x = new_array()
-    >>> y = x.copy()
-    >>> p = _printer()
-    >>> check = p.check
-    >>> exercise_numarray(x, p)
-
-    >>> check(y.astype());
-
-    >>> check(y.argmax());
-    >>> check(y.argmax(0));
-
-    >>> check(y.argmin());
-    >>> check(y.argmin(0));
-
-    >>> check(y.argsort());
-    >>> check(y.argsort(1));
-    
-    >>> y.byteswap();
-    >>> check(y);
-
-    >>> check(y.diagonal());
-    >>> check(y.diagonal(1));
-    >>> check(y.diagonal(0, 1));
-    >>> check(y.diagonal(0, 1, 0));
-
-    >>> check(y.is_c_array());
-    >>> check(y.isbyteswapped());
-
-    >>> check(y.trace());
-    >>> check(y.trace(1));
-    >>> check(y.trace(0, 1));
-    >>> check(y.trace(0, 1, 0));
-
-    >>> check(y.new('D'));
-    >>> y.sort();
-    >>> check(y);
-    >>> check(y.type());
-
-    >>> check(y.array((1.2, 3.4)));
-    >>> check(y.array((1.2, 3.4), "Double"));
-    >>> check(y.array((1.2, 3.4), "Double", (1,2,1)));
-    >>> check(y.array((1.2, 3.4), "Double", (2,1,1), false));
-    >>> check(y.array((1.2, 3.4), "Double", (2,), true, true));
-    
-    >>> p.results
-    []
-    >>> del p
-    '''
-    pass
-
-false = 0;
-true = 1;
-class _printer(object):
-    def __init__(self):
-        self.results = [];
-    def __call__(self, *stuff):
-        self.results += [ str(x) for x in stuff ]
-    def check(self, x):
-        if self.results[0] == str(x):
-            del self.results[0]
-        else:
-            print '  Expected:\n %s\n  but got:\n %s' % (x, self.results[0])
-
-def _run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-
-    # See which of the numeric modules are installed
-    has_numeric = 0
-    try:
-        import Numeric
-        m = Numeric
-        has_numeric = 1
-    except ImportError: pass
-
-    has_numarray = 0
-    try:
-        import numarray
-        m = numarray
-        has_numarray = 1
-    except ImportError: pass
-    
-    # Bail if neither one is installed
-    if not (has_numeric or has_numarray):
-        return 0
-
-    # test the info routine outside the doctest. See numpy.cpp for an
-    # explanation
-    import numpy_ext
-    if (has_numarray):
-        numpy_ext.info(m.array((1,2,3)))
-
-    failures = 0
-
-    #
-    # Run tests 4 different ways if both modules are installed, just
-    # to show that set_module_and_type() is working properly
-    #
-    
-    # run all the tests with default module search
-    print 'testing default extension module'
-    failures += doctest.testmod(sys.modules.get(__name__))[0]
-
-    # test against Numeric if installed
-    if has_numeric:
-        print 'testing Numeric module explicitly'
-        numpy_ext.set_module_and_type('Numeric', 'ArrayType')
-        failures += doctest.testmod(sys.modules.get(__name__))[0]
-    
-    global __test__
-    if has_numarray:
-        # Add the _numarray_tests to the list of things to test in
-        # this case.
-        __test__ = { 'numarray_tests':_numarray_tests,
-                     'numeric_tests': numeric_tests }
-        print 'testing numarray module explicitly'
-        numpy_ext.set_module_and_type('numarray', 'NDArray')
-        failures += doctest.testmod(sys.modules.get(__name__))[0]
-        del __test__
-
-    # see that we can go back to the default
-    print 'testing default module again'
-    numpy_ext.set_module_and_type('', '')
-    failures += doctest.testmod(sys.modules.get(__name__))[0]
-    
-    return failures
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = _run()
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/object.cpp b/test/object.cpp
deleted file mode 100755
index dfaec695..00000000
--- a/test/object.cpp
+++ /dev/null
@@ -1,331 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/object.hpp>
-#include <boost/python/class.hpp>
-
-using namespace boost::python;
-
-class NotCopyable
-{
-} not_copyable;
-
-object ref_to_noncopyable()
-{
-  return object(boost::ref(not_copyable));
-}
-
-object call_object_3(object f)
-{
-    return f(3);
-}
-
-object message()
-{
-    return object("hello, world!");
-}
-
-object number()
-{
-    return object(42);
-}
-
-object obj_getattr(object x, char const* name)
-{
-    return x.attr(name);
-}
-
-object obj_const_getattr(object const& x, char const* name)
-{
-    return x.attr(name);
-}
-
-void obj_setattr(object x, char const* name, object value)
-{
-    x.attr(name) = value;
-}
-
-void obj_setattr42(object x, char const* name)
-{
-    x.attr(name) = 42;
-}
-
-void obj_moveattr(object& x, char const* src, char const* dst)
-{
-    x.attr(dst) = x.attr(src);
-}
-
-object obj_getitem(object x, object key)
-{
-    return x[key];
-}
-
-object obj_getitem3(object x)
-{
-    return x[3];
-}
-
-object obj_const_getitem(object const& x, object key)
-{
-    return x[key];
-}
-
-void obj_setitem(object x, object key, object value)
-{
-    x[key] = value;
-}
-
-void obj_setitem42(object x, object key)
-{
-    x[key] = 42;
-}
-
-void obj_moveitem(object& x, object src, object dst)
-{
-    x[dst] = x[src];
-}
-
-void obj_moveitem2(object const& x_src, object k_src, object& x_dst, object k_dst)
-{
-    x_dst[k_dst] = x_src[k_src];
-}
-
-bool test(object y)
-{
-    return y;
-}
-
-bool test_not(object y)
-{
-    return !y;
-}
-
-bool test_attr(object y, char* name)
-{
-    return y.attr(name);
-}
-
-bool test_not_attr(object y, char* name)
-{
-    return !y.attr(name);
-}
-
-bool test_item(object y, object key)
-{
-    return y[key];
-}
-
-bool test_not_item(object y, object key)
-{
-    return !y[key];
-}
-
-bool check_string_slice()
-{
-    object s("hello, world");
-
-    if (s.slice(_,-3) != "hello, wo")
-        return false;
-    
-    if (s.slice(-3,_) != "rld")
-        return false;
-    
-    if (", " != s.slice(5,7))
-        return false;
-
-    return s.slice(2,-1).slice(1,-1)  == "lo, wor";
-}
-
-bool check_binary_operators()
-{
-    int y;
-    
-    object x(3);
-
-#define TEST_BINARY(op)                         \
-    for (y = 1; y < 6; ++y)                     \
-    {                                           \
-        if ((x op y) != (3 op y))               \
-            return false;                       \
-    }                                           \
-    for (y = 1; y < 6; ++y)                     \
-    {                                           \
-        if ((y op x) != (y op 3))               \
-            return false;                       \
-    }                                           \
-    for (y = 1; y < 6; ++y)                     \
-    {                                           \
-        object oy(y);                           \
-        if ((oy op x) != (oy op 3))             \
-            return false;                       \
-    }
-    TEST_BINARY(>)
-    TEST_BINARY(>=)
-    TEST_BINARY(<)
-    TEST_BINARY(<=)
-    TEST_BINARY(==)
-    TEST_BINARY(!=)
-
-    TEST_BINARY(+)
-    TEST_BINARY(-)
-    TEST_BINARY(*)
-    TEST_BINARY(/)
-    TEST_BINARY(%)
-    TEST_BINARY(<<)
-    TEST_BINARY(>>)
-    TEST_BINARY(&)
-    TEST_BINARY(^)
-    TEST_BINARY(|)
-    return true;
-}
-
-bool check_inplace(object l, object o)
-{
-    int y;
-#define TEST_INPLACE(op)                        \
-    for (y = 1; y < 6; ++y)                     \
-    {                                           \
-        object x(666);                          \
-        x op##= y;                              \
-        if (x != (666 op y))                    \
-            return false;                       \
-    }                                           \
-    for (y = 1; y < 6; ++y)                     \
-    {                                           \
-        object x(666);                          \
-        x op##= object(y);                      \
-        if (!(x == (666 op y)))                 \
-            return false;                       \
-    }
-    TEST_INPLACE(+)
-    TEST_INPLACE(-)
-    TEST_INPLACE(*)
-    TEST_INPLACE(/)
-    TEST_INPLACE(%)
-    TEST_INPLACE(<<)
-    TEST_INPLACE(>>)
-    TEST_INPLACE(&)
-    TEST_INPLACE(^)
-    TEST_INPLACE(|)
-        
-    l += l;
-    for (y = 0; y < 6; ++y)
-    {
-        if (l[y] != y % 3)
-            return false;
-    }
-
-#define TEST_ITEM_INPLACE(index, op, n, r1, r2)         \
-    l[index] op##= n;                                   \
-    if (l[index] != r1)                                 \
-        return false;                                   \
-    l[index] op##= object(n);                           \
-    if (!(l[index] == r2))                              \
-        return false;
-
-    TEST_ITEM_INPLACE(0,+,7,7,14)
-    TEST_ITEM_INPLACE(1,-,2,-1,-3)
-    TEST_ITEM_INPLACE(2,*,3,6,18)
-    TEST_ITEM_INPLACE(2,/,2,9,4)
-    TEST_ITEM_INPLACE(0,%,4,2,2)
-    l[0] += 1;
-    TEST_ITEM_INPLACE(0,<<,2,12,48)
-    TEST_ITEM_INPLACE(0,>>,1,24,12)
-    l[4] = 15;
-    TEST_ITEM_INPLACE(4,&,(16+4+1),5,5)
-    TEST_ITEM_INPLACE(0,^,1,13,12)
-    TEST_ITEM_INPLACE(0,|,1,13,13)
-
-    o.attr("x0") = 0;
-    o.attr("x1") = 1;
-    o.attr("x2") = 2;
-    o.attr("x3") = 0;
-    o.attr("x4") = 1;
-    
-#define TEST_ATTR_INPLACE(index, op, n, r1, r2) \
-    o.attr("x" #index) op##= n;                 \
-    if (o.attr("x" #index) != r1)               \
-        return false;                           \
-    o.attr("x" #index) op##= object(n);         \
-    if (o.attr("x" #index) != r2)               \
-        return false;
-    
-    TEST_ATTR_INPLACE(0,+,7,7,14)
-    TEST_ATTR_INPLACE(1,-,2,-1,-3)
-    TEST_ATTR_INPLACE(2,*,3,6,18)
-    TEST_ATTR_INPLACE(2,/,2,9,4)
-    TEST_ATTR_INPLACE(0,%,4,2,2)
-    o.attr("x0") += 1;
-    TEST_ATTR_INPLACE(0,<<,2,12,48)
-    TEST_ATTR_INPLACE(0,>>,1,24,12)
-    o.attr("x4") = 15;
-    TEST_ATTR_INPLACE(4,&,(16+4+1),5,5)
-    TEST_ATTR_INPLACE(0,^,1,13,12)
-    TEST_ATTR_INPLACE(0,|,1,13,13)
-
-    if (l[0] != o.attr("x0"))
-        return false;
-    if (l[1] != o.attr("x1"))
-        return false;
-    if (l[2] != o.attr("x2"))
-        return false;
-    if (l[3] != o.attr("x3"))
-        return false;
-    if (l[4] != o.attr("x4"))
-        return false;
-
-    // set item 5 to be a list, by calling l.__class__
-    l[5] = l.attr("__class__")();
-    // append an element
-    l[5].attr("append")(2);
-    // Check its value
-    if (l[5][0] != 2)
-        return false;
-    
-    return true;
-}
-
-BOOST_PYTHON_MODULE(object_ext)
-{
-    class_<NotCopyable, boost::noncopyable>("NotCopyable", no_init);
-
-    def("ref_to_noncopyable", ref_to_noncopyable);
-    def("call_object_3", call_object_3);
-    def("message", message);
-    def("number", number);
-
-    def("obj_getattr", obj_getattr);
-    def("obj_const_getattr", obj_const_getattr);
-    def("obj_setattr", obj_setattr);
-    def("obj_setattr42", obj_setattr42);
-    def("obj_moveattr", obj_moveattr);
-
-
-    def("obj_getitem", obj_getitem);
-    def("obj_getitem3", obj_getitem);
-    def("obj_const_getitem", obj_const_getitem);
-    def("obj_setitem", obj_setitem);
-    def("obj_setitem42", obj_setitem42);
-    def("obj_moveitem", obj_moveitem);
-    def("obj_moveitem2", obj_moveitem2);
-
-    def("test", test);
-    def("test_not", test_not);
-
-    def("test_attr", test_attr);
-    def("test_not_attr", test_not_attr);
-
-    def("test_item", test_item);
-    def("test_not_item", test_not_item);
-
-    def("check_binary_operators", check_binary_operators);
-    def("check_inplace", check_inplace);
-    def("check_string_slice", check_string_slice);
-        ;
-}
-
-#include "module_tail.cpp"
diff --git a/test/object.py b/test/object.py
deleted file mode 100644
index 41359a6c..00000000
--- a/test/object.py
+++ /dev/null
@@ -1,132 +0,0 @@
-'''
->>> from object_ext import *
-
->>> class(ref_to_noncopyable())
-object_ext.NotCopyable
-
->>> def print1(x):
-...     print x
->>> call_object_3(print1)
-3
->>> message()
-'hello, world!'
->>> number()
-42
-
->>> test('hi')
-1
->>> test(None)
-0
->>> test_not('hi')
-0
->>> test_not(0)
-1
-
-        Attributes
-
->>> class X: pass
-...
->>> x = X()
-
->>> try: obj_getattr(x, 'foo')
-... except AttributeError: pass
-... else: print 'expected an exception'
-
->>> obj_setattr(x, 'foo', 1)
->>> x.foo
-1
->>> obj_getattr(x, 'foo')
-1
->>> obj_const_getattr(x, 'foo')
-1
->>> obj_setattr42(x, 'foo')
->>> x.foo
-42
->>> obj_moveattr(x, 'foo', 'bar')
->>> x.bar
-42
->>> test_attr(x, 'foo')
-1
->>> test_not_attr(x, 'foo')
-0
->>> x.foo = None
->>> test_attr(x, 'foo')
-0
->>> test_not_attr(x, 'foo')
-1
-
-        Items
-
->>> d = {}
->>> obj_setitem(d, 'foo', 1)
->>> d['foo']
-1
->>> obj_getitem(d, 'foo')
-1
->>> obj_const_getitem(d, 'foo')
-1
->>> obj_setitem42(d, 'foo')
->>> obj_getitem(d, 'foo')
-42
->>> d['foo']
-42
->>> obj_moveitem(d, 'foo', 'bar')
->>> d['bar']
-42
->>> obj_moveitem2(d, 'bar', d, 'baz')
->>> d['baz']
-42
->>> test_item(d, 'foo')
-1
->>> test_not_item(d, 'foo')
-0
->>> d['foo'] = None
->>> test_item(d, 'foo')
-0
->>> test_not_item(d, 'foo')
-1
-
-        Slices
-        
->>> assert check_string_slice()
-
-        Operators
-
-        
->>> assert check_binary_operators()
-
->>> class X: pass
-...
->>> assert check_inplace(range(3), X())
-
-
-       Now make sure that object is actually managing reference counts
-       
->>> import weakref
->>> class Z: pass
-...
->>> z = Z()
->>> def death(r): print 'death'
-...
->>> r = weakref.ref(z, death)
->>> z.foo = 1
->>> obj_getattr(z, 'foo')
-1
->>> del z
-death
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/object_fail1.cpp b/test/object_fail1.cpp
deleted file mode 100755
index 3b09e71d..00000000
--- a/test/object_fail1.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/object.hpp>
-
-int f(boost::python::object const& x)
-{
-    x._("hello") = 1;
-    return 0;
-}
diff --git a/test/object_manager.cpp b/test/object_manager.cpp
deleted file mode 100755
index 44005aeb..00000000
--- a/test/object_manager.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/converter/object_manager.hpp>
-#include <boost/python/borrowed.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/python/handle.hpp>
-
-using namespace boost::python;
-using namespace boost::python::converter;
-
-struct X {};
-
-int main()
-{
-    BOOST_STATIC_ASSERT(is_object_manager<handle<> >::value);
-    BOOST_STATIC_ASSERT(!is_object_manager<int>::value);
-    BOOST_STATIC_ASSERT(!is_object_manager<X>::value);
-    
-    BOOST_STATIC_ASSERT(is_reference_to_object_manager<handle<>&>::value);
-    BOOST_STATIC_ASSERT(is_reference_to_object_manager<handle<> const&>::value);
-    BOOST_STATIC_ASSERT(is_reference_to_object_manager<handle<> volatile&>::value);
-    BOOST_STATIC_ASSERT(is_reference_to_object_manager<handle<> const volatile&>::value);
-
-    BOOST_STATIC_ASSERT(!is_reference_to_object_manager<handle<> >::value);
-    BOOST_STATIC_ASSERT(!is_reference_to_object_manager<X>::value);
-    BOOST_STATIC_ASSERT(!is_reference_to_object_manager<X&>::value);
-    BOOST_STATIC_ASSERT(!is_reference_to_object_manager<X const&>::value);
-    
-    return 0;
-}
-
diff --git a/test/opaque.cpp b/test/opaque.cpp
deleted file mode 100644
index cb92e9cd..00000000
--- a/test/opaque.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright David Abrahams and Gottfried Ganssauge 2003. Permission
-// to copy, use, modify, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. This software
-// is provided "as is" without express or implied warranty, and with
-// no claim as to its suitability for any purpose.
-# include <boost/python/return_opaque_pointer.hpp>
-# include <boost/python/def.hpp>
-# include <boost/python/module.hpp>
-# include <boost/python/return_value_policy.hpp>
-
-typedef struct opaque_ *opaque;
-typedef struct opaque2_ *opaque2;
-
-opaque the_op   = ((opaque) 0x47110815);
-opaque2 the_op2 = ((opaque2) 0x08154711);
-
-opaque get() { return the_op; }
-
-void use(opaque op)
-{
-    if (op != the_op)
-        throw std::runtime_error (std::string ("failed"));
-}
-
-int useany(opaque op)
-{
-    return op ? 1 : 0;
-}
-
-opaque getnull()
-{
-    return 0;
-}
-
-void failuse (opaque op)
-{
-    if (op == the_op)
-        throw std::runtime_error (std::string ("success"));
-}
-
-opaque2 get2 () { return the_op2; }
-
-void use2 (opaque2 op)
-{
-    if (op != the_op2)
-        throw std::runtime_error (std::string ("failed"));
-}
-
-void failuse2 (opaque2 op)
-{
-    if (op == the_op2)
-        throw std::runtime_error (std::string ("success"));
-}
-
-BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(opaque_)
-BOOST_PYTHON_OPAQUE_SPECIALIZED_TYPE_ID(opaque2_)
-
-namespace bpl = boost::python;
-
-BOOST_PYTHON_MODULE(opaque_ext)
-{
-    bpl::def (
-        "get", &::get, bpl::return_value_policy<bpl::return_opaque_pointer>());
-    bpl::def ("use", &::use);
-    bpl::def ("useany", &::useany);
-    bpl::def ("getnull", &::getnull, bpl::return_value_policy<bpl::return_opaque_pointer>());
-    bpl::def ("failuse", &::failuse);
-
-    bpl::def (
-        "get2",
-        &::get2,
-        bpl::return_value_policy<bpl::return_opaque_pointer>());
-    bpl::def ("use2", &::use2);
-    bpl::def ("failuse2", &::failuse2);
-}
-
-# include "module_tail.cpp"
diff --git a/test/opaque.py b/test/opaque.py
deleted file mode 100644
index 6d994bd7..00000000
--- a/test/opaque.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- coding: iso-latin-1 -*-
-# Copyright Gottfried Ganßauge 2003. Permission to copy, use,
-# modify, sell and distribute this software is granted provided this
-# copyright notice appears in all copies. This software is provided
-# "as is" without express or implied warranty, and with no claim as
-# to its suitability for any purpose.
-
-"""
->>> from opaque_ext import *
-
-
-    Check for correct conversion
-    
->>> use(get())
-
-    Check that None is converted to a NULL opaque pointer
-    
->>> useany(get())
-1
->>> useany(None)
-0
-
-    Check that we don't lose type information by converting NULL
-    opaque pointers to None
-    
->>> assert getnull() is None
->>> useany(getnull())
-0
-
->>> failuse(get())
-Traceback (most recent call last):
-        ...
-RuntimeError: success
-
-   Check that there is no conversion from integers ...
-   
->>> try: use(0)
-... except TypeError: pass
-... else: print 'expected a TypeError'
-
-   ... and from strings to opaque objects
-   
->>> try: use("")
-... except TypeError: pass
-... else: print 'expected a TypeError'
-
-   Now check the same for another opaque pointer type
-   
->>> use2(get2())
->>> failuse2(get2())
-Traceback (most recent call last):
-        ...
-RuntimeError: success
->>> try: use2(0)
-... except TypeError: pass
-... else: print 'expected a TypeError'
->>> try: use2("")
-... except TypeError: pass
-... else: print 'expected a TypeError'
-
-   Check that opaque types are distinct
-
->>> try: use(get2())
-... except TypeError: pass
-... else: print 'expected a TypeError'
->>> try: use2(get())
-... except TypeError: pass
-... else: print 'expected a TypeError'
-"""
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/operators.cpp b/test/operators.cpp
deleted file mode 100755
index 94246c3f..00000000
--- a/test/operators.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/operators.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include "test_class.hpp"
-#if __GNUC__ != 2
-# include <ostream>
-#else
-# include <ostream.h>
-#endif
-
-// Just use math.h here; trying to use std::pow() causes too much
-// trouble for non-conforming compilers and libraries.
-#include <math.h>
-
-// vc7.1 seems to require this (incorrectly) in order to use the "not" keyword
-#include <ciso646>
-
-using namespace boost::python;
-
-struct X : test_class<>
-{
-    typedef test_class<> base_t;
-    
-    X(int x) : base_t(x) {}
-    X const operator+(X const& r) const { return X(value() + r.value()); }
-    
-//    typedef int (X::*safe_bool)() const;
-//    operator safe_bool() const { return value() != 0 ? &X::value : 0; }
-};
-
-X operator-(X const& l, X const& r) { return X(l.value() - r.value()); }
-X operator-(int l, X const& r) { return X(l - r.value()); }
-X operator-(X const& l, int r) { return X(l.value() - r); }
-
-X operator-(X const& x) { return X(-x.value()); }
-
-X& operator-=(X& l, X const& r) { l.set(l.value() - r.value()); return l; }
-
-bool operator<(X const& x, X const& y) { return x.value() < y.value(); }
-bool operator<(X const& x, int y) { return x.value() < y; }
-bool operator<(int x, X const& y) { return x < y.value(); }
-
-X abs(X x) { return X(x.value() < 0 ? -x.value() : x.value()); }
-
-X pow(X x, int y)
-{
-    return X(int(pow(double(x.value()), double(y))));
-}
-
-X pow(X x, X y)
-{
-    return X(int(pow(double(x.value()), double(y.value()))));
-}
-
-int pow(int x, X y)
-{
-    return int(pow(double(x), double(y.value())));
-}
-
-std::ostream& operator<<(std::ostream& s, X const& x)
-{
-    return s << x.value();
-}
-
-BOOST_PYTHON_MODULE(operators_ext)
-{
-    class_<X>("X", init<int>())
-        .def("value", &X::value)
-        .def(self + self)
-        .def(self - self)
-        .def(self - int())
-        .def(other<int>() - self)
-        .def(-self)
-        .def(self < other<int>())
-        .def(self < self)
-        .def(1 < self)
-        .def(self -= self)
-        .def(abs(self))
-        .def(str(self))
-            
-        .def(pow(self,self))
-        .def(pow(self,int()))
-        .def(pow(int(),self))
-        .def(not self)
-        ;
-
-    class_<test_class<1> >("Z", init<int>())
-        .def(int_(self))
-        .def(float_(self))
-        .def(complex_(self))
-        ;
-}
-
-#include "module_tail.cpp"
diff --git a/test/operators.py b/test/operators.py
deleted file mode 100644
index 36100770..00000000
--- a/test/operators.py
+++ /dev/null
@@ -1,99 +0,0 @@
-'''
->>> from operators_ext import *
-
-  Check __nonzero__ support
-  
->>> assert X(2)
->>> assert not X(0)
-
- ----
- 
->>> x = X(42)
->>> x.value()
-42
->>> y = x - X(5)
->>> y.value()
-37
->>> y = x - 4
->>> y.value()
-38
->>> y = 3 - x
->>> y.value()
--39
->>> (-y).value()
-39
-
->>> (x + y).value()
-3
-
->>> abs(y).value()
-39
-
->>> x < 10
-0
->>> x < 43
-1
-
->>> 10 < x
-1
->>> 43 < x
-0
-
->>> x < y
-0
->>> y < x
-1
-
- ------
->>> x > 10
-1
->>> x > 43
-0
-
->>> 10 > x
-0
->>> 43 > x
-1
-
->>> x > y
-1
->>> y > x
-0
-
->>> y = x - 5
->>> x -= y
->>> x.value()
-5
->>> str(x)
-'5'
-
->>> z = Z(10)
->>> int(z)
-10
->>> float(z)
-10.0
->>> complex(z)
-(10+0j)
-
->>> pow(2,x)
-32
->>> pow(x,2).value()
-25
->>> pow(X(2),x).value()
-32
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/pickle1.cpp b/test/pickle1.cpp
deleted file mode 100644
index 794799f8..00000000
--- a/test/pickle1.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// Example by Ralf W. Grosse-Kunstleve
-
-/*
-    This example shows how to make an Extension Class "pickleable".
-
-    The world class below can be fully restored by passing the
-    appropriate argument to the constructor. Therefore it is sufficient
-    to define the pickle interface method __getinitargs__.
-
-    For more information refer to boost/libs/python/doc/pickle.html.
- */
-
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/tuple.hpp>
-
-#include <string>
-
-namespace {
-
-  // A friendly class.
-  class world
-  {
-    private:
-      std::string country;
-    public:
-      world(const std::string& country) {
-        this->country = country;
-      }
-      std::string greet() const { return "Hello from " + country + "!"; }
-      std::string get_country() const { return country; }
-  };
-
-  struct world_pickle_suite : boost::python::pickle_suite
-  {
-    static
-    boost::python::tuple
-    getinitargs(const world& w)
-    {
-        using namespace boost::python;
-        return make_tuple(w.get_country());
-    }
-  };
-
-}
-
-BOOST_PYTHON_MODULE(pickle1_ext)
-{
-  using namespace boost::python;
-  class_<world>("world", init<const std::string&>())
-      .def("greet", &world::greet)
-      .def_pickle(world_pickle_suite())
-      ;
-}
diff --git a/test/pickle1.py b/test/pickle1.py
deleted file mode 100644
index 963d406b..00000000
--- a/test/pickle1.py
+++ /dev/null
@@ -1,33 +0,0 @@
-r'''>>> import pickle1_ext
-    >>> import pickle
-    >>> pickle1_ext.world.__module__
-    'pickle1_ext'
-    >>> pickle1_ext.world.__safe_for_unpickling__
-    1
-    >>> pickle1_ext.world.__name__
-    'world'
-    >>> pickle1_ext.world('Hello').__reduce__()
-    (<class 'pickle1_ext.world'>, ('Hello',))
-    >>> wd = pickle1_ext.world('California')
-    >>> pstr = pickle.dumps(wd)
-    >>> wl = pickle.loads(pstr)
-    >>> print wd.greet()
-    Hello from California!
-    >>> print wl.greet()
-    Hello from California!
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/pickle2.cpp b/test/pickle2.cpp
deleted file mode 100644
index 363f5e83..00000000
--- a/test/pickle2.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-// Example by Ralf W. Grosse-Kunstleve
-
-/*
-    This example shows how to make an Extension Class "pickleable".
-
-    The world class below contains member data (secret_number) that
-    cannot be restored by any of the constructors. Therefore it is
-    necessary to provide the __getstate__/__setstate__ pair of pickle
-    interface methods.
-
-    For simplicity, the __dict__ is not included in the result of
-    __getstate__. This is not generally recommended, but a valid
-    approach if it is anticipated that the object's __dict__ will
-    always be empty. Note that safety guards are provided to catch
-    the cases where this assumption is not true.
-
-    pickle3.cpp shows how to include the object's __dict__ in the
-    result of __getstate__.
-
-    For more information refer to boost/libs/python/doc/pickle.html.
- */
-
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/extract.hpp>
-#include <boost/python/detail/api_placeholder.hpp>
-
-namespace { // Avoid cluttering the global namespace.
-
-  // A friendly class.
-  class world
-  {
-    public:
-      world(const std::string& country) : secret_number(0) {
-        this->country = country;
-      }
-      std::string greet() const { return "Hello from " + country + "!"; }
-      std::string get_country() const { return country; }
-      void set_secret_number(int number) { secret_number = number; }
-      int get_secret_number() const { return secret_number; }
-    private:
-      std::string country;
-      int secret_number;
-  };
-
-  struct world_pickle_suite : boost::python::pickle_suite
-  {
-    static
-    boost::python::tuple
-    getinitargs(const world& w)
-    {
-        using namespace boost::python;
-        return make_tuple(w.get_country());
-    }
-
-    static
-    boost::python::tuple
-    getstate(const world& w)
-    {
-        using namespace boost::python;
-        return make_tuple(w.get_secret_number());
-    }
-
-    static
-    void
-    setstate(world& w, boost::python::tuple state)
-    {
-        using namespace boost::python;
-        if (len(state) != 1)
-        {
-          PyErr_SetObject(PyExc_ValueError,
-                          ("expected 1-item tuple in call to __setstate__; got %s"
-                           % state).ptr()
-              );
-          throw_error_already_set();
-        }
-        
-        long number = extract<long>(state[0]);
-        if (number != 42)
-            w.set_secret_number(number);
-    }
-  };
-
-}
-
-BOOST_PYTHON_MODULE(pickle2_ext)
-{
-    boost::python::class_<world>(
-        "world", boost::python::init<const std::string&>())
-        .def("greet", &world::greet)
-        .def("get_secret_number", &world::get_secret_number)
-        .def("set_secret_number", &world::set_secret_number)
-        .def_pickle(world_pickle_suite())
-        ;
-}
diff --git a/test/pickle2.py b/test/pickle2.py
deleted file mode 100644
index 5afebe53..00000000
--- a/test/pickle2.py
+++ /dev/null
@@ -1,47 +0,0 @@
-r'''>>> import pickle2_ext
-    >>> import pickle
-    >>> pickle2_ext.world.__module__
-    'pickle2_ext'
-    >>> pickle2_ext.world.__safe_for_unpickling__
-    1
-    >>> pickle2_ext.world.__name__
-    'world'
-    >>> pickle2_ext.world('Hello').__reduce__()
-    (<class 'pickle2_ext.world'>, ('Hello',), (0,))
-    >>> for number in (24, 42):
-    ...   wd = pickle2_ext.world('California')
-    ...   wd.set_secret_number(number)
-    ...   pstr = pickle.dumps(wd)
-    ...   wl = pickle.loads(pstr)
-    ...   print wd.greet(), wd.get_secret_number()
-    ...   print wl.greet(), wl.get_secret_number()
-    Hello from California! 24
-    Hello from California! 24
-    Hello from California! 42
-    Hello from California! 0
-
-# Now show that the __dict__ is not taken care of.
-    >>> wd = pickle2_ext.world('California')
-    >>> wd.x = 1
-    >>> wd.__dict__
-    {'x': 1}
-    >>> try: pstr = pickle.dumps(wd)
-    ... except RuntimeError, err: print err[0]
-    ...
-    Incomplete pickle support (__getstate_manages_dict__ not set)
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/pickle3.cpp b/test/pickle3.cpp
deleted file mode 100644
index e8112535..00000000
--- a/test/pickle3.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// Example by Ralf W. Grosse-Kunstleve
-
-/*
-    This example shows how to make an Extension Class "pickleable".
-
-    The world class below contains member data (secret_number) that
-    cannot be restored by any of the constructors. Therefore it is
-    necessary to provide the __getstate__/__setstate__ pair of pickle
-    interface methods.
-
-    The object's __dict__ is included in the result of __getstate__.
-    This requires more code (compare with pickle2.cpp), but is
-    unavoidable if the object's __dict__ is not always empty.
-
-    For more information refer to boost/libs/python/doc/pickle.html.
- */
-
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/tuple.hpp>
-#include <boost/python/dict.hpp>
-#include <boost/python/extract.hpp>
-#include <boost/python/detail/api_placeholder.hpp>
-#include <boost/python/back_reference.hpp>
-
-namespace { // Avoid cluttering the global namespace.
-
-  // A friendly class.
-  class world
-  {
-    public:
-      world(const std::string& country) : secret_number(0) {
-        this->country = country;
-      }
-      std::string greet() const { return "Hello from " + country + "!"; }
-      std::string get_country() const { return country; }
-      void set_secret_number(int number) { secret_number = number; }
-      int get_secret_number() const { return secret_number; }
-    private:
-      std::string country;
-      int secret_number;
-  };
-
-  struct world_pickle_suite : boost::python::pickle_suite
-  {
-    static
-    boost::python::tuple
-    getinitargs(const world& w)
-    {
-        using namespace boost::python;
-        return make_tuple(w.get_country());
-    }
-
-    static
-    boost::python::tuple
-    getstate(boost::python::object w_obj)
-    {
-        using namespace boost::python;
-        world const& w = extract<world const&>(w_obj)();
-
-        return make_tuple(w_obj.attr("__dict__"), w.get_secret_number());
-    }
-
-    static
-    void
-    setstate(boost::python::object w_obj, boost::python::tuple state)
-    {
-        using namespace boost::python;
-        world& w = extract<world&>(w_obj)();
-        
-        if (len(state) != 2)
-        {
-          PyErr_SetObject(PyExc_ValueError,
-                          ("expected 2-item tuple in call to __setstate__; got %s"
-                           % state).ptr()
-              );
-          throw_error_already_set();
-        }
-        
-        // restore the object's __dict__
-        dict d = extract<dict>(w_obj.attr("__dict__"))();
-        d.update(state[0]);
-        
-        // restore the internal state of the C++ object
-        long number = extract<long>(state[1]);
-        if (number != 42)
-            w.set_secret_number(number);
-    }
-
-    static bool getstate_manages_dict() { return true; }
-  };
-
-}
-
-BOOST_PYTHON_MODULE(pickle3_ext)
-{
-    boost::python::class_<world>(
-        "world", boost::python::init<const std::string&>())
-        .def("greet", &world::greet)
-        .def("get_secret_number", &world::get_secret_number)
-        .def("set_secret_number", &world::set_secret_number)
-        .def_pickle(world_pickle_suite())
-        ;
-}
diff --git a/test/pickle3.py b/test/pickle3.py
deleted file mode 100644
index a3510f06..00000000
--- a/test/pickle3.py
+++ /dev/null
@@ -1,42 +0,0 @@
-r'''>>> import pickle3_ext
-    >>> import pickle
-    >>> pickle3_ext.world.__module__
-    'pickle3_ext'
-    >>> pickle3_ext.world.__safe_for_unpickling__
-    1
-    >>> pickle3_ext.world.__getstate_manages_dict__
-    1
-    >>> pickle3_ext.world.__name__
-    'world'
-    >>> pickle3_ext.world('Hello').__reduce__()
-    (<class 'pickle3_ext.world'>, ('Hello',), ({}, 0))
-    >>> for number in (24, 42):
-    ...   wd = pickle3_ext.world('California')
-    ...   wd.set_secret_number(number)
-    ...   wd.x = 2 * number
-    ...   wd.y = 'y' * number
-    ...   wd.z = 3. * number
-    ...   pstr = pickle.dumps(wd)
-    ...   wl = pickle.loads(pstr)
-    ...   print wd.greet(), wd.get_secret_number(), wd.x, wd.y, wd.z
-    ...   print wl.greet(), wl.get_secret_number(), wl.x, wl.y, wl.z
-    Hello from California! 24 48 yyyyyyyyyyyyyyyyyyyyyyyy 72.0
-    Hello from California! 24 48 yyyyyyyyyyyyyyyyyyyyyyyy 72.0
-    Hello from California! 42 84 yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy 126.0
-    Hello from California! 0 84 yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy 126.0
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/pointee.cpp b/test/pointee.cpp
deleted file mode 100644
index 44836b05..00000000
--- a/test/pointee.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/pointee.hpp>
-#include <boost/type_traits/same_traits.hpp>
-#include <memory>
-#include <boost/shared_ptr.hpp>
-#include <boost/static_assert.hpp>
-
-struct A;
-
-int main()
-{
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<
-                boost::python::pointee<std::auto_ptr<char**> >::type
-                , char**
-         >::value));
-    
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<
-             boost::python::pointee<boost::shared_ptr<A> >::type
-             , A>::value));
-
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-    BOOST_STATIC_ASSERT(
-        (boost::is_same<
-                boost::python::pointee<char*>::type
-                , char
-         >::value));
-#endif 
-    return 0;
-}
diff --git a/test/pointer_type_id_test.cpp b/test/pointer_type_id_test.cpp
deleted file mode 100644
index e3314e0b..00000000
--- a/test/pointer_type_id_test.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <boost/python/type_id.hpp>
-#include <cassert>
-#include <boost/python/converter/pointer_type_id.hpp>
-
-int main()
-{
-    using namespace boost::python::converter;
-    
-    boost::python::type_info x
-        = boost::python::type_id<int>();
-    
-
-    assert(pointer_type_id<int*>() == x);
-    assert(pointer_type_id<int const*>() == x);
-    assert(pointer_type_id<int volatile*>() == x);
-    assert(pointer_type_id<int const volatile*>() == x);
-    
-    assert(pointer_type_id<int*&>() == x);
-    assert(pointer_type_id<int const*&>() == x);
-    assert(pointer_type_id<int volatile*&>() == x);
-    assert(pointer_type_id<int const volatile*&>() == x);
-    
-    assert(pointer_type_id<int*const&>() == x);
-    assert(pointer_type_id<int const*const&>() == x);
-    assert(pointer_type_id<int volatile*const&>() == x);
-    assert(pointer_type_id<int const volatile*const&>() == x);
-    
-    assert(pointer_type_id<int*volatile&>() == x);
-    assert(pointer_type_id<int const*volatile&>() == x);
-    assert(pointer_type_id<int volatile*volatile&>() == x);
-    assert(pointer_type_id<int const volatile*volatile&>() == x);
-    
-    assert(pointer_type_id<int*const volatile&>() == x);
-    assert(pointer_type_id<int const*const volatile&>() == x);
-    assert(pointer_type_id<int volatile*const volatile&>() == x);
-    assert(pointer_type_id<int const volatile*const volatile&>() == x);
-    
-    return 0;
-}
diff --git a/test/polymorphism.cpp b/test/polymorphism.cpp
deleted file mode 100644
index 1ee07374..00000000
--- a/test/polymorphism.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/return_value_policy.hpp>
-#include <boost/python/manage_new_object.hpp>
-#include <boost/python/reference_existing_object.hpp>
-#include <boost/python/call_method.hpp>
-#include <boost/python/pure_virtual.hpp>
-#include <boost/python/def.hpp>
-#include <boost/utility.hpp>
-
-using namespace boost::python;
-
-struct Callback
-{
-    Callback(PyObject* o) : mSelf(o) {}
-    PyObject* mSelf;
-};
-
-struct P
-{
-    virtual ~P(){}
-    virtual std::string f() = 0;
-    std::string g() { return "P::g()"; }
-};
-
-struct PCallback : P, Callback
-{
-    PCallback (PyObject* self) : Callback(self) {}
-    
-    std::string f()
-    {
-        return call_method<std::string>(mSelf, "f");
-    }
-};
-
-struct Q : virtual P
-{
-    std::string f() { return "Q::f()"; } 
-};
-
-struct A
-{
-    virtual ~A(){}
-    virtual std::string f() { return "A::f()"; }
-};
-
-struct ACallback :  A,  Callback
-{
-    ACallback (PyObject* self) : Callback(self) {}
-    
-    
-    std::string f()
-    {
-        return call_method<std::string>(mSelf, "f");
-    }
-    
-    std::string default_f()
-    {
-        return A::f();
-    }
-};
-
-struct B : A
-{
-    virtual std::string f() { return "B::f()"; } 
-};
-
-struct C : A
-{
-    virtual std::string f() { return "C::f()"; }
-};
-
-struct D : A
-{
-    virtual std::string f() { return "D::f()"; }
-    std::string g() { return "D::g()"; }
-};
-
-struct DCallback :  D,  Callback
-{
-    DCallback (PyObject* self) : Callback(self) {}
-     
-    std::string f()
-    {
-        return call_method<std::string>(mSelf, "f");
-    }
-    
-    std::string default_f()
-    {
-        return A::f();
-    }
-};
-
-    
-A& getBCppObj ()
-{
-    static B b;
-    return b;
-}
-
-std::string call_f(A& a) { return a.f(); }
-
-A* factory(unsigned choice)
-{
-    switch (choice % 3)
-    {
-    case 0: return new A;
-        break;
-    case 1: return new B;
-        break;
-    default: return new C;
-        break;
-    }
-}
-
-C& getCCppObj ()
-{
-    static C c;
-    return c;
-}
-
-A* pass_a(A* x) { return x; }
-
-BOOST_PYTHON_MODULE_INIT(polymorphism_ext)
-{
-    class_<A,boost::noncopyable,ACallback>("A")
-        .def("f", &A::f, &ACallback::default_f)
-        ;
-    
-    def("getBCppObj", getBCppObj, return_value_policy<reference_existing_object>());
-
-    class_<C,bases<A>,boost::noncopyable>("C")
-        .def("f", &C::f)
-        ;
-    
-    class_<D,bases<A>,DCallback,boost::noncopyable>("D")
-        .def("f", &D::f, &DCallback::default_f)
-        .def("g", &D::g)
-        ;
-
-    def("pass_a", &pass_a,  return_internal_reference<>());
-    
-    def("getCCppObj", getCCppObj, return_value_policy<reference_existing_object>());
-
-    def("factory", factory, return_value_policy<manage_new_object>());
-
-    def("call_f", call_f);
-
-    class_<P,boost::noncopyable,PCallback>("P")
-        .def("f", pure_virtual(&P::f))
-        ;
-
-    class_<Q, bases<P> >("Q")
-        .def("g", &P::g) // make sure virtual inheritance doesn't interfere
-        ;
-}
-
-//#include "module_tail.cpp"
diff --git a/test/polymorphism.py b/test/polymorphism.py
deleted file mode 100644
index 6d518c99..00000000
--- a/test/polymorphism.py
+++ /dev/null
@@ -1,71 +0,0 @@
-import unittest
-from polymorphism_ext import *
-
-class PolymorphTest(unittest.TestCase):
-
-   def testReturnCpp(self):
-
-      # Python Created Object With Same Id As
-      # Cpp Created B Object 
-      # b = B(872)  
-
-      #  Get Reference To Cpp Created B Object
-      a = getBCppObj()
-
-      # Python Created B Object and Cpp B Object
-      # Should have same result by calling f()
-      self.failUnlessEqual ('B::f()', a.f())
-      self.failUnlessEqual ('B::f()', call_f(a))
-      self.failUnlessEqual ('A::f()', call_f(A()))
-
-   def test_references(self):
-      # B is not exposed to Python
-      a = getBCppObj()
-      self.failUnlessEqual(type(a), A)
-
-      # C is exposed to Python
-      c = getCCppObj()
-      self.failUnlessEqual(type(c), C)
-      
-   def test_factory(self):
-      self.failUnlessEqual(type(factory(0)), A)
-      self.failUnlessEqual(type(factory(1)), A)
-      self.failUnlessEqual(type(factory(2)), C)
-
-   def test_return_py(self):
-
-      class X(A):
-         def f(self):
-            return 'X.f'
-
-      x = X()
-      
-      self.failUnlessEqual ('X.f', x.f())
-      self.failUnlessEqual ('X.f', call_f(x))
-
-   def test_wrapper_downcast(self):
-      a = pass_a(D())
-      self.failUnlessEqual('D::g()', a.g())
-
-   def test_pure_virtual(self):
-      p = P()
-      self.assertRaises(RuntimeError, p.f)
-      
-      q = Q()
-      self.failUnlessEqual ('Q::f()', q.f())
-      
-      class R(P):
-         def f(self):
-            return 'R.f'
-
-      r = R()
-      self.failUnlessEqual ('R.f', r.f())
-      
-                        
-if __name__ == "__main__":
-   
-   # remove the option which upsets unittest
-   import sys
-   sys.argv = [ x for x in sys.argv if x != '--broken-auto-ptr' ]
-   
-   unittest.main()
diff --git a/test/properties.cpp b/test/properties.cpp
deleted file mode 100755
index fdfa43a5..00000000
--- a/test/properties.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <boost/python.hpp>
-
-using namespace boost::python;
-
-struct X
-{
-    X( int value ) : m_value( value )
-    { ++s_count; }
-    
-    X( const X &other ) : m_value( other.m_value )
-    { ++s_count; }
-    
-    ~X() 
-    { --s_count; }
-        
-    int get_value() const
-    { return m_value; }
-    
-    void set_value(int new_value)
-    { m_value = new_value; }
-    
-    static int get_instance_count()
-    { return s_count; }
-        
-    int m_value;
-
-    static int s_count;
-};
-
-int X::s_count = 0;
-
-int get_X_instance_count()
-{ return X::get_instance_count(); }
-
-
-
-BOOST_PYTHON_MODULE(properties_ext)
-{
-    typedef return_value_policy<return_by_value> return_by_value_t;
-    typedef return_internal_reference<> return_by_internal_reference_t;
-    class_<X>("X", init<int>() )
-        //defining read only property
-        .add_property( "value_r", &X::get_value )
-        //defining read \ write property 
-        .add_property( "value_rw", &X::get_value, &X::set_value )
-        //defining read \ write property using make_getter and make_setter
-        .add_property( "value_direct", 
-                        make_getter( &X::m_value, return_by_value_t() ),
-                        make_setter( &X::m_value, return_by_internal_reference_t() ) )
-        //defining read only property for static member
-        .add_static_property( "instance_count", &X::get_instance_count )
-        //defining read \ write property for static member using make_getter and make_setter
-        .add_static_property( "instance_count_direct", 
-                              make_getter( &X::s_count, return_by_value_t() ), 
-                              make_setter( &X::s_count, return_by_internal_reference_t() ) )
-        //defining class property using a global function
-        .add_static_property( "instance_count_injected", &get_X_instance_count );
-}
-
-#include "module_tail.cpp"
diff --git a/test/properties.py b/test/properties.py
deleted file mode 100644
index ffceb4d6..00000000
--- a/test/properties.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""
-This is test module for properies.
-
->>> X = properties.X
-
->>> x1 = X(1)
-
-value read only
->>> x1.value_r
-1
-
-value read - write
->>> x1.value_rw
-1
-
-value direct access
->>> x1.value_direct
-1
-
-class instance count read - only
->>> X.instance_count
-1
-
-class instance count direct
->>> X.instance_count_direct
-1
-
-class instance count injected
->>> X.instance_count_injected
-1
-
-class instance count from object
->>> x1.instance_count
-1
-
-class instance count from object
->>> x1.instance_count_direct
-1
-
-class instance count from object: 
->>> x1.instance_count_injected
-1
-
-as expected you can't assign new value to read only property
->>> x1.value_r = 2
-Traceback (most recent call last):
-  File "properties.py", line 49, in ?
-    x1.value_r = 2
-AttributeError: can't set attribute
-
-setting value_rw to 2. value_direct: 
->>> x1.value_rw = 2
->>> x1.value_rw
-2
-
-setting value_direct to 3. value_direct: 
->>> x1.value_direct = 3
->>> x1.value_direct
-3
-
->>> assert x1.value_r == 3
-
->>> x2 = X(2)
-
-after creating second intstance of X instances count is 2
->>> x2.instance_count
-2
-
->>> del x2
->>> assert x1.instance_count == 1
-"""
-
-#import sys; sys.path.append(r'P:\Actimize4.0\smart_const\py_smart_const___Win32_Debug')
-import properties_ext as properties
-
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/raw_pyobject_fail1.cpp b/test/raw_pyobject_fail1.cpp
deleted file mode 100755
index 8fe73d68..00000000
--- a/test/raw_pyobject_fail1.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/converter/arg_to_python.hpp>
-
-int main()
-{
-    boost::python::converter::arg_to_python<PyTypeObject*> x(0);
-    return 0;
-}
diff --git a/test/raw_pyobject_fail2.cpp b/test/raw_pyobject_fail2.cpp
deleted file mode 100755
index 7a0e79d9..00000000
--- a/test/raw_pyobject_fail2.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/converter/arg_to_python.hpp>
-
-struct X : PyObject {};
-
-int main()
-{
-    boost::python::converter::arg_to_python<X*> x(0);
-    return 0;
-}
diff --git a/test/register_ptr.cpp b/test/register_ptr.cpp
deleted file mode 100644
index f65599d9..00000000
--- a/test/register_ptr.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-
-#include <boost/python.hpp>
-#include <boost/shared_ptr.hpp>
-
-using namespace boost;
-using namespace python;
-
-struct A
-{
-    virtual int f() { return 0; }
-};
-
-shared_ptr<A> New() { return shared_ptr<A>( new A() ); }
-
-int Call( const shared_ptr<A> & a )
-{
-    return a->f();
-}
-
-int Fail( shared_ptr<A> & a )
-{
-    return a->f();
-}
-
-struct A_Wrapper: A
-{
-    A_Wrapper(PyObject* self_): self(self_) {}
-    A_Wrapper(PyObject* self_, const A& a): self(self_), A(a) {}
-
-    int f() 
-    {
-        return call_method<int>(self, "f");
-    }
-    
-    int default_f() 
-    {
-        return A::f();
-    }
-    
-    PyObject* self;
-};
-
-BOOST_PYTHON_MODULE(register_ptr)
-{
-    class_<A, A_Wrapper>("A")
-        .def("f", &A::f, &A_Wrapper::default_f)
-    ;
-    register_ptr_to_python< shared_ptr<A> >();
-    def("New", &New);
-    def("Call", &Call);
-    def("Fail", &Fail);
-}
diff --git a/test/register_ptr_test.py b/test/register_ptr_test.py
deleted file mode 100644
index f0472993..00000000
--- a/test/register_ptr_test.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import unittest
-from register_ptr import *
-
-class RegisterPtrTest(unittest.TestCase):
-
-    def testIt(self):
-
-        class B(A):
-            def f(self):
-                return 10
-
-        a = New()  # this must work
-        b = B()
-        self.assertEqual(Call(a), 0)                                    
-        self.assertEqual(Call(b), 10)                     
-        def fails():
-            Fail(A())
-        self.assertRaises(TypeError, fails)
-        self.assertEqual(Fail(a), 0) # ok, since a is held by shared_ptr
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/test/result.cpp b/test/result.cpp
deleted file mode 100755
index 19b1cf41..00000000
--- a/test/result.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/detail/result.hpp>
-#include <boost/type.hpp>
-#include <functional>
-
-using boost::python::detail::result;
-using boost::type;
-
-void expect_int(type<int>*) {}
-void expect_string(type<char*>*) {}
-
-struct X {};
-
-int main()
-{
-    // Test the usage which works for functions, member functions, and data members
-    expect_int(
-        result((int(*)())0)
-        );
-
-    expect_int(
-        result((int(*)(char))0)
-        );
-
-    expect_int(
-        result((int(X::*)())0)
-        );
-
-    expect_int(
-        result((int(X::*)(char))0)
-        );
-
-    expect_int(
-        result((int(X::*))0)
-        );
-
-    expect_string(
-        result((char*(*)())0)
-        );
-    
-    expect_string(
-        result((char*(*)(char))0)
-        );
-    
-    expect_string(
-        result((char*(X::*)())0)
-        );
-    
-    expect_string(
-        result((char*(X::*)(char))0)
-        );
-    
-    expect_string(
-        result((char*(X::*))0)
-        );
-    
-    // Show that we can use the general version that works for
-    // AdaptableFunctions
-    expect_int(
-        result((int(*)())0,0)
-        );
-
-    expect_int(
-        result((int(*)(char))0,0)
-        );
-
-    expect_int(
-        result((int(X::*)())0,0)
-        );
-
-    expect_int(
-        result((int(X::*)(char))0,0)
-        );
-
-    expect_int(
-        result((int(X::*))0,0)
-        );
-    
-    expect_int(
-        result(std::plus<int>(),0)
-        );
-
-    expect_string(
-        result((char*(*)())0,0)
-        );
-    
-    expect_string(
-        result((char*(*)(char))0,0)
-        );
-    
-    expect_string(
-        result((char*(X::*)())0,0)
-        );
-    
-    expect_string(
-        result((char*(X::*)(char))0,0)
-        );
-    
-    expect_string(
-        result((char*(X::*))0,0)
-        );
-    
-    expect_string(
-        result(std::plus<char*>(),0)
-        );
-
-    return 0;
-}
diff --git a/test/return_arg.cpp b/test/return_arg.cpp
deleted file mode 100755
index 0412d511..00000000
--- a/test/return_arg.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright David Abrahams and Nikolay Mladenov 2003. Permission to
-// copy, use, modify, sell and distribute this software is granted
-// provided this copyright notice appears in all copies. This software
-// is provided "as is" without express or implied warranty, and with
-// no claim as to its suitability for any purpose.
-
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/return_arg.hpp>
-
-struct Widget
-{
-    Widget()
-      : sensitive_(true)
-    {}
-    
-    bool get_sensitive() const
-    {
-        return sensitive_;
-    }
-    
-    void set_sensitive(bool s)
-    {
-        this->sensitive_ = s;
-    }
-    
- private:
-   bool sensitive_;
-};
-
-struct Label : Widget
-{
-    Label() {}
-
-    std::string  get_label() const
-    {
-        return label_;
-    }
-
-    void set_label(const std::string &l)
-    {
-        label_ = l;
-    }
-
- private:
-   std::string label_;
-};
-
-void return_arg_f(boost::python::object) {}
-
-using namespace boost::python;
-BOOST_PYTHON_MODULE(return_arg_ext)
-{
-   class_<Widget>("Widget")
-      .def("sensitive", &Widget::get_sensitive)
-      .def("sensitive", &Widget::set_sensitive, return_self<>())
-      ;
-
-   class_<Label, bases<Widget> >("Label")
-      .def("label", &Label::get_label)//,return_arg<0>()) //error(s)
-      .def("label", &Label::set_label, return_self<>())
-      ;
-
-   def("return_arg", return_arg_f, return_arg<1>());
-}
-
-#include "module_tail.cpp"
diff --git a/test/return_arg.py b/test/return_arg.py
deleted file mode 100644
index 4cbc89f4..00000000
--- a/test/return_arg.py
+++ /dev/null
@@ -1,24 +0,0 @@
-'''
->>> from return_arg_ext import *
->>> l1=Label()
->>> assert l1 is l1.label("bar")
->>> assert l1 is l1.label("bar").sensitive(0)
->>> assert l1.label("foo").sensitive(0) is l1.sensitive(1).label("bar")
->>> assert return_arg is return_arg(return_arg)
-
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/select_arg_to_python_test.cpp b/test/select_arg_to_python_test.cpp
deleted file mode 100644
index df925a54..00000000
--- a/test/select_arg_to_python_test.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <boost/python/converter/arg_to_python.hpp>
-#include <boost/python/type_id.hpp>
-#include <boost/python/handle.hpp>
-#include <boost/python/object.hpp>
-#include <iostream>
-
-// gcc 2.95.x and MIPSpro 7.3.1.3 linker seem to demand this definition
-#if ((defined(__GNUC__) && __GNUC__ < 3)) \
- || (defined(__sgi) && defined(__EDG_VERSION__) && (__EDG_VERSION__ == 238))
-namespace boost { namespace python {
-BOOST_PYTHON_DECL bool handle_exception_impl(function0<void>)
-{
-    return true;
-}
-}}
-#endif
-
-int result;
-
-#define ASSERT_SAME(T1,T2) \
-       if (!is_same< T1, T2 >::value) { \
-             std::cout << "*********************\n"; \
-             std::cout << python::type_id< T1 >() << " != " << python::type_id< T2 >() << "\n"; \
-             std::cout << "*********************\n"; \
-             result = 1; \
-       }
-
-int main()
-{
-    using namespace boost::python::converter::detail;
-    using namespace boost::python::converter;
-    using namespace boost::python;
-    using namespace boost;
-
-
-    ASSERT_SAME(
-        select_arg_to_python<int>::type, value_arg_to_python<int>
-        );
-
-    ASSERT_SAME(
-        select_arg_to_python<reference_wrapper<int> >::type, reference_arg_to_python<int>
-        );
-    
-    ASSERT_SAME(
-        select_arg_to_python<pointer_wrapper<int> >::type, pointer_shallow_arg_to_python<int>
-        );
-    
-    ASSERT_SAME(
-        select_arg_to_python<int*>::type, pointer_deep_arg_to_python<int*>
-        );
-    
-    ASSERT_SAME(
-        select_arg_to_python<handle<> >::type, object_manager_arg_to_python<handle<> >
-        );
-
-    ASSERT_SAME(
-        select_arg_to_python<object>::type, object_manager_arg_to_python<object>
-        );
-
-    ASSERT_SAME(
-        select_arg_to_python<char[20]>::type, arg_to_python<char const*>
-        );
-
-    return result;
-}
diff --git a/test/select_from_python_test.cpp b/test/select_from_python_test.cpp
deleted file mode 100644
index 34018781..00000000
--- a/test/select_from_python_test.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-#include <boost/python/converter/arg_from_python.hpp>
-#include <boost/python/type_id.hpp>
-#include <iostream>
-
-// gcc 2.95.x and MIPSpro 7.3.1.3 linker seem to demand this definition
-#if ((defined(__GNUC__) && __GNUC__ < 3)) \
- || (defined(__sgi) && defined(__EDG_VERSION__) && (__EDG_VERSION__ == 238))
-namespace boost { namespace python {
-BOOST_PYTHON_DECL bool handle_exception_impl(function0<void>)
-{
-    return true;
-}
-}}
-#endif
-
-int result;
-
-#define ASSERT_SAME(T1,T2) \
-       if (!is_same< T1, T2 >::value) { \
-             std::cout << "*********************\n"; \
-             std::cout << python::type_id< T1 >() << " != " << python::type_id< T2 >() << "\n"; \
-             std::cout << "*********************\n"; \
-             result = 1; \
-       }
-
-int main()
-{
-    using namespace boost::python::converter;
-    using namespace boost;
-
-
-    ASSERT_SAME(
-        select_arg_from_python<int>::type, arg_rvalue_from_python<int>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int const>::type, arg_rvalue_from_python<int const>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int volatile>::type, arg_rvalue_from_python<int volatile>
-        );
-
-    ASSERT_SAME(
-        select_arg_from_python<int const volatile>::type, arg_rvalue_from_python<int const volatile>
-        );
-
-
-
-    ASSERT_SAME(
-        select_arg_from_python<int*>::type, pointer_arg_from_python<int*>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int const*>::type, pointer_arg_from_python<int const*>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int volatile*>::type, pointer_arg_from_python<int volatile*>
-        );
-
-    ASSERT_SAME(
-        select_arg_from_python<int const volatile*>::type, pointer_arg_from_python<int const volatile*>
-        );
-
-
-
-
-    ASSERT_SAME(
-        select_arg_from_python<int&>::type, reference_arg_from_python<int&>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int const&>::type, arg_rvalue_from_python<int const&>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int volatile&>::type, reference_arg_from_python<int volatile&>
-        );
-
-    ASSERT_SAME(
-        select_arg_from_python<int const volatile&>::type, reference_arg_from_python<int const volatile&>
-        );
-
-
-
-    ASSERT_SAME(
-        select_arg_from_python<int*&>::type, reference_arg_from_python<int*&>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int const*&>::type, reference_arg_from_python<int const*&>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int volatile*&>::type, reference_arg_from_python<int volatile*&>
-        );
-
-    ASSERT_SAME(
-        select_arg_from_python<int const volatile*&>::type, reference_arg_from_python<int const volatile*&>
-        );
-
-
-
-    ASSERT_SAME(
-        select_arg_from_python<int* const&>::type, pointer_cref_arg_from_python<int*const&>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int const* const&>::type, pointer_cref_arg_from_python<int const*const&>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int volatile* const&>::type, pointer_cref_arg_from_python<int volatile*const&>
-        );
-
-    ASSERT_SAME(
-        select_arg_from_python<int const volatile* const&>::type, pointer_cref_arg_from_python<int const volatile*const&>
-        );
-
-
-
-    ASSERT_SAME(
-        select_arg_from_python<int*volatile&>::type, reference_arg_from_python<int*volatile&>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int const*volatile&>::type, reference_arg_from_python<int const*volatile&>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int volatile*volatile&>::type, reference_arg_from_python<int volatile*volatile&>
-        );
-
-    ASSERT_SAME(
-        select_arg_from_python<int const volatile*volatile&>::type, reference_arg_from_python<int const volatile*volatile&>
-        );
-
-
-
-    ASSERT_SAME(
-        select_arg_from_python<int*const volatile&>::type, reference_arg_from_python<int*const volatile&>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int const*const volatile&>::type, reference_arg_from_python<int const*const volatile&>
-        );
-    
-    ASSERT_SAME(
-        select_arg_from_python<int volatile*const volatile&>::type, reference_arg_from_python<int volatile*const volatile&>
-        );
-
-    ASSERT_SAME(
-        select_arg_from_python<int const volatile*const volatile&>::type, reference_arg_from_python<int const volatile*const volatile&>
-        );
-    return result;
-}
diff --git a/test/select_holder.cpp b/test/select_holder.cpp
deleted file mode 100644
index 2a0b1c8c..00000000
--- a/test/select_holder.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/object/select_holder.hpp>
-#include <boost/python/has_back_reference.hpp>
-#include <boost/python/detail/not_specified.hpp>
-#include <boost/static_assert.hpp>
-#include <boost/type_traits/same_traits.hpp>
-#include <boost/function/function0.hpp>
-#include <boost/mpl/bool.hpp>
-#include <memory>
-
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
-
-struct BR {};
-
-struct Base {};
-struct Derived : Base {};
-
-namespace boost { namespace python
-{
-  // specialization
-  template <>
-  struct has_back_reference<BR>
-    : mpl::true_
-  {
-  };
-}} // namespace boost::python
-
-template <class T, class U>
-void assert_same(U* = 0, T* = 0)
-{
-    BOOST_TEST((boost::is_same<T,U>::value));
-    BOOST_STATIC_ASSERT((boost::is_same<T,U>::value));
-    
-}
-
-template <class T, class Held, class Holder>
-void assert_holder(T* = 0, Held* = 0, Holder* = 0)
-{
-    typedef typename boost::python::objects::select_holder<T,Held>::type h;
-    assert_same<Holder>(
-        (h*)0
-    );
-}
-
-int test_main(int, char * [])
-{
-    using namespace boost::python::detail;
-    using namespace boost::python::objects;
-
-    assert_holder<Base,not_specified,value_holder<Base> >();
-
-    assert_holder<BR,not_specified,value_holder_back_reference<BR,BR> >();
-    assert_holder<Base,Base,value_holder<Base> >();
-    assert_holder<BR,BR,value_holder_back_reference<BR,BR> >();
-
-    assert_holder<Base,Derived
-        ,value_holder_back_reference<Base,Derived> >();
-
-    assert_holder<Base,std::auto_ptr<Base>
-        ,pointer_holder<std::auto_ptr<Base>,Base> >();
-    
-    assert_holder<Base,std::auto_ptr<Derived>
-        ,pointer_holder_back_reference<std::auto_ptr<Derived>,Base> >();
-
-    assert_holder<BR,std::auto_ptr<BR>
-        ,pointer_holder_back_reference<std::auto_ptr<BR>,BR> > ();
-
-    return 0;
-}
-
-#if !defined(_WIN32) || defined(__GNUC__)
-// This definition is needed for MinGW 2.95.2 and KCC on OSF for some
-// reason, but will break other Win32 compilers.
-namespace boost { namespace python
-{
-  bool handle_exception_impl(boost::function0<void>) { return false; }
-}}
-#endif 
diff --git a/test/shared_ptr.cpp b/test/shared_ptr.cpp
deleted file mode 100644
index 2d0f0ec7..00000000
--- a/test/shared_ptr.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/call_method.hpp>
-#include <boost/python/extract.hpp>
-#include <boost/python/def.hpp>
-#include <boost/shared_ptr.hpp>
-#include "test_class.hpp"
-
-#include <memory>
-
-using namespace boost::python;
-using boost::shared_ptr;
-
-typedef test_class<> X;
-typedef test_class<1> Y;
-
-template <class T>
-struct functions
-{
-    static int look(shared_ptr<T> const& x)
-    {
-        return (x.get()) ? x->value() : -1;
-    }
-
-    static void store(shared_ptr<T> x)
-    {
-        storage = x;
-    }
-
-    static void release_store()
-    {
-        store(shared_ptr<T>());
-    }
-    
-    static void modify(shared_ptr<T>& x)
-    {
-        x.reset();
-    }
-
-    static shared_ptr<T> get() { return storage; }
-        
-    static int look_store()
-    {
-        return look(get());
-    }
-
-    template <class C>
-    static void expose(C const& c)
-    {
-        def("look", &look);
-        def("store", &store);
-        def("modify", &modify);
-        def("identity", &identity);
-        def("null", &null);
-            
-        const_cast<C&>(c)
-            .def("look", &look)
-            .staticmethod("look")
-            .def("store", &store)
-            .staticmethod("store")
-            .def("modify", &modify)
-            .staticmethod("modify")
-            .def("look_store", &look_store)
-            .staticmethod("look_store")
-            .def("identity", &identity)
-            .staticmethod("identity")
-            .def("null", &null)
-            .staticmethod("null")
-            .def("get", &get)
-            .staticmethod("get")
-            .def("count", &T::count)
-            .staticmethod("count")
-            .def("release", &release_store)
-            .staticmethod("release")
-            ;
-    }
-
-    static shared_ptr<T> identity(shared_ptr<T> x) { return x; }
-    static shared_ptr<T> null(T const&) { return shared_ptr<T>(); }
-    
-
-    static shared_ptr<T> storage;
-};
-
-template <class T> shared_ptr<T> functions<T>::storage;
-
-struct Z : test_class<2>
-{
-    Z(int x) : test_class<2>(x) {}
-    virtual int v() { return this->value(); }
-};
-
-struct ZWrap : Z
-{
-    ZWrap(PyObject* self, int x)
-        : Z(x), m_self(self) {}
-
-    
-    virtual int v() { return call_method<int>(m_self, "v"); }
-    int default_v() { return Z::v(); }
-    
-
-    PyObject* m_self;
-};
-
-struct YY : Y
-{
-    YY(int n) : Y(n) {}
-};
-
-struct YYY : Y
-{
-    YYY(int n) : Y(n) {}
-};
-
-shared_ptr<Y> factory(int n)
-{
-    return shared_ptr<Y>(n < 42 ? new Y(n) : new YY(n));
-}
-
-// regressions from Nicodemus
-    struct A
-    {
-        virtual int f() = 0;
-        static int call_f(shared_ptr<A>& a) { return a->f(); }
-    };
-
-    struct B: A
-    {
-        int f() { return 1; }
-    };
-
-    boost::shared_ptr<A> New(bool make)
-    {
-        return boost::shared_ptr<A>( make ? new B() : 0 );
-    }
-
-    struct A_Wrapper: A
-    {
-        A_Wrapper(PyObject* self_):
-            A(), self(self_) {}
-
-        int f() {
-            return call_method< int >(self, "f");
-        }
-
-        PyObject* self;
-    };
-
-// ------
-
-BOOST_PYTHON_MODULE(shared_ptr_ext)
-{
-    class_<A, boost::shared_ptr<A_Wrapper>, boost::noncopyable>("A")
-        .def("call_f", &A::call_f)
-        .staticmethod("call_f")
-        ;
-
-    // This is the ugliness required to register a to-python converter
-    // for shared_ptr<A>.
-    objects::class_value_wrapper<
-        shared_ptr<A>
-      , objects::make_ptr_instance<A, objects::pointer_holder<shared_ptr<A>,A> >
-    >();
-        
-    def("New", &New);
-
-    def("factory", factory);
-    
-    functions<X>::expose(
-        class_<X, boost::noncopyable>("X", init<int>())
-             .def("value", &X::value)
-        );
-    
-    functions<Y>::expose(
-        class_<Y, boost::shared_ptr<Y> >("Y", init<int>())
-            .def("value", &Y::value)
-        );
-    
-    class_<YY, bases<Y>, boost::noncopyable>("YY", init<int>())
-        ;
-
-    class_<YYY, shared_ptr<YYY>, bases<Y> >("YYY", init<int>())
-        ;
-
-    functions<Z>::expose(
-        class_<Z, ZWrap>("Z", init<int>())
-            .def("value", &Z::value)
-            .def("v", &Z::v, &ZWrap::default_v)
-        );
-}
-
-#include "module_tail.cpp"
-
diff --git a/test/shared_ptr.py b/test/shared_ptr.py
deleted file mode 100644
index cabb134a..00000000
--- a/test/shared_ptr.py
+++ /dev/null
@@ -1,127 +0,0 @@
-'''
->>> from shared_ptr_ext import *
-
-   Test that shared_ptr<Derived> can be converted to shared_ptr<Base>
- 
->>> Y.store(YYY(42))
-
->>> x = X(17)
->>> null_x = null(x)
->>> null_x # should be None
->>> identity(null_x) # should also be None
-
->>> a = New(1)
->>> A.call_f(a)
-1
->>> New(0)
-
->>> type(factory(3))
-<class 'shared_ptr_ext.Y'>
->>> type(factory(42))
-<class 'shared_ptr_ext.YY'>
-
->>> class P(Z):
-...     def v(self):
-...         return -Z.v(self);
-...     def __del__(self):
-...         print 'bye'
-...
->>> p = P(12)
->>> p.value()
-12
->>> p.v()
--12
->>> look(p)
-12
->>> try: modify(p)
-... except TypeError: pass
-... else: 'print expected a TypeError'
->>> look(None)
--1
->>> store(p)
->>> del p
->>> Z.get().v()
--12
->>> Z.count()
-1
->>> Z.look_store()
-12
->>> Z.release()
-bye
->>> Z.count()
-0
-
->>> z = Z(13)
->>> z.value()
-13
->>> z.v()
-13
->>> try: modify(z)
-... except TypeError: pass
-... else: 'print expected a TypeError'
-
->>> Z.get() # should be None
->>> store(z)
->>> assert Z.get() is z  # show that deleter introspection works
->>> del z
->>> Z.get().value()
-13
->>> Z.count()
-1
->>> Z.look_store()
-13
->>> Z.release()
->>> Z.count()
-0
-
->>> x = X(17)
->>> x.value()
-17
->>> look(x)
-17
->>> try: modify(x)
-... except TypeError: pass
-... else: 'print expected a TypeError'
->>> look(None)
--1
->>> store(x)
->>> del x
->>> X.count()
-1
->>> X.look_store()
-17
->>> X.release()
->>> X.count()
-0
-
-
->>> y = Y(19)
->>> y.value()
-19
->>> modify(y)
->>> look(y)
--1
->>> store(Y(23))
->>> Y.count()
-1
->>> Y.look_store()
-23
->>> Y.release()
->>> Y.count()
-0
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/simple_type.hpp b/test/simple_type.hpp
deleted file mode 100644
index 2df97cfd..00000000
--- a/test/simple_type.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright David Abrahams 2001. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef SIMPLE_TYPE_DWA2001128_HPP
-# define SIMPLE_TYPE_DWA2001128_HPP
-
-struct simple
-{
-    char* s;
-};
-
-#endif // SIMPLE_TYPE_DWA2001128_HPP
diff --git a/test/staticmethod.cpp b/test/staticmethod.cpp
deleted file mode 100644
index a62f6275..00000000
--- a/test/staticmethod.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/class.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/call_method.hpp>
-#include <boost/ref.hpp>
-#include <boost/utility.hpp>
-
-using namespace boost::python;
-
-struct X
-{
-    explicit X(int x) : x(x), magic(7654321) { ++counter; }
-    X(X const& rhs) : x(rhs.x), magic(7654321) { ++counter; }
-    virtual ~X() { assert(magic == 7654321); magic = 6666666; x = 9999; --counter; }
-
-    void set(int x) { assert(magic == 7654321); this->x = x; }
-    int value() const { assert(magic == 7654321); return x; }
-    static int count() { return counter; }
- private:
-    void operator=(X const&);
- private:
-    int x;
-    long magic;
-    static int counter;
-};
-int X::counter;
-int getXmagic(){return 7654321;}
-
-BOOST_PYTHON_MODULE(staticmethod_ext)
-{
-    class_<X>("X", init<int>())
-        .def("value", &X::value)
-        .def("set", &X::set)
-        .def("count", &X::count)
-        .staticmethod("count")
-        .def("magic", &getXmagic)
-        .staticmethod("magic")
-        ;
-}
-
-#include "module_tail.cpp"
diff --git a/test/staticmethod.py b/test/staticmethod.py
deleted file mode 100644
index e9e9e697..00000000
--- a/test/staticmethod.py
+++ /dev/null
@@ -1,54 +0,0 @@
-'''
->>> from staticmethod_ext import *
-
->>> class X1(X):
-...     pass
-
-
->>> x = X(16)
->>> x1 = X1(17)
-
-
-
->>> x1.count()
-2
-
->>> x.count()
-2
-
->>> X1.count()
-2
-
->>> X.count()
-2
-
-
->>> x1.magic()
-7654321
-
->>> x.magic()
-7654321
-
->>> X1.magic()
-7654321
-
->>> X.magic()
-7654321
-
-
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/str.cpp b/test/str.cpp
deleted file mode 100644
index 9e675208..00000000
--- a/test/str.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/str.hpp>
-
-using namespace boost::python;
-
-object convert_to_string(object data)
-{
-    return str(data);
-}
-
-void work_with_string(object print)
-{
-    str data("this is a demo string");
-    print(data.split(" "));
-    print(data.split(" ",3));
-    print(str("<->").join(data.split(" ")));
-    print(data.capitalize());
-    print('[' + data.center(30) + ']');
-    print(data.count("t"));
-    print(data.encode("utf-8"));
-    print(data.decode("utf-8"));
-    print(data.endswith("xx"));
-    print(data.startswith("test"));
-    print(data.splitlines());
-    print(data.strip());
-    print(data.swapcase());
-    print(data.title());
-
-    print("find");
-    print(data.find("demo"));
-    print(data.find("demo"),3,5);
-    print(data.find(std::string("demo")));
-    print(data.find(std::string("demo"),9));
-
-    print("expandtabs");
-    str tabstr("\t\ttab\tdemo\t!");
-    print(tabstr.expandtabs());
-    print(tabstr.expandtabs(4));
-    print(tabstr.expandtabs(7L));
-
-    print("operators");
-    print( str("part1") + str("part2") );
-//    print( str("a test string").slice(3,_) );
-//    print( str("another test")[5] );
-
-    print(data.replace("demo",std::string("blabla")));
-    print(data.rfind("i",5));
-    print(data.rindex("i",5));
-    print(data.startswith("asdf"));
-    print(data.endswith("asdf"));
-    print(data.translate(str('a')*256));
-
-
-    bool tmp = data.isalnum() || data.isalpha() || data.isdigit() || data.islower() ||
-        data.isspace() || data.istitle() || data.isupper();
-    (void)tmp; // ignored.
-}
-   
-
-BOOST_PYTHON_MODULE(str_ext)
-{
-    def("convert_to_string",convert_to_string);
-    def("work_with_string",work_with_string);
-}
-
diff --git a/test/str.py b/test/str.py
deleted file mode 100644
index bf7a86ed..00000000
--- a/test/str.py
+++ /dev/null
@@ -1,54 +0,0 @@
-"""
->>> from str_ext import *
->>> def printer(*args):
-...     for x in args: print x,
-...     print
-...
->>> work_with_string(printer)
-['this', 'is', 'a', 'demo', 'string']
-['this', 'is', 'a', 'demo string']
-this<->is<->a<->demo<->string
-This is a demo string
-[    this is a demo string     ]
-2
-this is a demo string
-this is a demo string
-0
-0
-['this is a demo string']
-this is a demo string
-THIS IS A DEMO STRING
-This Is A Demo String
-find
-10
-10 3 5
-10
-10
-expandtabs
-                tab     demo    !
-        tab demo    !
-              tab    demo   !
-operators
-part1part2
-this is a blabla string
-18
-18
-0
-0
-aaaaaaaaaaaaaaaaaaaaa
-"""
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/string_literal.cpp b/test/string_literal.cpp
deleted file mode 100644
index e64f40f5..00000000
--- a/test/string_literal.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-#include <boost/python/detail/string_literal.hpp>
-//#include <stdio.h>
-#include <cassert>
-#include <boost/static_assert.hpp>
-
-using namespace boost::python::detail;
-    
-
-template <class T>
-void expect_string_literal(T const&)
-{
-    BOOST_STATIC_ASSERT(is_string_literal<T const>::value);
-}
-
-int main()
-{
-    expect_string_literal("hello");
-    BOOST_STATIC_ASSERT(!is_string_literal<int*&>::value);
-    BOOST_STATIC_ASSERT(!is_string_literal<int* const&>::value);
-    BOOST_STATIC_ASSERT(!is_string_literal<int*volatile&>::value);
-    BOOST_STATIC_ASSERT(!is_string_literal<int*const volatile&>::value);
-    
-    BOOST_STATIC_ASSERT(!is_string_literal<char const*>::value);
-    BOOST_STATIC_ASSERT(!is_string_literal<char*>::value);
-    BOOST_STATIC_ASSERT(!is_string_literal<char*&>::value);
-    BOOST_STATIC_ASSERT(!is_string_literal<char* const&>::value);
-    BOOST_STATIC_ASSERT(!is_string_literal<char*volatile&>::value);
-    BOOST_STATIC_ASSERT(!is_string_literal<char*const volatile&>::value);
-    
-    BOOST_STATIC_ASSERT(!is_string_literal<char[20]>::value);
-    BOOST_STATIC_ASSERT(is_string_literal<char const[20]>::value);
-    BOOST_STATIC_ASSERT(is_string_literal<char const[3]>::value);
-
-    BOOST_STATIC_ASSERT(!is_string_literal<int[20]>::value);
-    BOOST_STATIC_ASSERT(!is_string_literal<int const[20]>::value);
-    BOOST_STATIC_ASSERT(!is_string_literal<int const[3]>::value);
-    return 0;
-}
diff --git a/test/submod_subclass_api.cpp b/test/submod_subclass_api.cpp
deleted file mode 100644
index e716aaf0..00000000
--- a/test/submod_subclass_api.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright David Hawkes 2002.
-// Permission is hereby granted to copy, use and modify this software
-// for any purpose, including commercial distribution, provided this
-// copyright notice is not removed. No warranty WHATSOEVER is provided with this
-// software. Any user(s) accepts this software "as is" and as such they will not
-// bind the author(s) to any claim of suitabilty for any purpose.
-
-// embed_test.cpp : substantial test of embedding python in c++ using boost
-
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/call_method.hpp>
-#include <boost/python/call.hpp>
-#include <boost/python/object.hpp>
-#include <boost/python/py_interface.hpp>
-#include <boost/utility.hpp>
-#include <boost/shared_ptr.hpp>
-
-using namespace boost;
-using namespace boost::python;
-
-
-// The following macros are for our convenience and coding expediency...
-// There is no particular recomendation that they be used elsewhere
-// as they are not feature complete and are just sufficient to suport
-// the code here
-
-
-#define DEF(fn) def(#fn, fn)
-#define DEF_C(c, fn) def(#fn, &c::fn)
-#define DEF_C_CB(c, fn) def(#fn, &c##_callback::base_##fn)
-
-#define CLASS(c) class_<c, shared_ptr<c> >(#c)
-#define CLASS_CB(c) class_<c, shared_ptr<c##_callback>, noncopyable >(#c)
-
-#define START_CALLBACK_CLASS(c)                     \
-class c##_callback : public c                       \
-{                                                   \
-    typedef c __base__;                             \
-public:                                             \
-    c##_callback(PyObject* self) : m_self(self) {}  \
-private:                                            \
-    PyObject* m_self;                               \
-public:
-
-#define END_CALLBACK_CLASS  };
-
-
-#define CALLBACK_MEMBER0(fn, rtn)                   \
-rtn fn() { return call_method<rtn>(m_self, #fn); }  \
-rtn base_##fn() { return __base__::fn(); }
-
-
-#define CALLBACK_MEMBER0C(fn, rtn)                          \
-rtn fn() const { return call_method<rtn>(m_self, #fn); }    \
-rtn base_##fn() const { return __base__::fn(); }
-// End of convenience macros
-
-// useful support classes
-template<class T>
-struct class_object : public object
-{
-    typedef object base;
-    class_object() : m_class_ptr(NULL) {}
-    class_object(object const& o) : base(o) { init(); }
-    class_object& operator=(object const& o)
-    {
-        base::operator=(o);
-        init();
-        return *this;
-    }
-    T* operator->() const { return m_class_ptr; }
-    T& operator*() const { return *m_class_ptr; }
-private:
-    void init()
-    {
-        m_class_ptr = arg_from_python<T*>(ptr())(ptr());
-    }
-    T* m_class_ptr;
-};
-
-template<class T>
-struct item_object : public object
-{
-    typedef object base;
-    item_object() {}
-    item_object(object const& o) : base(o), m_class(arg_from_python<T>(ptr())(ptr())) {}
-    item_object& operator=(object const& o)
-    {
-        base::operator=(o);
-        init();
-        return *this;
-    }
-    operator T() { return m_class; }
-private:
-    void init()
-    {
-        m_class = arg_from_python<T>(ptr())(ptr());
-    }
-    T m_class;
-};
-// end of useful support classes
-
-// pass our args in this struct
-struct main_args {
-    main_args(int _argc, char* _argv[]) : argc(_argc), argv(_argv) {}
-    int argc;
-    char** argv;
-};
-int python_main(main_args const &ma);
-
-// python module init
-BOOST_PYTHON_MODULE(python_main)
-{
-    DEF(python_main);
-    CLASS(main_args);
-}
-
-// sub module tests
-namespace sm {
-
-int test_func() { return 7; }
-
-BOOST_PYTHON_MODULE(sm_test)
-{
-    // define a submodule
-    boost::python::module(".sm");
-    // define a 2nd submodule
-    boost::python::module(".sm.sm2");
-    // define a test function to appear in 2nd submodule
-    DEF(test_func);
-}
-
-// sub-module tests
-int test()
-{
-    api::run_simple_string("import sm_test");
-    if(api::call_statement("_0 = bpl_test('sub modules', sm_test.sm.sm2.test_func, _1)", test_func()))
-        return 1;
-	return 0;
-}
-
-}
-
-// sub class tests
-namespace sc {
-
-class c1 {
-public:
-    c1() {}
-    class c2 {
-    public:
-        c2() : n(2) {}
-        int n;
-    };
-    c2 t;
-};
-
-c1::c2 test_func() {
-    return c1().t;
-}
-
-BOOST_PYTHON_MODULE(sc_test)
-{
-    class_<c1::c2>("c1.c2")
-        .def_init()
-        .def_readwrite("n", &c1::c2::n);
-    CLASS(c1)
-        .def_init()
-        .def_readwrite("t", &c1::t);
-    DEF(test_func);
-}
-
-// sub-class tests
-int test()
-{
-    api::run_simple_string("import sc_test");
-    if(api::call_statement("_0 = bpl_test('sub classes', lambda : sc_test.c1.c2().n, _1.n)", test_func()))
-        return 1;
-    if(api::call_statement("_0 = bpl_test('sub classes', lambda : sc_test.c1().t.n, _1.n)", test_func()))
-        return 1;
-	return 0;
-}
-
-}
-
-// new main that will have a python execution frame
-int main(int argc, char* argv[])
-{
-    // default return value;
-    int rtn = 0;
-    // define all the built-in modules used
-    PyImport_AppendInittab("python_main", initpython_main);
-    PyImport_AppendInittab("sm_test", sm::initsm_test);
-    PyImport_AppendInittab("sc_test", sc::initsc_test);
-    // initialize python
-    Py_Initialize();
-    // start a new block so that any objects are released prior to finalizing
-    {
-        // import our main module - this will also initialise boost
-        api::run_simple_string("import python_main");
-        // We call back here so we have a proper python execution frame to work with
-        item_object<int> o_rtn(api::call_statement("_0 = python_main.python_main(_1)", main_args(argc, argv)));
-        rtn = o_rtn;
-    }
-    // clean up
-    Py_Finalize();
-	return rtn;
-}
-
-char *bpl_test = 
-"def bpl_test(name, func, result):\n"
-"    print 'testing %s...' % name\n"
-"    if func() != result:\n"
-"        print 'failed'\n"
-"        return 1\n"
-"    else:\n"
-"        print 'OK'\n"
-"        return 0\n";
-
-
-int python_main(main_args const &ma)
-{
-    api::print("running...\n");
-    api::call_statement(bpl_test);
-    if(sm::test())
-        return 1;
-    if(sc::test())
-        return 1;
-    return 0;
-}
diff --git a/test/test_builtin_converters.cpp b/test/test_builtin_converters.cpp
deleted file mode 100644
index ef1f1b3c..00000000
--- a/test/test_builtin_converters.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <complex>
-#include <boost/python/handle.hpp>
-#include <boost/python/cast.hpp>
-#include <boost/python/object.hpp>
-#include <boost/python/detail/wrap_python.hpp>
-
-template <class T>
-struct by_value
-{
-    static T rewrap(T x)
-    {
-        return x;
-    }
-};
-
-template <class T>
-struct by_const_reference
-{
-    static T rewrap(T const& x)
-    {
-        return x;
-    }
-};
-
-template <class T>
-struct by_reference
-{
-    static T rewrap(T& x)
-    {
-        return x;
-    }
-};
-
-using boost::python::def;
-using boost::python::handle;
-using boost::python::object;
-using boost::python::borrowed;
-
-// Used to test that arbitrary handle<>s can be returned
-handle<PyTypeObject> get_type(handle<> x)
-{
-    return handle<PyTypeObject>(borrowed(x->ob_type));
-}
-
-handle<> return_null_handle()
-{
-    return handle<>();
-}
-
-char const* rewrap_value_mutable_cstring(char* x) { return x; }
-
-object identity_(object x) { return x; }
-
-BOOST_PYTHON_MODULE(builtin_converters)
-{    
-    def("get_type", get_type);
-    def("return_null_handle", return_null_handle);
-        
-    def("rewrap_value_bool", by_value<bool>::rewrap);
-    def("rewrap_value_char", by_value<char>::rewrap);
-    def("rewrap_value_signed_char", by_value<signed char>::rewrap);
-    def("rewrap_value_unsigned_char", by_value<unsigned char>::rewrap);
-    def("rewrap_value_int", by_value<int>::rewrap);
-    def("rewrap_value_unsigned_int", by_value<unsigned int>::rewrap);
-    def("rewrap_value_short", by_value<short>::rewrap);
-    def("rewrap_value_unsigned_short", by_value<unsigned short>::rewrap);
-    def("rewrap_value_long", by_value<long>::rewrap);
-    def("rewrap_value_unsigned_long", by_value<unsigned long>::rewrap);
-// using Python's macro instead of Boost's - we don't seem to get the
-// config right all the time.
-#ifdef HAVE_LONG_LONG
-    def("rewrap_value_long_long", by_value<BOOST_PYTHON_LONG_LONG>::rewrap);
-    def("rewrap_value_unsigned_long_long", by_value<unsigned BOOST_PYTHON_LONG_LONG>::rewrap);
-# endif 
-    def("rewrap_value_float", by_value<float>::rewrap);
-    def("rewrap_value_double", by_value<double>::rewrap);
-    def("rewrap_value_long_double", by_value<long double>::rewrap);
-    def("rewrap_value_complex_float", by_value<std::complex<float> >::rewrap);
-    def("rewrap_value_complex_double", by_value<std::complex<double> >::rewrap);
-    def("rewrap_value_complex_long_double", by_value<std::complex<long double> >::rewrap);
-    def("rewrap_value_wstring",
-# ifdef BOOST_NO_STD_WSTRING
-        identity_
-# else 
-        by_value<std::wstring>::rewrap
-# endif 
-    );
-    def("rewrap_value_string",
-# ifdef BOOST_NO_STD_WSTRING
-        identity_
-# else 
-        by_value<std::wstring>::rewrap
-# endif 
-    );
-    def("rewrap_value_string", by_value<std::string>::rewrap);
-    def("rewrap_value_cstring", by_value<char const*>::rewrap);
-    def("rewrap_value_handle", by_value<handle<> >::rewrap);
-    def("rewrap_value_object", by_value<object>::rewrap);
-
-        // Expose this to illustrate our failings ;-). See test_builtin_converters.py
-    def("rewrap_value_mutable_cstring", rewrap_value_mutable_cstring);
-
-
-    def("rewrap_const_reference_bool", by_const_reference<bool>::rewrap);
-    def("rewrap_const_reference_char", by_const_reference<char>::rewrap);
-    def("rewrap_const_reference_signed_char", by_const_reference<signed char>::rewrap);
-    def("rewrap_const_reference_unsigned_char", by_const_reference<unsigned char>::rewrap);
-    def("rewrap_const_reference_int", by_const_reference<int>::rewrap);
-    def("rewrap_const_reference_unsigned_int", by_const_reference<unsigned int>::rewrap);
-    def("rewrap_const_reference_short", by_const_reference<short>::rewrap);
-    def("rewrap_const_reference_unsigned_short", by_const_reference<unsigned short>::rewrap);
-    def("rewrap_const_reference_long", by_const_reference<long>::rewrap);
-    def("rewrap_const_reference_unsigned_long", by_const_reference<unsigned long>::rewrap);
-// using Python's macro instead of Boost's - we don't seem to get the
-// config right all the time.
-# ifdef HAVE_LONG_LONG
-    def("rewrap_const_reference_long_long", by_const_reference<BOOST_PYTHON_LONG_LONG>::rewrap);
-    def("rewrap_const_reference_unsigned_long_long", by_const_reference<unsigned BOOST_PYTHON_LONG_LONG>::rewrap);
-# endif
-    def("rewrap_const_reference_float", by_const_reference<float>::rewrap);
-    def("rewrap_const_reference_double", by_const_reference<double>::rewrap);
-    def("rewrap_const_reference_long_double", by_const_reference<long double>::rewrap);
-    def("rewrap_const_reference_complex_float", by_const_reference<std::complex<float> >::rewrap);
-    def("rewrap_const_reference_complex_double", by_const_reference<std::complex<double> >::rewrap);
-    def("rewrap_const_reference_complex_long_double", by_const_reference<std::complex<long double> >::rewrap);
-    def("rewrap_const_reference_string", by_const_reference<std::string>::rewrap);
-    def("rewrap_const_reference_cstring", by_const_reference<char const*>::rewrap);
-    def("rewrap_const_reference_handle", by_const_reference<handle<> >::rewrap);
-    def("rewrap_const_reference_object", by_const_reference<object>::rewrap);
-    def("rewrap_reference_object", by_reference<object>::rewrap);
-}
-
diff --git a/test/test_builtin_converters.py b/test/test_builtin_converters.py
deleted file mode 100644
index 345f2669..00000000
--- a/test/test_builtin_converters.py
+++ /dev/null
@@ -1,247 +0,0 @@
-r"""
->>> from builtin_converters import *
-
-# Synthesize idendity functions in case long long not supported
->>> if not 'rewrap_value_long_long' in dir():
-...     def rewrap_value_long_long(x): return long(x)
-...     def rewrap_value_unsigned_long_long(x): return long(x)
-...     def rewrap_const_reference_long_long(x): return long(x)
-...     def rewrap_const_reference_unsigned_long_long(x): return long(x)
-
->>> rewrap_value_bool(None)
-0
->>> rewrap_value_bool(0)
-0
->>> rewrap_value_bool(33)
-1
->>> rewrap_value_char('x')
-'x'
-
-  Note that there's currently silent truncation of strings passed to
-  char arguments.
-
->>> rewrap_value_char('xy')
-'x'
->>> rewrap_value_signed_char(42)
-42
->>> rewrap_value_unsigned_char(42)
-42
->>> rewrap_value_int(42)
-42
->>> rewrap_value_unsigned_int(42)
-42
->>> rewrap_value_short(42)
-42
->>> rewrap_value_unsigned_short(42)
-42
->>> rewrap_value_long(42)
-42
->>> rewrap_value_unsigned_long(42)
-42
-
-    test unsigned long values which don't fit in a signed long.
-    strip any 'L' characters in case the platform has > 32 bit longs
-        
->>> hex(rewrap_value_unsigned_long(0x80000001L)).replace('L','')
-'0x80000001'
-
->>> rewrap_value_long_long(42)
-42L
->>> rewrap_value_unsigned_long_long(42)
-42L
-
-   show that we have range checking. 
- 
->>> try: rewrap_value_unsigned_short(-42)
-... except OverflowError: pass
-... else: print 'expected an OverflowError!'
-
->>> try: rewrap_value_int(sys.maxint * 2)
-... except OverflowError: pass
-... else: print 'expected an OverflowError!'
-
-
->>> assert abs(rewrap_value_float(4.2) - 4.2) < .000001
->>> rewrap_value_double(4.2) - 4.2
-0.0
->>> rewrap_value_long_double(4.2) - 4.2
-0.0
-
->>> assert abs(rewrap_value_complex_float(4+.2j) - (4+.2j)) < .000001
->>> assert abs(rewrap_value_complex_double(4+.2j) - (4+.2j)) < .000001
->>> assert abs(rewrap_value_complex_long_double(4+.2j) - (4+.2j)) < .000001
-
->>> rewrap_value_cstring('hello, world')
-'hello, world'
->>> rewrap_value_string('yo, wassup?')
-'yo, wassup?'
->>> rewrap_value_wstring(u'yo, wassup?')
-u'yo, wassup?'
-
-    test that overloading on unicode works:
-    
->>> rewrap_value_string(u'yo, wassup?')
-u'yo, wassup?'
-
-   wrap strings with embedded nulls:
-   
->>> rewrap_value_string('yo,\0wassup?')
-'yo,\x00wassup?'
-
->>> rewrap_value_handle(1)
-1
->>> x = 'hi'
->>> assert rewrap_value_handle(x) is x
->>> assert rewrap_value_object(x) is x
-
-  Note that we can currently get a mutable pointer into an immutable
-  Python string:
-  
->>> rewrap_value_mutable_cstring('hello, world')
-'hello, world'
-
->>> rewrap_const_reference_bool(None)
-0
->>> rewrap_const_reference_bool(0)
-0
-
->>> try: rewrap_const_reference_bool('yes')
-... except TypeError: pass
-... else: print 'expected a TypeError exception'
-
->>> rewrap_const_reference_char('x')
-'x'
-
-  Note that there's currently silent truncation of strings passed to
-  char arguments.
-
->>> rewrap_const_reference_char('xy')
-'x'
->>> rewrap_const_reference_signed_char(42)
-42
->>> rewrap_const_reference_unsigned_char(42)
-42
->>> rewrap_const_reference_int(42)
-42
->>> rewrap_const_reference_unsigned_int(42)
-42
->>> rewrap_const_reference_short(42)
-42
->>> rewrap_const_reference_unsigned_short(42)
-42
->>> rewrap_const_reference_long(42)
-42
->>> rewrap_const_reference_unsigned_long(42)
-42
->>> rewrap_const_reference_long_long(42)
-42L
->>> rewrap_const_reference_unsigned_long_long(42)
-42L
-
-
->>> assert abs(rewrap_const_reference_float(4.2) - 4.2) < .000001
->>> rewrap_const_reference_double(4.2) - 4.2
-0.0
->>> rewrap_const_reference_long_double(4.2) - 4.2
-0.0
-
->>> assert abs(rewrap_const_reference_complex_float(4+.2j) - (4+.2j)) < .000001
->>> assert abs(rewrap_const_reference_complex_double(4+.2j) - (4+.2j)) < .000001
->>> assert abs(rewrap_const_reference_complex_long_double(4+.2j) - (4+.2j)) < .000001
-
->>> rewrap_const_reference_cstring('hello, world')
-'hello, world'
->>> rewrap_const_reference_string('yo, wassup?')
-'yo, wassup?'
-
->>> rewrap_const_reference_handle(1)
-1
->>> x = 'hi'
->>> assert rewrap_const_reference_handle(x) is x
->>> assert rewrap_const_reference_object(x) is x
->>> assert rewrap_reference_object(x) is x
-
-
-Check that None <==> NULL
-
->>> rewrap_const_reference_cstring(None)
-
-But None cannot be converted to a string object:
-
->>> try: rewrap_const_reference_string(None)
-... except TypeError: pass
-... else: print 'expected a TypeError exception'
-
-Now check implicit conversions between floating/integer types
-
->>> rewrap_const_reference_float(42)
-42.0
-
->>> rewrap_const_reference_float(42L)
-42.0
-
->>> try: rewrap_const_reference_int(42.0)
-... except TypeError: pass
-... else: print 'expected a TypeError exception'
-
->>> rewrap_value_float(42)
-42.0
-
->>> try: rewrap_value_int(42.0)
-... except TypeError: pass
-... else: print 'expected a TypeError exception'
-
-Check that classic classes also work
-
->>> class FortyTwo:
-...     def __int__(self):
-...         return 42
-...     def __float__(self):
-...         return 42.0
-...     def __complex__(self):
-...         return complex(4+.2j)
-...     def __str__(self):
-...         return '42'
-
->>> try: rewrap_const_reference_float(FortyTwo())
-... except TypeError: pass
-... else: print 'expected a TypeError exception'
-
->>> try: rewrap_value_int(FortyTwo())
-... except TypeError: pass
-... else: print 'expected a TypeError exception'
-
->>> try: rewrap_const_reference_string(FortyTwo())
-... except TypeError: pass
-... else: print 'expected a TypeError exception'
-
->>> try: rewrap_value_complex_double(FortyTwo())
-... except TypeError: pass
-... else: print 'expected a TypeError exception'
-
-# show that arbitrary handle<T> instantiations can be returned
->>> assert get_type(1) is type(1)
-
->>> assert return_null_handle() is None
-"""
-
-def run(args = None):
-    import sys
-    import doctest
-    import builtin_converters
-    
-    if 'rewrap_value_long_long' in dir(builtin_converters):
-        print 'LONG_LONG supported, testing...'
-    else:
-        print 'LONG_LONG not supported, skipping those tests...'
-        
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/test_class.hpp b/test/test_class.hpp
deleted file mode 100644
index 18164102..00000000
--- a/test/test_class.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#ifndef TEST_CLASS_DWA2002326_HPP
-# define TEST_CLASS_DWA2002326_HPP
-# include <cassert>
-
-template <int n = 0>
-struct test_class
-{
-    explicit test_class(int x) : x(x), magic(7654321 + n) { ++counter; }
-    test_class(test_class const& rhs) : x(rhs.x), magic(7654321 + n) { ++counter; }
-    virtual ~test_class() { assert(magic == 7654321 + n); magic = 6666666; x = 9999; --counter; }
-
-    void set(int x) { assert(magic == 7654321 + n); this->x = x; }
-    int value() const { assert(magic == 7654321 + n); return x; }
-    operator int() const { return x; }
-    static int count() { return counter; }
-
-    int x;
-    long magic;
-    static int counter;
-    
- private:
-    void operator=(test_class const&);
-};
-
-template <int n>
-int test_class<n>::counter;
-
-#endif // TEST_CLASS_DWA2002326_HPP
diff --git a/test/test_cltree.py b/test/test_cltree.py
deleted file mode 100644
index 8408f7f2..00000000
--- a/test/test_cltree.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python
-
-from cltree import basic,symbol,constant,variable
-
-b = basic()
-c = constant()
-s = symbol()
-v = variable()
-
-assert isinstance(b,basic)
-assert not isinstance(b,symbol)
-assert not isinstance(b,constant)
-assert not isinstance(b,variable)
-
-assert isinstance(c,basic)
-assert isinstance(c,constant)
-assert not isinstance(c,symbol)
-assert not isinstance(c,variable)
-
-assert not isinstance(s,basic)
-assert isinstance(s,symbol)
-assert not isinstance(s,constant)
-assert not isinstance(s,variable)
-
-assert isinstance(v,basic)
-assert not isinstance(v,symbol)
-assert not isinstance(v,constant)
-assert isinstance(v,variable)
-
-print 'b=',b
-assert repr(b)=='cltree.basic()'
-print 's=',s
-assert repr(s)!='cltree.wrapped_symbol()' # because not isinstance(s,basic)
-print 'c=',c
-assert repr(c)=='cltree.constant()'
-print 'v=',v
-assert repr(v)=='cltree.wrapped_variable()'
-
-
-print 'ok'
diff --git a/test/test_pointer_adoption.cpp b/test/test_pointer_adoption.cpp
deleted file mode 100644
index 6631d8ea..00000000
--- a/test/test_pointer_adoption.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/return_value_policy.hpp>
-#include <boost/python/manage_new_object.hpp>
-#include <boost/python/return_internal_reference.hpp>
-#include <boost/python/class.hpp>
-
-using namespace boost::python;
-
-int a_instances = 0;
-
-int num_a_instances() { return a_instances; }
-
-struct inner
-{
-    inner(std::string const& s)
-        : s(s)
-    {}
-
-    void change(std::string const& new_s)
-    {
-        this->s = new_s;
-    }
-
-    std::string s;
-};
-
-struct Base
-{
-    virtual ~Base() {}
-};
-
-struct A : Base
-{
-    A(std::string const& s)
-        : x(s)
-    {
-        ++a_instances;
-    }
-
-    ~A()
-    {
-        --a_instances;
-    }
-
-    std::string content() const
-    {
-        return x.s;
-    }
-
-    inner& get_inner()
-    {
-        return x;
-    }
-
-    inner x;
-};
-
-struct B
-{
-    B() : x(0) {}
-    B(A* x_) : x(x_) {}
-
-    inner const* adopt(A* x) { this->x = x; return &x->get_inner(); }
-
-    std::string a_content()
-    {
-        return x ? x->content() : std::string("empty");
-    }
-
-    A* x;
-};
-
-
-A* create(std::string const& s)
-{
-    return new A(s);
-}
-
-A* as_A(Base* b)
-{
-    return dynamic_cast<A*>(b);
-}
-
-BOOST_PYTHON_MODULE(test_pointer_adoption_ext)
-{
-    def("num_a_instances", num_a_instances);
-
-        // Specify the manage_new_object return policy to take
-        // ownership of create's result
-    def("create", create, return_value_policy<manage_new_object>());
-
-    def("as_A", as_A, return_internal_reference<>());
-
-    class_<Base>("Base")
-        ;
-
-    class_<A, bases<Base> >("A", no_init)
-        .def("content", &A::content)
-        .def("get_inner", &A::get_inner, return_internal_reference<>())
-        ;
-
-    class_<inner>("inner", no_init)
-        .def("change", &inner::change)
-        ;
-
-    class_<B>("B")
-        .def(init<A*>()[with_custodian_and_ward_postcall<1,2>()])
-
-        .def("adopt", &B::adopt
-             // Adopt returns a pointer referring to a subobject of its 2nd argument (1st being "self")
-             , return_internal_reference<2
-             // Meanwhile, self holds a reference to the 2nd argument.
-             , with_custodian_and_ward<1,2> >()
-            )
-
-         .def("a_content", &B::a_content)
-        ;
-}
-
-#include "module_tail.cpp"
diff --git a/test/test_pointer_adoption.py b/test/test_pointer_adoption.py
deleted file mode 100644
index dfd8b4b0..00000000
--- a/test/test_pointer_adoption.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""
->>> from test_pointer_adoption_ext import *
-
->>> num_a_instances()
-0
-
->>> a = create('dynamically allocated')
->>> num_a_instances()
-1
-
->>> a.content()
-'dynamically allocated'
-
->>> innards = a.get_inner()
->>> innards.change('with an exposed reference')
->>> a.content()
-'with an exposed reference'
-
-# The a instance should be kept alive...
->>> a = None
->>> num_a_instances()
-1
-
-# ...until we're done with its innards
->>> innards = None
->>> num_a_instances()
-0
-
->>> b = B()
->>> a = create('another')
->>> b.a_content()
-'empty'
->>> innards = b.adopt(a);
->>> b.a_content()
-'another'
->>> num_a_instances()
-1
->>> del a # innards and b are both holding a reference
->>> num_a_instances()
-1
->>> innards.change('yet another')
->>> b.a_content()
-'yet another'
-
->>> del innards
->>> num_a_instances() # b still owns a reference to a
-1
->>> del b
->>> num_a_instances()
-0
-
-Test call policies for constructors here
-
->>> a = create('second a')
->>> num_a_instances()
-1
->>> b = B(a)
->>> num_a_instances()
-1
->>> a.content()
-'second a'
-
->>> del a
->>> num_a_instances()
-1
->>> b.a_content()
-'second a'
-
->>> del b
->>> num_a_instances()
-0
-
->>> assert as_A(create('dynalloc')) is not None
->>> base = Base()
->>> assert as_A(base) is None
-"""
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/tuple.cpp b/test/tuple.cpp
deleted file mode 100644
index fce3da85..00000000
--- a/test/tuple.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/tuple.hpp>
-
-using namespace boost::python;
-
-object convert_to_tuple(object data)
-{
-    return tuple(data);
-}
-
-void test_operators(tuple t1, tuple t2, object print)
-{
-    print(t1 + t2);
-}
-
-tuple mktuple0() { return make_tuple(); }
-tuple mktuple1(int x) { return make_tuple(x); }
-tuple mktuple2(char const* a1, int x) { return make_tuple(a1, x); }
-
-BOOST_PYTHON_MODULE(tuple_ext)
-{
-    def("convert_to_tuple",convert_to_tuple);
-    def("test_operators",test_operators);
-    def("make_tuple", mktuple0);
-    def("make_tuple", mktuple1);
-    def("make_tuple", mktuple2);
-}
diff --git a/test/tuple.py b/test/tuple.py
deleted file mode 100644
index acf5a55f..00000000
--- a/test/tuple.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
->>> from tuple_ext import *
->>> def printer(*args):
-...     for x in args: print x,
-...     print
-...
->>> print convert_to_tuple("this is a test string")
-('t', 'h', 'i', 's', ' ', 'i', 's', ' ', 'a', ' ', 't', 'e', 's', 't', ' ', 's', 't', 'r', 'i', 'n', 'g')
->>> t1 = convert_to_tuple("this is")
->>> t2 = (1,2,3,4)
->>> test_operators(t1,t2,printer)
-('t', 'h', 'i', 's', ' ', 'i', 's', 1, 2, 3, 4)
->>> make_tuple()
-()
->>> make_tuple(42)
-(42,)
->>> make_tuple('hello', 42)
-('hello', 42)
-"""
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/test/upcast.cpp b/test/upcast.cpp
deleted file mode 100755
index b02d2534..00000000
--- a/test/upcast.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/cast.hpp>
-
-struct X { long x; };
-struct Y : X, PyObject {};
-
-int main()
-{
-    PyTypeObject o;
-    Y y;
-    assert(&boost::python::upcast<PyObject>(&o)->ob_refcnt == &o.ob_refcnt);
-    assert(&boost::python::upcast<PyObject>(&y)->ob_refcnt == &y.ob_refcnt);
-    return 0;
-}
-
diff --git a/test/vector_indexing_suite.cpp b/test/vector_indexing_suite.cpp
deleted file mode 100644
index 07fc5e91..00000000
--- a/test/vector_indexing_suite.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/implicit.hpp>
-
-using namespace boost::python;
-
-struct X // a container element
-{
-    std::string s;
-    X():s("default") {}
-    X(std::string s):s(s) {}
-    std::string repr() const { return s; }
-    void reset() { s = "reset"; }
-    void foo() { s = "foo"; }
-    bool operator==(X const& x) const { return s == x.s; }
-    bool operator!=(X const& x) const { return s != x.s; }
-};
-
-std::string x_value(X const& x)
-{
-    return "gotya " + x.s;
-}
-
-BOOST_PYTHON_MODULE(vector_indexing_suite_ext)
-{    
-    class_<X>("X")
-        .def(init<>())
-        .def(init<X>())
-        .def(init<std::string>())
-        .def("__repr__", &X::repr)
-        .def("reset", &X::reset)
-        .def("foo", &X::foo)
-    ;
-
-    def("x_value", x_value);
-    implicitly_convertible<std::string, X>();
-    
-    class_<std::vector<X> >("XVec")
-        .def(vector_indexing_suite<std::vector<X> >())
-    ;
-        
-    // Compile check only...
-    class_<std::vector<float> >("FloatVec")
-        .def(vector_indexing_suite<std::vector<float> >())
-    ;
-    
-    // Compile check only...
-    class_<std::vector<bool> >("BoolVec")
-        .def(vector_indexing_suite<std::vector<bool> >())
-    ;
-}
-
diff --git a/test/vector_indexing_suite.py b/test/vector_indexing_suite.py
deleted file mode 100644
index 42dbfdba..00000000
--- a/test/vector_indexing_suite.py
+++ /dev/null
@@ -1,346 +0,0 @@
-'''
-
-#####################################################################
-# Check an object that we will use as container element
-#####################################################################
-
->>> from vector_indexing_suite_ext import *
->>> x = X('hi')
->>> x
-hi
->>> x.reset() # a member function that modifies X
->>> x
-reset
->>> x.foo() # another member function that modifies X
->>> x
-foo
-
-# test that a string is implicitly convertible
-# to an X
->>> x_value('bochi bochi') 
-'gotya bochi bochi'
-
-#####################################################################
-# Iteration
-#####################################################################
->>> def print_xvec(xvec):
-...     s = '[ '
-...     for x in xvec: 
-...         s += repr(x)
-...         s += ' ' 
-...     s += ']'
-...     print s
-
-#####################################################################
-# Replace all the contents using slice syntax
-#####################################################################
-
->>> v = XVec()
->>> v[:] = [X('a'),X('b'),X('c'),X('d'),X('e')]
->>> print_xvec(v)
-[ a b c d e ]
-
-#####################################################################
-# Indexing
-#####################################################################
->>> len(v)
-5
->>> v[0]
-a
->>> v[1]
-b
->>> v[2]
-c
->>> v[3]
-d
->>> v[4]
-e
->>> v[-1]
-e
->>> v[-2]
-d
->>> v[-3]
-c
->>> v[-4]
-b
->>> v[-5]
-a
-
-#####################################################################
-# Deleting an element
-#####################################################################
-
->>> del v[0]
->>> v[0] = 'yaba' # must do implicit conversion
->>> print_xvec(v)
-[ yaba c d e ]
-
-#####################################################################
-# Calling a mutating function of a container element
-#####################################################################
->>> v[3].reset()
->>> v[3]
-reset
-
-#####################################################################
-# Copying a container element
-#####################################################################
->>> x = X(v[3])
->>> x
-reset
->>> x.foo()
->>> x
-foo
->>> v[3] # should not be changed to 'foo'
-reset
-
-#####################################################################
-# Referencing a container element
-#####################################################################
->>> x = v[3]
->>> x
-reset
->>> x.foo()
->>> x
-foo
->>> v[3] # should be changed to 'foo'
-foo
-
-#####################################################################
-# Slice
-#####################################################################
-
->>> sl = v[0:2]
->>> print_xvec(sl)
-[ yaba c ]
->>> sl[0].reset()
->>> sl[0]
-reset
-
-#####################################################################
-# Reset the container again
-#####################################################################
->>> v[:] = ['a','b','c','d','e'] # perform implicit conversion to X
->>> print_xvec(v)
-[ a b c d e ]
-
-#####################################################################
-# Slice: replace [1:3] with an element
-#####################################################################
->>> v[1:3] = X('z')
->>> print_xvec(v)
-[ a z d e ]
-
-#####################################################################
-# Slice: replace [0:2] with a list
-#####################################################################
->>> v[0:2] = ['1','2','3','4'] # perform implicit conversion to X
->>> print_xvec(v)
-[ 1 2 3 4 d e ]
-
-#####################################################################
-# Slice: delete [3:4]
-#####################################################################
->>> del v[3:4]
->>> print_xvec(v)
-[ 1 2 3 d e ]
-
-#####################################################################
-# Slice: set [3:] to a list
-#####################################################################
->>> v[3:] = [X('trailing'), X('stuff')] # a list
->>> print_xvec(v)
-[ 1 2 3 trailing stuff ]
-
-#####################################################################
-# Slice: delete [:3]
-#####################################################################
->>> del v[:3]
->>> print_xvec(v)
-[ trailing stuff ]
-
-#####################################################################
-# Slice: insert a tuple to [0:0] 
-#####################################################################
->>> v[0:0] = ('leading','stuff') # can also be a tuple
->>> print_xvec(v)
-[ leading stuff trailing stuff ]
-
-#####################################################################
-# Reset the container again 
-#####################################################################
->>> v[:] = ['a','b','c','d','e']
-
-#####################################################################
-# Some references to the container elements 
-#####################################################################
->>> z0 = v[0]
->>> z1 = v[1]
->>> z2 = v[2]
->>> z3 = v[3]
->>> z4 = v[4]
-
->>> z0 # proxy
-a
->>> z1 # proxy
-b
->>> z2 # proxy
-c
->>> z3 # proxy
-d
->>> z4 # proxy
-e
-
-#####################################################################
-# Delete a container element 
-#####################################################################
-
->>> del v[2]
->>> print_xvec(v)
-[ a b d e ]
-
-#####################################################################
-# Show that the references are still valid 
-#####################################################################
->>> z0 # proxy
-a
->>> z1 # proxy
-b
->>> z2 # proxy detached
-c
->>> z3 # proxy index adjusted
-d
->>> z4 # proxy index adjusted
-e
-
-#####################################################################
-# Delete all container elements
-#####################################################################
->>> del v[:]
->>> print_xvec(v)
-[ ]
-
-#####################################################################
-# Show that the references are still valid 
-#####################################################################
->>> z0 # proxy detached
-a
->>> z1 # proxy detached
-b
->>> z2 # proxy detached
-c
->>> z3 # proxy detached
-d
->>> z4 # proxy detached
-e
-
-#####################################################################
-# Reset the container again 
-#####################################################################
->>> v[:] = ['a','b','c','d','e']
-
-#####################################################################
-# renew the references to the container elements 
-#####################################################################
->>> z0 = v[0]
->>> z1 = v[1]
->>> z2 = v[2]
->>> z3 = v[3]
->>> z4 = v[4]
-
->>> z0 # proxy
-a
->>> z1 # proxy
-b
->>> z2 # proxy
-c
->>> z3 # proxy
-d
->>> z4 # proxy
-e
-
-#####################################################################
-# Set [2:4] to a list such that there will be more elements 
-#####################################################################
->>> v[2:4] = ['x','y','v']
->>> print_xvec(v)
-[ a b x y v e ]
-
-#####################################################################
-# Show that the references are still valid 
-#####################################################################
->>> z0 # proxy
-a
->>> z1 # proxy
-b
->>> z2 # proxy detached
-c
->>> z3 # proxy detached
-d
->>> z4 # proxy index adjusted
-e
-
-#####################################################################
-# Contains
-#####################################################################
->>> v[:] = ['a','b','c','d','e'] # reset again
-
->>> assert 'a' in v
->>> assert 'b' in v
->>> assert 'c' in v
->>> assert 'd' in v
->>> assert 'e' in v
->>> assert not 'X' in v
->>> assert not 12345 in v
-
-#####################################################################
-# Show that iteration allows mutable access to the elements
-#####################################################################
->>> v[:] = ['a','b','c','d','e'] # reset again
->>> for x in v:
-...     x.reset()
->>> print_xvec(v)
-[ reset reset reset reset reset ]
-
-#####################################################################
-# append
-#####################################################################
->>> v[:] = ['a','b','c','d','e'] # reset again
->>> v.append('f')
->>> print_xvec(v)
-[ a b c d e f ]
-
-#####################################################################
-# extend
-#####################################################################
->>> v[:] = ['a','b','c','d','e'] # reset again
->>> v.extend(['f','g','h','i','j'])
->>> print_xvec(v)
-[ a b c d e f g h i j ]
-
-#####################################################################
-# END.... 
-#####################################################################
-
-'''
-
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-
-if __name__ == '__main__':
-    print 'running...'
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
-
-
-
-
-
diff --git a/test/virtual_functions.cpp b/test/virtual_functions.cpp
deleted file mode 100644
index 3e26708d..00000000
--- a/test/virtual_functions.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright David Abrahams 2002. Permission to copy, use,
-// modify, sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-#include <boost/python/class.hpp>
-#include <boost/python/module.hpp>
-#include <boost/python/def.hpp>
-#include <boost/python/return_internal_reference.hpp>
-#include <boost/python/call_method.hpp>
-#include <boost/ref.hpp>
-#include <boost/utility.hpp>
-
-using namespace boost::python;
-
-struct X
-{
-    explicit X(int x) : x(x), magic(7654321) { ++counter; }
-    X(X const& rhs) : x(rhs.x), magic(7654321) { ++counter; }
-    virtual ~X() { assert(magic == 7654321); magic = 6666666; x = 9999; --counter; }
-
-    void set(int x) { assert(magic == 7654321); this->x = x; }
-    int value() const { assert(magic == 7654321); return x; }
-    static int count() { return counter; }
- private:
-    void operator=(X const&);
- private:
-    int x;
-    long magic;
-    static int counter;
-};
-
-struct Y : X
-{
-    Y(int x) : X(x) {};
-};
-
-struct abstract : X
-{
-    abstract(int x) : X(x) {};
-    int call_f(Y const& y) { return f(y); }
-    virtual int f(Y const& y) = 0;
-    abstract& call_g(Y const& y) { return g(y); }
-    virtual abstract& g(Y const& y) = 0;
-};
-
-struct concrete : X
-{
-    concrete(int x) : X(x) {};
-    int call_f(Y const& y) { return f(y); }
-    virtual int f(Y const& y) { set(y.value()); return y.value(); }
-};
-
-struct abstract_callback : abstract
-{
-    abstract_callback(PyObject* p, int x)
-        : abstract(x), self(p)
-    {}
-
-    int f(Y const& y)
-    {
-        return call_method<int>(self, "f", boost::ref(y));
-    }
-
-    abstract& g(Y const& y)
-    {
-        return call_method<abstract&>(self, "g", boost::ref(y));
-    }
-
-    PyObject* self;
-};
-
-struct concrete_callback : concrete
-{
-    concrete_callback(PyObject* p, int x)
-        : concrete(x), self(p)
-    {}
-
-    concrete_callback(PyObject* p, concrete const& x)
-        : concrete(x), self(p)
-    {}
-
-    int f(Y const& y)
-    {
-        return call_method<int>(self, "f", boost::ref(y));
-    }
-
-    int f_impl(Y const& y)
-    {
-        return this->concrete::f(y);
-    }
-    
-    PyObject* self;
-};
-
-int X::counter;
-
-BOOST_PYTHON_MODULE(virtual_functions_ext)
-{
-    class_<concrete, concrete_callback>("concrete", init<int>())
-        .def("value", &concrete::value)
-        .def("set", &concrete::set)
-        .def("call_f", &concrete::call_f)
-        .def("f", &concrete_callback::f_impl)
-        ;
-        
-    class_<abstract, boost::noncopyable, abstract_callback
-        >("abstract", init<int>())
-            
-        .def("value", &abstract::value)
-        .def("call_f", &abstract::call_f)
-        .def("call_g", &abstract::call_g, return_internal_reference<>())
-        .def("set", &abstract::set)
-        ;
-        
-    class_<Y>("Y", init<int>())
-        .def("value", &Y::value)
-        .def("set", &Y::set)
-        ;
-}
-
-#include "module_tail.cpp"
diff --git a/test/virtual_functions.py b/test/virtual_functions.py
deleted file mode 100644
index 268af45c..00000000
--- a/test/virtual_functions.py
+++ /dev/null
@@ -1,107 +0,0 @@
-'''
->>> from virtual_functions_ext import *
-
->>> class C1(concrete):
-...     def f(self, y):
-...         return concrete.f(self, Y(-y.value()))
-
->>> class C2(concrete):
-...     pass
-
->>> class A1(abstract):
-...     def f(self, y):
-...         return y.value() * 2
-...     def g(self, y):
-...         return self
-
->>> class A2(abstract):
-...     pass
-
-
->>> y1 = Y(16)
->>> y2 = Y(17)
-
-
-
-#
-# Test abstract with f,g overridden
-#
->>> a1 = A1(42)
->>> a1.value()
-42
-
-# Call f,g indirectly from C++
->>> a1.call_f(y1)
-32
->>> assert type(a1.call_g(y1)) is abstract
-
-# Call f directly from Python
->>> a1.f(y2)
-34
-
-#
-# Test abstract with f not overridden
-#
->>> a2 = A2(42)
->>> a2.value()
-42
-
-# Call f indirectly from C++
->>> try: a2.call_f(y1)
-... except AttributeError: pass
-... else: print 'no exception'
-
-# Call f directly from Python
->>> try: a2.call_f(y2)
-... except AttributeError: pass
-... else: print 'no exception'
-
-############# Concrete Tests ############
-
-#
-# Test concrete with f overridden
-#
->>> c1 = C1(42)
->>> c1.value()
-42
-
-# Call f indirectly from C++
->>> c1.call_f(y1)
--16
-
-# Call f directly from Python
->>> c1.f(y2)
--17
-
-#
-# Test concrete with f not overridden
-#
->>> c2 = C2(42)
->>> c2.value()
-42
-
-# Call f indirectly from C++
->>> c2.call_f(y1)
-16
-
-# Call f directly from Python
->>> c2.f(y2)
-17
-
-
-'''
-
-def run(args = None):
-    import sys
-    import doctest
-
-    if args is not None:
-        sys.argv = args
-    return doctest.testmod(sys.modules.get(__name__))
-    
-if __name__ == '__main__':
-    print "running..."
-    import sys
-    status = run()[0]
-    if (status == 0): print "Done."
-    sys.exit(status)
diff --git a/todo.html b/todo.html
deleted file mode 100755
index e7014f8e..00000000
--- a/todo.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.3.0: http://docutils.sourceforge.net/" />
-<title>Boost.Python TODO list Boost</title>
-<link rel="stylesheet" href="../../rst.css" type="text/css" />
-</head>
-<body>
-<div class="document" id="boost-python-todo-list-logo">
-<h1 class="title"><a class="reference" href="index.html">Boost.Python</a> TODO list <a class="reference" href="../../index.htm"><img alt="Boost" src="../../c++boost.gif" /></a></h1>
-<!-- -*- mode: rst -*- -->
-<table class="field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field"><th class="field-name">copyright:</th><td class="field-body">Copyright David Abrahams 2003. See accompanying
-<a class="reference" href="../../LICENSE">license</a> for terms of use.</td>
-</tr>
-</tbody>
-</table>
-<div class="contents topic" id="outline">
-<p class="topic-title"><a name="outline">Outline</a></p>
-<ul class="simple">
-<li><a class="reference" href="#class-support" id="id4" name="id4">Class Support</a><ul>
-<li><a class="reference" href="#base-class-for-virtual-function-callback-wrappers" id="id5" name="id5">Base Class for Virtual Function Callback Wrappers</a></li>
-</ul>
-</li>
-<li><a class="reference" href="#functions" id="id6" name="id6">Functions</a><ul>
-<li><a class="reference" href="#wrapping-function-objects" id="id7" name="id7">Wrapping Function Objects</a></li>
-<li><a class="reference" href="#best-match-overload-resolution" id="id8" name="id8">&quot;Best Match&quot; Overload Resolution</a></li>
-<li><a class="reference" href="#injected-constructors" id="id9" name="id9">Injected Constructors</a></li>
-</ul>
-</li>
-<li><a class="reference" href="#type-converters" id="id10" name="id10">Type Converters</a><ul>
-<li><a class="reference" href="#lvalue-conversions-from-non-const-pytypeobject-s" id="id11" name="id11">Lvalue conversions from non-const <tt class="literal"><span class="pre">PyTypeObject*</span></tt>s</a></li>
-<li><a class="reference" href="#converter-scoping" id="id12" name="id12">Converter Scoping</a></li>
-<li><a class="reference" href="#file-conversions" id="id13" name="id13"><tt class="literal"><span class="pre">FILE*</span> <span class="pre">conversions</span></tt></a></li>
-<li><a class="reference" href="#post-call-actions" id="id14" name="id14">Post-Call Actions</a></li>
-<li><a class="reference" href="#pyunicode-support" id="id15" name="id15"><tt class="literal"><span class="pre">PyUnicode</span></tt> Support</a></li>
-</ul>
-</li>
-<li><a class="reference" href="#documentation" id="id16" name="id16">Documentation</a><ul>
-<li><a class="reference" href="#builtin-converters" id="id17" name="id17">Builtin Converters</a></li>
-<li><a class="reference" href="#internals" id="id18" name="id18">Internals</a></li>
-</ul>
-</li>
-<li><a class="reference" href="#large-scale" id="id19" name="id19">Large Scale</a><ul>
-<li><a class="reference" href="#langbinding" id="id20" name="id20">Langbinding</a></li>
-<li><a class="reference" href="#refactoring-and-reorganization" id="id21" name="id21">Refactoring and Reorganization</a></li>
-<li><a class="reference" href="#numarray-support-enhancements" id="id22" name="id22">NumArray Support Enhancements</a></li>
-<li><a class="reference" href="#pyfinalize-safety" id="id23" name="id23"><tt class="literal"><span class="pre">PyFinalize</span></tt> Safety</a></li>
-</ul>
-</li>
-</ul>
-</div>
-<div class="section" id="class-support">
-<h1><a class="toc-backref" href="#id4" name="class-support">Class Support</a></h1>
-<div class="section" id="base-class-for-virtual-function-callback-wrappers">
-<h2><a class="toc-backref" href="#id5" name="base-class-for-virtual-function-callback-wrappers">Base Class for Virtual Function Callback Wrappers</a></h2>
-<ul class="simple">
-<li><a class="reference" href="http://aspn.activestate.com/ASPN/Mail/Message/c++-sig/1456023">http://aspn.activestate.com/ASPN/Mail/Message/c++-sig/1456023</a>
-(bottom of message)</li>
-<li><a class="reference" href="http://mail.python.org/pipermail/c++-sig/2003-August/005297.html">http://mail.python.org/pipermail/c++-sig/2003-August/005297.html</a>
-(search for <tt class="literal"><span class="pre">VirtualDispatcher</span></tt>) describes how callback classes
-can swap ownership relationship with their Python wrappers.</li>
-</ul>
-</div>
-</div>
-<div class="section" id="functions">
-<h1><a class="toc-backref" href="#id6" name="functions">Functions</a></h1>
-<div class="section" id="wrapping-function-objects">
-<h2><a class="toc-backref" href="#id7" name="wrapping-function-objects">Wrapping Function Objects</a></h2>
-<blockquote>
-<p>It should be possible to wrap classes which support <tt class="literal"><span class="pre">operator()</span></tt>
-as Python methods.</p>
-<p><a class="reference" href="http://mail.python.org/pipermail/c++-sig/2003-August/005184.html">http://mail.python.org/pipermail/c++-sig/2003-August/005184.html</a></p>
-</blockquote>
-</div>
-<div class="section" id="best-match-overload-resolution">
-<h2><a class="toc-backref" href="#id8" name="best-match-overload-resolution">&quot;Best Match&quot; Overload Resolution</a></h2>
-<blockquote>
-<p>Overload resolution currently depends on the order in which <tt class="literal"><span class="pre">def</span></tt>
-calls are made (preferring later overloads).  This should be
-changed so that the best-matching overload is always selected.
-This may await <a class="reference" href="#langbinding">Langbinding</a> integration, since the technology is
-already in <a class="reference" href="http://luabind.sf.net">Luabind</a>.</p>
-</blockquote>
-</div>
-<div class="section" id="injected-constructors">
-<h2><a class="toc-backref" href="#id9" name="injected-constructors">Injected Constructors</a></h2>
-<blockquote>
-<p>Enabling the addition of new constructor functors or factory
-constructors which aren't in the underlying C++ interface.
-Interface still to be decided.  Here is a discussion of it:</p>
-<blockquote>
-<a class="reference" href="http://aspn.activestate.com/ASPN/Mail/Message/1744280">http://aspn.activestate.com/ASPN/Mail/Message/1744280</a></blockquote>
-<p>However, I'm pretty sure we can't use the init&lt;&gt;(f) interface here
-because it will have to instantiate the code for the wrapped
-class' default constructor, which may not exist.</p>
-</blockquote>
-</div>
-</div>
-<div class="section" id="type-converters">
-<h1><a class="toc-backref" href="#id10" name="type-converters">Type Converters</a></h1>
-<div class="section" id="lvalue-conversions-from-non-const-pytypeobject-s">
-<h2><a class="toc-backref" href="#id11" name="lvalue-conversions-from-non-const-pytypeobject-s">Lvalue conversions from non-const <tt class="literal"><span class="pre">PyTypeObject*</span></tt>s</a></h2>
-<blockquote>
-<a class="reference" href="http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1662717">http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1662717</a></blockquote>
-</div>
-<div class="section" id="converter-scoping">
-<h2><a class="toc-backref" href="#id12" name="converter-scoping">Converter Scoping</a></h2>
-<blockquote>
-<p><a class="reference" href="http://article.gmane.org/gmane.comp.python.c++/2044">http://article.gmane.org/gmane.comp.python.c++/2044</a></p>
-<p>If this gets done at all, it is going to happen in conjunction
-with <a class="reference" href="#langbinding">Luabind integration</a>.</p>
-</blockquote>
-</div>
-<div class="section" id="file-conversions">
-<h2><a class="toc-backref" href="#id13" name="file-conversions"><tt class="literal"><span class="pre">FILE*</span> <span class="pre">conversions</span></tt></a></h2>
-<blockquote>
-<a class="reference" href="http://aspn.activestate.com/ASPN/Mail/Message/1411366">http://aspn.activestate.com/ASPN/Mail/Message/1411366</a></blockquote>
-</div>
-<div class="section" id="post-call-actions">
-<h2><a class="toc-backref" href="#id14" name="post-call-actions">Post-Call Actions</a></h2>
-<blockquote>
-From-Python converters should be passed an extra reference to a
-chain of post-call actions in the Policies object, where they can
-register an additional action.  See the end of
-<a class="reference" href="http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1755435">http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1755435</a></blockquote>
-</div>
-<div class="section" id="pyunicode-support">
-<h2><a class="toc-backref" href="#id15" name="pyunicode-support"><tt class="literal"><span class="pre">PyUnicode</span></tt> Support</a></h2>
-<blockquote>
-<p>Review and possibly incorporate changes from <a class="reference" href="mailto:qinlj-at-solidshare.com">Lijun Qin</a> at
-<a class="reference" href="http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1771145">http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1771145</a></p>
-</blockquote>
-</div>
-</div>
-<div class="section" id="documentation">
-<h1><a class="toc-backref" href="#id16" name="documentation">Documentation</a></h1>
-<div class="section" id="builtin-converters">
-<h2><a class="toc-backref" href="#id17" name="builtin-converters">Builtin Converters</a></h2>
-<blockquote>
-Builtin correspondences between builtiin Python types and C++
-types need to be documented</blockquote>
-</div>
-<div class="section" id="internals">
-<h2><a class="toc-backref" href="#id18" name="internals">Internals</a></h2>
-<blockquote>
-<p>The structure of the framework needs to get documented; <a class="reference" href="mailto:brett.calcott-at-paradise.net.nz">Brett
-Calcott</a> has promised to turn <a class="reference" href="doc/internals.html">this document</a> into something fit
-for users</p>
-</blockquote>
-</div>
-</div>
-<div class="section" id="large-scale">
-<h1><a class="toc-backref" href="#id19" name="large-scale">Large Scale</a></h1>
-<div class="section" id="langbinding">
-<h2><a class="toc-backref" href="#id20" name="langbinding">Langbinding</a></h2>
-<blockquote>
-This project to generalizes Boost.Python to work for other
-languages, initially Lua.  See discussions at
-<a class="reference" href="http://lists.sourceforge.net/lists/listinfo/boost-langbinding">http://lists.sourceforge.net/lists/listinfo/boost-langbinding</a></blockquote>
-</div>
-<div class="section" id="refactoring-and-reorganization">
-<h2><a class="toc-backref" href="#id21" name="refactoring-and-reorganization">Refactoring and Reorganization</a></h2>
-<blockquote>
-<a class="reference" href="http://aspn.activestate.com/ASPN/Mail/Message/c++-sig/1673338">http://aspn.activestate.com/ASPN/Mail/Message/c++-sig/1673338</a></blockquote>
-</div>
-<div class="section" id="numarray-support-enhancements">
-<h2><a class="toc-backref" href="#id22" name="numarray-support-enhancements">NumArray Support Enhancements</a></h2>
-<blockquote>
-Consider integrating the enhancements described in
-<a class="reference" href="http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1757092">http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1757092</a></blockquote>
-</div>
-<div class="section" id="pyfinalize-safety">
-<h2><a class="toc-backref" href="#id23" name="pyfinalize-safety"><tt class="literal"><span class="pre">PyFinalize</span></tt> Safety</a></h2>
-<blockquote>
-<p>Currently Boost.Python has several global (or function-static)
-objects whose existence keeps reference counts from dropping to
-zero until the Boost.Python shared object is unloaded.  This can
-cause a crash because when the reference counts <em>do</em> go to zero,
-there's no interpreter.  In order to make it safe to call
-<tt class="literal"><span class="pre">PyFinalize()</span></tt> we must register an <tt class="literal"><span class="pre">atexit</span></tt> routine which
-destroys these objects and releases all Python reference counts
-so that Python can clean them up while there's still an
-interpreter.  <a class="reference" href="mailto:dirk-at-gerrits.homeip.net">Dirk Gerrits</a> has promised to do this job.</p>
-</blockquote>
-</div>
-</div>
-</div>
-<hr class="footer"/>
-<div class="footer">
-<a class="reference" href="todo.txt">View document source</a>.
-Generated on: 2003-09-11 11:04 UTC.
-Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
-</div>
-</body>
-</html>
diff --git a/todo.txt b/todo.txt
deleted file mode 100644
index c4d39192..00000000
--- a/todo.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-.. -*- mode: rst -*-
-
-====================================
- Boost.Python_ TODO list |(logo)|__
-====================================
-
-.. |(logo)| image:: ../../c++boost.gif
-   :alt: Boost
-
-__ ../../index.htm
-
-.. _`Boost.Python`: index.html
-
-:copyright: Copyright David Abrahams 2003. See accompanying
-            license_ for terms of use.
-
-.. contents:: Outline
-
-.. _license: ../../LICENSE
-
-Class Support
-=============
-
-Base Class for Virtual Function Callback Wrappers
--------------------------------------------------
-
-* http://aspn.activestate.com/ASPN/Mail/Message/c++-sig/1456023
-  (bottom of message)
-
-* http://mail.python.org/pipermail/c++-sig/2003-August/005297.html
-  (search for ``VirtualDispatcher``) describes how callback classes
-  can swap ownership relationship with their Python wrappers.
-
-
-
-Functions
-=========
-
-Wrapping Function Objects
---------------------------
-
-  It should be possible to wrap classes which support ``operator()``
-  as Python methods.
-
-  http://mail.python.org/pipermail/c++-sig/2003-August/005184.html
-
-
-"Best Match" Overload Resolution
---------------------------------
-
-  Overload resolution currently depends on the order in which ``def``
-  calls are made (preferring later overloads).  This should be
-  changed so that the best-matching overload is always selected.
-  This may await Langbinding_ integration, since the technology is
-  already in Luabind_.
-
-  .. _Luabind: http://luabind.sf.net
-
-Injected Constructors
----------------------
-
-  Enabling the addition of new constructor functors or factory
-  constructors which aren't in the underlying C++ interface.
-  Interface still to be decided.  Here is a discussion of it:
-
-    http://aspn.activestate.com/ASPN/Mail/Message/1744280
-
-  However, I'm pretty sure we can't use the init<>(f) interface here
-  because it will have to instantiate the code for the wrapped
-  class' default constructor, which may not exist.
-
-
-
-Type Converters
-===============
-
-Lvalue conversions from non-const ``PyTypeObject*``\ s
-------------------------------------------------------
-
-  http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1662717
-
-Converter Scoping
------------------
-
-  http://article.gmane.org/gmane.comp.python.c++/2044
-
-  If this gets done at all, it is going to happen in conjunction
-  with `Luabind integration`__.
-
-  __ Langbinding_
-
-``FILE* conversions``
----------------------
-
-  http://aspn.activestate.com/ASPN/Mail/Message/1411366
-
-Post-Call Actions
------------------
-
-  From-Python converters should be passed an extra reference to a
-  chain of post-call actions in the Policies object, where they can
-  register an additional action.  See the end of
-  http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1755435
-
-``PyUnicode`` Support
----------------------
-
-  Review and possibly incorporate changes from `Lijun Qin`_ at
-  http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1771145
-
-  .. _`Lijun Qin`: mailto:qinlj-at-solidshare.com
-
-Documentation
-=============
-
-Builtin Converters
-------------------
-
-  Builtin correspondences between builtiin Python types and C++
-  types need to be documented
-
-Internals
----------
-
-  The structure of the framework needs to get documented; `Brett
-  Calcott`_ has promised to turn `this document`__ into something fit
-  for users
-
-  __ doc/internals.html
-
-  .. _`Brett Calcott`: mailto:brett.calcott-at-paradise.net.nz
-
-
-Large Scale
-===========
-
-Langbinding
------------
-
-  This project to generalizes Boost.Python to work for other
-  languages, initially Lua.  See discussions at
-  http://lists.sourceforge.net/lists/listinfo/boost-langbinding
-
-Refactoring and Reorganization
-------------------------------
-
-  http://aspn.activestate.com/ASPN/Mail/Message/c++-sig/1673338
-
-NumArray Support Enhancements
------------------------------
-
-  Consider integrating the enhancements described in
-  http://aspn.activestate.com/ASPN/Mail/Message/C++-sig/1757092
-
-``PyFinalize`` Safety
----------------------
-
-  Currently Boost.Python has several global (or function-static)
-  objects whose existence keeps reference counts from dropping to
-  zero until the Boost.Python shared object is unloaded.  This can
-  cause a crash because when the reference counts *do* go to zero,
-  there's no interpreter.  In order to make it safe to call
-  ``PyFinalize()`` we must register an ``atexit`` routine which
-  destroys these objects and releases all Python reference counts
-  so that Python can clean them up while there's still an
-  interpreter.  `Dirk Gerrits`_ has promised to do this job.
-
-  .. _`Dirk Gerrits`: mailto:dirk-at-gerrits.homeip.net
-