Merge pull request #1 from jmirabel/devel

Fix compatibility with Python 3. 

CMakeLists.txt

@@ -19,15 +19,16 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 INCLUDE(cmake/base.cmake)
-INCLUDE(cmake/python.cmake)
+INCLUDE(cmake/hpp.cmake)
+INCLUDE(cmake/hpp/python.cmake)
 
 SET(PROJECT_NAME hpp-hrp2)
 SET(PROJECT_DESCRIPTION "Data specific to hrp2 robot for hpp-corbaserver")
 SET(PROJECT_URL "")
 
-SETUP_PROJECT()
+SETUP_HPP_PROJECT()
 
-FINDPYTHON()
+HPP_FINDPYTHON()
 ADD_REQUIRED_DEPENDENCY ("hpp-corbaserver >= 3")
 ADD_OPTIONAL_DEPENDENCY ("hpp-manipulation-corba")
 
@@ -44,4 +45,4 @@ IF (HPP_MANIPULATION_CORBA_FOUND)
     DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/manipulation/hrp2
     )
 ENDIF ()
-SETUP_PROJECt_FINALIZE()
+SETUP_HPP_PROJECT_FINALIZE()

cmake @ 20ceb603

-Subproject commit d22de8c53c3507df785b1fb3ab260d9fdfb65233
+Subproject commit 20ceb603019a791854c2651a415d75af3acdb4c1

src/hpp/corbaserver/hrp2/__init__.py

@@ -16,4 +16,4 @@
 # hpp-hrp2.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-from robot import Robot
+from .robot import Robot

src/hpp/corbaserver/manipulation/hrp2/__init__.py

-from robot import Robot
+from .robot import Robot

src/hpp/corbaserver/manipulation/hrp2/robot.py

@@ -76,7 +76,7 @@ class Robot (Parent):
     def __init__ (self, compositeName, robotName):
         Parent.__init__ (self, compositeName, robotName, self.rootJointType)
         hs = self.halfSitting.copy ()
-        for joint, value in hs.iteritems ():
+        for joint, value in hs.items ():
             self.halfSitting [self.displayName + "/" + joint] = value
         self.rightWrist = self.displayName + "/RARM_JOINT5"
         self.leftWrist  = self.displayName + "/LARM_JOINT5"
@@ -95,7 +95,7 @@ class Robot (Parent):
     def getInitialConfig (self):
         q = []
         for n in self.jointNames:
-            if self.halfSitting.has_key (n):
+            if n in self.halfSitting:
                 dof = self.halfSitting [n]
                 if type (dof) is tuple:
                     q += dof