Merge branch 'master' of https://github.com/personalrobotics/prpy into feature/more_planningmethods

Author: psigen

src/prpy/base/robot.py

@@ -370,7 +370,6 @@ def PostProcessPath(self, path,
 
         # Copy the trajectory into the output environment.
         output_traj = CopyTrajectory(traj, env=self.GetEnv())
-        output_traj.SetDescription(path.GetDescription())
         return output_traj
 
     def ExecutePath(self, path, **kwargs):

src/prpy/planning/base.py

@@ -330,7 +330,7 @@ def get_planners(self, method_name):
 
     def plan(self, method, args, kw_args):
         all_planners = self._planners
-        futures = dict()
+        futures = []
         results = [None] * len(self._planners)
 
         # Helper function to call a planner and return its result.
@@ -348,12 +348,12 @@ def call_planner(planner):
                     .format(planner, method))
                 continue
             else:
-                futures[index] = defer(call_planner, args=(planner,))
+                futures.append((index, defer(call_planner, args=(planner,))))
 
         # Each time a planner completes, check if we have a valid result
         # (a planner found a solution and all higher-ranked planners had
         # already failed).
-        for index, future in futures.viewitems():
+        for index, future in futures:
             try:
                 return future.result()
             except MetaPlanningError as e: