Merge pull request #92 from nim65s/devel

Python 3 compatibility, ref #85 #86 

blender/urdf_to_blender.py

@@ -196,7 +196,7 @@ def setParent (children, parent):
 
     def __call__ (self, link):
         geometry = link.visual.geometry
-        if self.run.has_key (type(geometry)):
+        if type(geometry) in self.run:
             self.run[type(geometry)](geometry)
             self.setName(link.name)
             if link.visual.material is not None:

pyplugins/gepetto/gui/__init__.py

-from pythonwidget import Plugin
+from .pythonwidget import Plugin

pyplugins/gepetto/gui/pythonwidget.py

-from PythonQt import QtGui, Qt
+from __future__ import print_function
+
 from gepetto.corbaserver import Client
+from PythonQt import Qt, QtGui
+
 
 ### This class represents one special tab of the new QDockWidget
 class _NodeCreator (QtGui.QWidget):
@@ -111,9 +114,9 @@ class Plugin(QtGui.QDockWidget):
 
     def selected(self, event):
         #QtGui.QMessageBox.information(self, "Selected object", event.nodeName() + " " + str(event.point(False)))
-        print "name: ", event.nodeName()
+        print("name: ", event.nodeName())
         if event.hasIntersection():
-            print "point LF: ", event.point(True)
-            print "point WF: ", event.point(False)
-            print "normal LF: ", event.normal(True)
-            print "normal WF: ", event.normal(False)
+            print("point LF: ", event.point(True))
+            print("point WF: ", event.point(False))
+            print("normal LF: ", event.normal(True))
+            print("normal WF: ", event.normal(False))

src/gepetto/corbaserver/exporttoblender.py

@@ -38,7 +38,7 @@ def exportState(viewer, group, outData):
 		objNames.add(obj)
 	while len(objNames) > 0:
 		obj = objNames.pop()
-		if not outData.has_key(obj):
+		if obj not in outData:
 			outData[obj] = []
 		objFrame = outData[obj]
 		objFrame.append(gui.getNodeGlobalTransform(obj))
@@ -51,9 +51,8 @@ def writeDataToFile(group, outData, filename):
 	outFile = open(filename, "w+")
 	#write number of frames
 	outFile.write('nbFrames='+str(len(outData[outData.keys()[0]]))+'\n')
-	for obj, frames in outData.iteritems():
+	for obj, frames in outData.items():
 		outFile.write('OBJECT='+obj[len(group)+1:]+'\n')
 		for frame in range(0,len(frames)):
 			outFile.write(str(frame)+'='+str(frames[frame]).lstrip("[").rstrip("]")+'\n')
 	outFile.close()
-