IECorePython : Remove Python 2 support

Author: johnhaddon

include/IECorePython/UnicodeToStringBinding.h

@@ -61,11 +61,7 @@ struct InternedStringFromPython
 
 	static void *convertible( PyObject *obj_ptr )
 	{
-#if PY_MAJOR_VERSION >= 3
 		if ( !PyUnicode_Check( obj_ptr ) )
-#else
-		if ( !PyString_Check( obj_ptr ) )
-#endif
 		{
 			return nullptr;
 		}
@@ -79,14 +75,9 @@ struct InternedStringFromPython
 		assert( obj_ptr );
 
 		void* storage = (( converter::rvalue_from_python_storage<InternedString>* ) data )->storage.bytes;
-#if PY_MAJOR_VERSION >= 3
 		Py_ssize_t size;
 		const char *c = PyUnicode_AsUTF8AndSize( obj_ptr, &size );
 		new( storage ) InternedString( c, size );
-#else
-		assert( PyString_Check( obj_ptr ) );
-		new( storage ) InternedString( PyString_AsString( obj_ptr ) );
-#endif
 		data->convertible = storage;
 	}
 };

src/IECorePython/InternedStringBinding.cpp

@@ -36,8 +36,6 @@
 
 #include "boost/python.hpp"
 
-#include "patchlevel.h" // For PY_MAJOR_VERSION
-
 #include "IECorePython/SimpleTypedDataBinding.h"
 
 #include "IECorePython/GeometricTypedDataBinding.h"
@@ -317,12 +315,6 @@ static void bindNumericMethods( RunTimeTypedClass<T> &c )
 void bindAllSimpleTypedData()
 {
 
-#if PY_MAJOR_VERSION > 2
-	const char *longOperatorName = "__int__";
-#else
-	const char *longOperatorName = "__long__";
-#endif
-
 	RunTimeTypedClass<StringData> sdc = bindSimpleData<StringData>();
 	sdc.def( "__lt__", &lessThan<StringData> );
 	sdc.def( "__le__", &lessThanOrEqualTo<StringData> );
@@ -339,7 +331,7 @@ void bindAllSimpleTypedData()
 
 	RunTimeTypedClass<UIntData> uidc = bindSimpleData<UIntData>();
 	bindNumericMethods( uidc );
-	uidc.def( longOperatorName, &getValue<UIntData> );
+	uidc.def( "__int__", &getValue<UIntData> );
 
 	RunTimeTypedClass<FloatData > fdc = bindSimpleData<FloatData>();
 	bindNumericMethods( fdc );
@@ -371,11 +363,11 @@ void bindAllSimpleTypedData()
 
 	RunTimeTypedClass<Int64Data> i64dc = bindSimpleData<Int64Data>();
 	bindNumericMethods( i64dc );
-	i64dc.def( longOperatorName, &getValue<Int64Data> );
+	i64dc.def( "__int__", &getValue<Int64Data> );
 
 	RunTimeTypedClass<UInt64Data> ui64dc = bindSimpleData<UInt64Data>();
 	bindNumericMethods( ui64dc );
-	ui64dc.def( longOperatorName, &getValue<UInt64Data> );
+	ui64dc.def( "__int__", &getValue<UInt64Data> );
 
 	bindSimpleData<Color3fData>();
 	bindSimpleData<Color4fData>();

src/IECorePython/SimpleTypedDataBinding.cpp

@@ -110,7 +110,6 @@
 #include "IECorePython/BezierAlgoBinding.h"
 #include "IECorePython/ToCoreConverterBinding.h"
 #include "IECorePython/PolygonAlgoBinding.h"
-#include "IECorePython/UnicodeToStringBinding.h"
 #include "IECorePython/RadixSortBinding.h"
 #include "IECorePython/AngleConversionBinding.h"
 #include "IECorePython/SplineBinding.h"
@@ -259,7 +258,6 @@ BOOST_PYTHON_MODULE(_IECore)
 	bindBezierAlgo();
 	bindToCoreConverter();
 	bindPolygonAlgo();
-	bindUnicodeToString();
 	bindRadixSort();
 	bindAngleConversion();
 	bindSpline();