Merge pull request #169 from bakpaul/25_10_fix_scene_tests_errors

Remove use of deleted module to fix scene test error

Author: hugtalbot

examples/others/caduceus/reduced/debug/debug_scene.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import os
-import imp
 import platform
 from sys import argv
 
@@ -12,7 +11,8 @@
                      +"Please install it : https://github.com/SofaDefrost/STLIB")
 
 # MOR IMPORT
-from mor.utility import sceneCreation as u
+from mor.utility import sceneCreation as sc
+from mor.utility import utility as u
 
 slash = '/'
 if "Windows" in platform.platform():
@@ -21,7 +21,7 @@
 # Our Original Scene IMPORT
 originalScene = os.path.dirname(os.path.abspath(__file__)) + "/../../caduceusNG.pyscn"
 originalScene = os.path.normpath(originalScene)
-originalScene = imp.load_source(originalScene.split(slash)[-1], originalScene)
+originalScene = u.load_source(originalScene.split(slash)[-1], originalScene)
 
 def createScene(rootNode):
 
@@ -33,4 +33,4 @@ def createScene(rootNode):
 
     pathToNode = 'Snake'
 
-    u.createDebug(rootNode,pathToNode,stateFileName)
+    sc.createDebug(rootNode,pathToNode,stateFileName)

examples/others/hexaBeam/reduced/debug/debug_scene.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import os
-import imp
 import platform
 from sys import argv
 
@@ -12,7 +11,8 @@
                      +"Please install it : https://github.com/SofaDefrost/STLIB")
 
 # MOR IMPORT
-from mor.utility import sceneCreation as u
+from mor.utility import sceneCreation as sc
+from mor.utility import utility as u
 
 slash = '/'
 if "Windows" in platform.platform():
@@ -21,7 +21,7 @@
 # Our Original Scene IMPORT
 originalScene = os.path.dirname(os.path.abspath(__file__)) + "/../../hexaBeam.pyscn"
 originalScene = os.path.normpath(originalScene)
-originalScene = imp.load_source(originalScene.split(slash)[-1], originalScene)
+originalScene = u.load_source(originalScene.split(slash)[-1], originalScene)
 
 def createScene(rootNode):
 
@@ -33,4 +33,4 @@ def createScene(rootNode):
 
     pathToNode = 'M1'
 
-    u.createDebug(rootNode,pathToNode,stateFileName)
+    sc.createDebug(rootNode,pathToNode,stateFileName)

examples/softRobots/finger/reduced/debug/debug_scene.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import os
-import imp
 import platform
 from sys import argv
 
@@ -12,7 +11,8 @@
                      +"Please install it : https://github.com/SofaDefrost/STLIB")
 
 # MOR IMPORT
-from mor.utility import sceneCreation as u
+from mor.utility import sceneCreation as sc
+from mor.utility import utility as u
 
 slash = '/'
 if "Windows" in platform.platform():
@@ -21,7 +21,7 @@
 # Our Original Scene IMPORT
 originalScene = os.path.dirname(os.path.abspath(__file__)) + "/../../finger.pyscn"
 originalScene = os.path.normpath(originalScene)
-originalScene = imp.load_source(originalScene.split(slash)[-1], originalScene)
+originalScene = u.load_source(originalScene.split(slash)[-1], originalScene)
 
 def createScene(rootNode):
 
@@ -33,4 +33,4 @@ def createScene(rootNode):
 
     pathToNode = 'finger'
 
-    u.createDebug(rootNode,pathToNode,stateFileName)
+    sc.createDebug(rootNode,pathToNode,stateFileName)

examples/softRobots/sofiaLeg/reduced/debug/debug_scene.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import os
-import imp
 import platform
 from sys import argv
 
@@ -12,7 +11,8 @@
                      +"Please install it : https://github.com/SofaDefrost/STLIB")
 
 # MOR IMPORT
-from mor.utility import sceneCreation as u
+from mor.utility import sceneCreation as sc
+from mor.utility import utility as u
 
 slash = '/'
 if "Windows" in platform.platform():
@@ -21,7 +21,7 @@
 # Our Original Scene IMPORT
 originalScene = os.path.dirname(os.path.abspath(__file__)) + "/../../sofiaLeg.py"
 originalScene = os.path.normpath(originalScene)
-originalScene = imp.load_source(originalScene.split(slash)[-1], originalScene)
+originalScene = u.load_source(originalScene.split(slash)[-1], originalScene)
 
 def createScene(rootNode):
 
@@ -33,4 +33,4 @@ def createScene(rootNode):
 
     pathToNode = 'SofiaLeg'
 
-    u.createDebug(rootNode,pathToNode,stateFileName)
+    sc.createDebug(rootNode,pathToNode,stateFileName)