Merge pull request #1345 from johnhaddon/python2Begone

Remove Python 2 support

Author: johnhaddon

Changes

@@ -4,6 +4,7 @@
 Breaking Changes
 ----------------
 
+- Python : Removed support for Python 2.
 - Primitive : Changed `variableIndexedView()` return type from `boost::optional` to `std::optional`.
 
 10.4.x.x (relative to 10.4.7.0)

config/ie/options

@@ -62,7 +62,6 @@ platform = IEEnv.platform()
 compiler = getOption( "COMPILER", None )
 compilerVersion = getOption( "COMPILER_VERSION", None )
 pythonVersion = getOption( "PYTHON_VERSION", None )
-sixVersion = getOption( "SIX_VERSION", "1.14.0" )
 targetApp = getOption( "APP", None )
 
 
@@ -232,10 +231,7 @@ else :
 	openEXRPythonModuleDir = os.path.join( "/software", "apps", "openexr", openEXRVersion, platform, compiler, compilerVersion, "python", pythonVersion, "boost", boostVersion, "lib", "python" + pythonVersion, "site-packages" )
 	openEXRPythonLibDir = os.path.join( "/software", "apps", "openexr", openEXRVersion, platform, compiler, compilerVersion, "python", pythonVersion, "boost", boostVersion, "lib64" )
 
-PYTHONPATH = ":".join( [
-	os.path.join( "/software", "apps", "six", sixVersion ),
-	openEXRPythonModuleDir,
-] )
+PYTHONPATH = openEXRPythonModuleDir
 
 # get the installation locations right
 INSTALL_PREFIX = getOption( "INSTALL_PREFIX", os.path.expanduser( "~" ) )

contrib/IECoreAlembic/test/IECoreAlembic/AlembicSceneTest.py

@@ -38,7 +38,6 @@
 import imath
 import tempfile
 import threading
-import six
 import threading
 import time
 
@@ -78,7 +77,7 @@ def testConstruction( self ) :
 
 	def testNonexistentFile( self ) :
 
-		six.assertRaisesRegex( self, RuntimeError, "Unable to open file", IECoreScene.SceneInterface.create, "noExisty.abc", IECore.IndexedIO.OpenMode.Read )
+		self.assertRaisesRegex( RuntimeError, "Unable to open file", IECoreScene.SceneInterface.create, "noExisty.abc", IECore.IndexedIO.OpenMode.Read )
 
 	def testHierarchy( self ) :
 
@@ -351,8 +350,8 @@ def testMissingArchiveBounds( self ) :
 
 		a = IECoreScene.SceneInterface.create( os.path.join( os.path.dirname( __file__ ), "data", "noTopLevelStoredBounds.abc" ), IECore.IndexedIO.OpenMode.Read )
 		self.assertFalse( a.hasBound() )
-		six.assertRaisesRegex( self, IECore.Exception, "No stored bounds available", a.boundSampleTime, 0 )
-		six.assertRaisesRegex( self, IECore.Exception, "No stored bounds available", a.readBoundAtSample, 0 )
+		self.assertRaisesRegex( IECore.Exception, "No stored bounds available", a.boundSampleTime, 0 )
+		self.assertRaisesRegex( IECore.Exception, "No stored bounds available", a.readBoundAtSample, 0 )
 
 	def testSampleInterval( self ) :
 

include/IECorePython/UnicodeToStringBinding.h

@@ -36,7 +36,6 @@
 
 import os
 import re
-import six
 
 ## Implements a Preset to permit values to be saved and restored
 ## from a Parameterised object. BasicPresets can be created either
@@ -93,7 +92,7 @@ def __init__( self, pathOrDataOrParameterised, rootParameter=None, parameters=()
 			]
 		)
 
-		if isinstance( pathOrDataOrParameterised, six.string_types ) :
+		if isinstance( pathOrDataOrParameterised, str ) :
 
 			self._cob = pathOrDataOrParameterised
 

python/IECore/BasicPreset.py

@@ -38,12 +38,7 @@
 import os.path
 import threading
 from fnmatch import fnmatch
-
-import six
-if six.PY3 :
-	import importlib.util
-else :
-	import imp
+import importlib.util
 
 from IECore import Msg, msg, SearchPath, warning
 
@@ -163,13 +158,9 @@ def load( self, name, version = None ) :
 
 			moduleName = "IECoreClassLoader" + name.replace( ".", "_" ) + str( version )
 
-			if six.PY3 :
-				spec = importlib.util.spec_from_file_location( moduleName, fileName )
-				module = importlib.util.module_from_spec( spec )
-				spec.loader.exec_module( module )
-			else :
-				with open( fileName, "r" ) as fileForLoad :
-					module = imp.load_module( moduleName, fileForLoad, fileName, ( ".py", "r", imp.PY_SOURCE ) )
+			spec = importlib.util.spec_from_file_location( moduleName, fileName )
+			module = importlib.util.module_from_spec( spec )
+			spec.loader.exec_module( module )
 
 			if not getattr( module, nameTail, None ) :
 				raise IOError( "File \"%s\" does not define a class named \"%s\"." % ( fileName, nameTail ) )

python/IECore/ClassLoader.py

@@ -32,8 +32,6 @@
 #
 ##########################################################################
 
-import six
-
 import IECore
 
 ## The ClassVectorParameter is similar to the ClassParameter but instead of holding
@@ -121,7 +119,7 @@ def setClasses( self, classes ) :
 	# form ( classInstance, className, classVersion ).
 	def getClass( self, parameterOrParameterName, withClassLoaderArgs=False ) :
 
-		if isinstance( parameterOrParameterName, six.string_types ) :
+		if isinstance( parameterOrParameterName, str ) :
 			parameterName = parameterOrParameterName
 		else :
 			parameterName = parameterOrParameterName.name
@@ -137,7 +135,7 @@ def getClass( self, parameterOrParameterName, withClassLoaderArgs=False ) :
 	# and setClasses().
 	def setClass( self, parameterOrParameterName, className, classVersion ) :
 
-		if isinstance( parameterOrParameterName, six.string_types ) :
+		if isinstance( parameterOrParameterName, str ) :
 			parameterName = parameterOrParameterName
 			parameter = self.parameter( parameterOrParameterName )
 			if not parameter :

python/IECore/ClassVectorParameter.py

@@ -36,7 +36,6 @@
 import os
 import os.path
 import sys
-import six
 import traceback
 import IECore
 
@@ -48,7 +47,7 @@
 # \ingroup python
 def loadConfig( searchPaths, contextDict = {}, raiseExceptions = False, subdirectory = "" ) :
 
-	if isinstance( searchPaths, six.string_types ) :
+	if isinstance( searchPaths, str ) :
 		searchPaths = IECore.SearchPath( os.environ.get( searchPaths, "" ) )
 
 	paths = searchPaths.paths
@@ -74,7 +73,7 @@ def loadConfig( searchPaths, contextDict = {}, raiseExceptions = False, subdirec
 
 				try :
 					with open( fullFileName ) as f :
-						six.exec_(
+						exec(
 							compile( f.read(), fullFileName, "exec" ),
 							fileContextDict, fileContextDict
 						)

python/IECore/ConfigLoader.py

@@ -32,7 +32,6 @@
 #
 ##########################################################################
 
-import six
 import string
 import datetime
 import imath
@@ -55,7 +54,7 @@ def isSimpleDataType(obj):
 		if info is None:
 			return False
 		# check if the element type a basic python type.
-		if info[0] in ( bool, float, str ) + six.integer_types :
+		if info[0] in ( bool, float, str, int ) :
 			return True
 	return False
 
@@ -72,7 +71,7 @@ def isSimpleNumericDataType(obj):
 		if info is None:
 			return False
 		# check if the element type a basic python type.
-		if info[0] in ( float, ) + six.integer_types :
+		if info[0] in ( float, int ) :
 			return True
 	return False
 

python/IECore/DataTraits.py

@@ -38,17 +38,17 @@
 #
 # \ingroup python
 
-import six
-from six.moves.urllib.parse import quote, unquote
+from urllib.parse import quote, unquote
 import shlex
+import functools
 
 ## Returns a new string which is the old string with word wrapping
 # performed so that no lines are longer than width.
 def wrap( text, width ) :
 
 	# i got this off the internet. i suspect it might not be very fast
 	# for a lot of text.
-	return six.moves.reduce(lambda line, word, width=width: '%s%s%s' %
+	return functools.reduce(lambda line, word, width=width: '%s%s%s' %
                   (line,
                    ' \n'[(len(line)-line.rfind('\n')-1
                          + len(word.split('\n',1)[0]