spacepaste

  1.  
  2. diff --git a/yt/analysis_modules/halo_finding/rockstar/rockstar.py b/yt/analysis_modules/halo_finding/rockstar/rockstar.py
  3. index 78ec380fd..de78f6140 100644
  4. --- a/yt/analysis_modules/halo_finding/rockstar/rockstar.py
  5. +++ b/yt/analysis_modules/halo_finding/rockstar/rockstar.py
  6. @@ -214,7 +214,7 @@ class RockstarHaloFinder(ParallelAnalysisInterface):
  7. ts = DatasetSeries([ts])
  8. self.ts = ts
  9. self.particle_type = particle_type
  10. - self.outbase = outbase
  11. + self.outbase = six.b(outbase)
  12. self.min_halo_size = min_halo_size
  13. if force_res is None:
  14. tds = ts[-1] # Cache a reference
  15. @@ -296,7 +296,8 @@ class RockstarHaloFinder(ParallelAnalysisInterface):
  16. server_address, port = None, None
  17. self.server_address, self.port = self.comm.mpi_bcast(
  18. (server_address, port))
  19. - self.port = str(self.port)
  20. + self.server_address = six.b(self.server_address)
  21. + self.port = six.b(str(self.port))
  22. def run(self, block_ratio = 1, callbacks = None, restart = False):
  23. """
  24. @@ -328,8 +329,8 @@ class RockstarHaloFinder(ParallelAnalysisInterface):
  25. else:
  26. restart_num = 0
  27. self.handler.setup_rockstar(
  28. - six.b(self.server_address),
  29. - six.b(self.port),
  30. + self.server_address,
  31. + self.port,
  32. num_outputs, self.total_particles,
  33. self.particle_type,
  34. particle_mass = self.particle_mass,
  35. @@ -338,7 +339,7 @@ class RockstarHaloFinder(ParallelAnalysisInterface):
  36. num_writers = self.num_writers,
  37. writing_port = -1,
  38. block_ratio = block_ratio,
  39. - outbase = six.b(self.outbase),
  40. + outbase = self.outbase,
  41. force_res = self.force_res,
  42. callbacks = callbacks,
  43. restart_num = restart_num,
  44. @@ -351,7 +352,7 @@ class RockstarHaloFinder(ParallelAnalysisInterface):
  45. os.makedirs(self.outbase)
  46. # Make a record of which dataset corresponds to which set of
  47. # output files because it will be easy to lose this connection.
  48. - fp = open(self.outbase + '/datasets.txt', 'w')
  49. + fp = open(self.outbase.decode() + '/datasets.txt', 'w')
  50. fp.write("# dsname\tindex\n")
  51. for i, ds in enumerate(self.ts):
  52. dsloc = path.join(path.relpath(ds.fullpath), ds.basename)
  53.