matplotlib · Feb 20, 2011 · Jun 10, 2010 · Jun 10, 2010 · Jun 10, 2010 · Jun 10, 2010
diff --git a/CHANGELOG b/CHANGELOG
diff --git a/CXX/Config.hxx b/CXX/Config.hxx
@@ -34,101 +34,10 @@
 // DAMAGE.
 //
 //-----------------------------------------------------------------------------
+#include "CXX/WrapPython.h"
 
-#ifndef __PyCXX_config_hh__
-#define __PyCXX_config_hh__
-
-//
-// Microsoft VC++ 6.0 has no traits
-//
-#if defined( _MSC_VER )
-
-#  define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1
-
-#elif defined( __GNUC__ )
-#  if __GNUC__ >= 3
-#    define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1
-#  else
-#    define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0
-#endif
-
-//
-//	Assume all other compilers do
-//
-#else
-
-// Macros to deal with deficiencies in compilers
-#  define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 1
-#endif
-
-#if STANDARD_LIBRARY_HAS_ITERATOR_TRAITS
-#  define random_access_iterator_parent(itemtype) std::iterator<std::random_access_iterator_tag,itemtype,int>
+#if PY_MAJOR_VERSION == 2
+#include "CXX/Python2/Config.hxx"
 #else
-#  define random_access_iterator_parent(itemtype) std::random_access_iterator<itemtype, int>
+#include "CXX/Python3/Config.hxx"
 #endif
-
-//
-//	Which C++ standard is in use?
-//
-#if defined( _MSC_VER )
-#  if _MSC_VER <= 1200
-// MSVC++ 6.0
-#    define PYCXX_ISO_CPP_LIB 0
-#    define STR_STREAM <strstream>
-#    define TEMPLATE_TYPENAME class
-#  else
-#    define PYCXX_ISO_CPP_LIB 1
-#    define STR_STREAM <sstream>
-#    define TEMPLATE_TYPENAME typename
-#  endif
-#elif defined( __GNUC__ )
-#  if __GNUC__ >= 3
-#    define PYCXX_ISO_CPP_LIB 1
-#    define STR_STREAM <sstream>
-#    define TEMPLATE_TYPENAME typename
-#  else
-#    define PYCXX_ISO_CPP_LIB 0
-#    define STR_STREAM <strstream>
-#    define TEMPLATE_TYPENAME class
-#  endif
-#endif
-
-#if PYCXX_ISO_CPP_LIB
-#    define STR_STREAM <sstream>
-#    define OSTRSTREAM ostringstream
-#    define EXPLICIT_TYPENAME typename
-#    define EXPLICIT_CLASS class
-#    define TEMPLATE_TYPENAME typename
-#else
-#    define STR_STREAM <strstream>
-#    define OSTRSTREAM ostrstream
-#    define EXPLICIT_TYPENAME
-#    define EXPLICIT_CLASS
-#    define TEMPLATE_TYPENAME class
-#endif
-
-// before 2.5 Py_ssize_t was missing
-#ifndef PY_MAJOR_VERSION
-#error not defined PY_MAJOR_VERSION
-#endif
-#if PY_MAJOR_VERSION < 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5)
-typedef int Py_ssize_t;
-#endif
-
-// hash_map container usage selection
-// 1) if PYCXX_USING_STD_MAP is defined PyCXX will be using std::map<> container
-//    implementation only.
-// 2) if compilers are used other than MS Visual Studio (7.1+) or GCC 3.x
-//    STANDARD_LIBRARY_HAS_HASH_MAP must be defined before compilation to
-//    make PyCXX using hash_map container.
-#if !defined( PYCXX_USING_STD_MAP )
-  #if defined( _MSC_VER ) || defined( __INTEL_COMPILER ) || defined ( __ICC ) || (defined( __GNUC__ ) && ( __GNUC__ > 3 ))
-  #  define PYCXX_USING_HASH_MAP
-  #else
-  #  if defined( STANDARD_LIBRARY_HAS_HASH_MAP ) && !defined( PYCXX_USING_HASH_MAP )
-  #     define PYCXX_USING_HASH_MAP
-  #  endif
-  #endif
-#endif
-
-#endif //  __PyCXX_config_hh__
diff --git a/CXX/Exception.hxx b/CXX/Exception.hxx
@@ -34,216 +34,10 @@
 // DAMAGE.
 //
 //-----------------------------------------------------------------------------
-
-#ifndef __CXX_Exception_h
-#define __CXX_Exception_h
-
 #include "CXX/WrapPython.h"
-#include "CXX/Version.hxx"
-#include "CXX/Config.hxx"
-#include "CXX/IndirectPythonInterface.hxx"
-
-#include <string>
-#include <iostream>
-
-// This mimics the Python structure, in order to minimize confusion
-namespace Py
-{
-    class ExtensionExceptionType;
-
-    class Object;
-
-    class Exception
-    {
-    public:
-        Exception( ExtensionExceptionType &exception, const std::string& reason );
-        Exception( ExtensionExceptionType &exception, Object &reason );
-
-        explicit Exception ()
-        {}
-
-        Exception (const std::string& reason)
-        {
-            PyErr_SetString (Py::_Exc_RuntimeError(), reason.c_str());
-        }
-
-        Exception (PyObject* exception, const std::string& reason)
-        {
-            PyErr_SetString (exception, reason.c_str());
-        }
-
-        Exception (PyObject* exception, Object &reason);        
-
-        void clear() // clear the error
-        // technically but not philosophically const
-        {
-            PyErr_Clear();
-        }
-    };
-
-
-    // Abstract
-    class StandardError: public Exception
-    {
-    protected: 
-        explicit StandardError()
-        {}
-    };
-
-    class LookupError: public StandardError
-    {
-    protected: 
-        explicit LookupError()
-        {}
-    };
-
-    class ArithmeticError: public StandardError
-    {
-    protected: 
-        explicit ArithmeticError()
-        {}
-    };
-
-    class EnvironmentError: public StandardError
-    {
-    protected: 
-        explicit EnvironmentError()
-        {}
-    };
-
-    // Concrete
-
-    class TypeError: public StandardError
-    {
-    public:
-        TypeError (const std::string& reason)
-            : StandardError()
-        {
-            PyErr_SetString (Py::_Exc_TypeError(),reason.c_str());
-        }
-    };
-
-    class IndexError: public LookupError
-    {
-    public:
-        IndexError (const std::string& reason)
-            : LookupError()
-        {
-            PyErr_SetString (Py::_Exc_IndexError(), reason.c_str());
-        }
-    };
-
-    class AttributeError: public StandardError
-    {
-    public:
-        AttributeError (const std::string& reason)
-            : StandardError()
-        {
-            PyErr_SetString (Py::_Exc_AttributeError(), reason.c_str());
-        }        
-    };
-
-    class NameError: public StandardError
-    {
-    public:
-        NameError (const std::string& reason)
-            : StandardError()
-        {
-            PyErr_SetString (Py::_Exc_NameError(), reason.c_str());
-        }
-    };
-
-    class RuntimeError: public StandardError
-    {
-    public:
-        RuntimeError (const std::string& reason)
-            : StandardError()
-        {
-            PyErr_SetString (Py::_Exc_RuntimeError(), reason.c_str());
-        }
-    };
-
-    class SystemError: public StandardError
-    {
-    public:
-        SystemError (const std::string& reason)
-            : StandardError()
-        {
-            PyErr_SetString (Py::_Exc_SystemError(),reason.c_str());
-        }
-    };
-
-    class KeyError: public LookupError
-    {
-    public:
-        KeyError (const std::string& reason)
-            : LookupError()
-        {
-            PyErr_SetString (Py::_Exc_KeyError(),reason.c_str());
-        }
-    };
-
-
-    class ValueError: public StandardError
-    {
-    public:
-        ValueError (const std::string& reason)
-            : StandardError()
-        {
-            PyErr_SetString (Py::_Exc_ValueError(), reason.c_str());
-        }
-    };
-
-    class OverflowError: public ArithmeticError
-    {
-    public:
-        OverflowError (const std::string& reason)
-            : ArithmeticError()
-        {
-            PyErr_SetString (Py::_Exc_OverflowError(), reason.c_str());
-        }        
-    };
-
-    class ZeroDivisionError: public ArithmeticError
-    {
-    public:
-        ZeroDivisionError (const std::string& reason)
-            : ArithmeticError() 
-        {
-            PyErr_SetString (Py::_Exc_ZeroDivisionError(), reason.c_str());
-        }
-    };
-
-    class FloatingPointError: public ArithmeticError
-    {
-    public:
-        FloatingPointError (const std::string& reason)
-            : ArithmeticError() 
-        {
-            PyErr_SetString (Py::_Exc_FloatingPointError(), reason.c_str());
-        }
-    };
-
-    class MemoryError: public StandardError
-    {
-    public:
-        MemoryError (const std::string& reason)
-            : StandardError()
-        {
-            PyErr_SetString (Py::_Exc_MemoryError(), reason.c_str());
-        }    
-    };
-
-    class SystemExit: public StandardError
-    {
-    public:
-        SystemExit (const std::string& reason)
-            : StandardError() 
-        {
-            PyErr_SetString (Py::_Exc_SystemExit(),reason.c_str());
-        }
-    };
-
-}// Py
 
+#if PY_MAJOR_VERSION == 2
+#include "CXX/Python2/Exception.hxx"
+#else
+#include "CXX/Python3/Exception.hxx"
 #endif