Merge pull request #6842 from ivanimanishi/deprecationFixes

Replace deprecated distutils with modern alternatives

Author: johnhaddon

Changes.md

@@ -1,6 +1,10 @@
 1.6.x.x (relative to 1.6.14.0)
 =======
 
+Fixes
+-----
+
+- SConstruct, ShowURL, ArnoldtextureBake : Replaced deprecated distutils with modern alternatives.
 
 
 1.6.14.0 (relative to 1.6.13.0)

SConstruct

@@ -46,7 +46,6 @@ import locale
 import shutil
 import subprocess
 import tempfile
-import distutils.dir_util
 import codecs
 
 EnsureSConsVersion( 3, 0, 2 ) # Substfile is a default builder as of 3.0.2
@@ -2438,7 +2437,7 @@ for f in exampleFiles :
 
 def installer( target, source, env ) :
 
-	distutils.dir_util.copy_tree( str( source[0] ), str( target[0] ), preserve_symlinks=True, update=True )
+	shutil.copytree( str( source[0] ), str( target[0] ), symlinks=True, dirs_exist_ok=True )
 
 if env.subst( "$PACKAGE_FILE" ).endswith( ".dmg" ) :
 

python/GafferArnold/ArnoldTextureBake.py

@@ -405,10 +405,9 @@ def __init__( self, name = "ArnoldTextureBake" ) :
 		self["__outputIndexCommand"]["command"].setValue( inspect.cleandoc(
 			"""
 			import os
-			import distutils.dir_util
 
 			# Ensure path exists
-			distutils.dir_util.mkpath( variables["bakeDirectory"] )
+			os.makedirs( variables["bakeDirectory"], exist_ok = True )
 
 			f = open( variables["indexFilePath"], "w", encoding = "utf-8" )
 

python/GafferUI/ShowURL.py

@@ -36,10 +36,8 @@
 ##########################################################################
 
 import os
+import shutil
 import sys
-import distutils.spawn
-
-import GafferUI
 
 from Qt import QtCore
 from Qt import QtGui
@@ -50,7 +48,7 @@ def showURL( url ) :
 	if sys.platform == "darwin" :
 		opener = "open"
 	elif "linux" in sys.platform :
-		opener = distutils.spawn.find_executable( "xdg-open" )
+		opener = shutil.which( "xdg-open" )
 
 	if opener :
 		os.system( "{0} \"{1}\"".format( opener, url ) )