simplier fix for issue

ESCOMP · Sep 17, 2020 · 36c56db · 36c56db
1 parent dc67cc6
commit 36c56db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manic/sourcetree.py b/manic/sourcetree.py
@@ -337,7 +337,7 @@ def checkout(self, verbosity, load_all, load_comp=None):
         else:
             tmp_comps = self._required_compnames
 
-        load_comps = self.order_comps_by_local_path(self, tmp_comps)
+        load_comps = self.order_comps_by_local_path(tmp_comps)
 
         # checkout the primary externals
         for comp in load_comps:

diff --git a/manic/utils.py b/manic/utils.py
@@ -255,7 +255,7 @@ def execute_subprocess(commands, status_to_caller=False,
     hanging_timer.start()
     try:
         output = subprocess.check_output(commands, stderr=subprocess.STDOUT,
-                                         universal_newlines=True)
+                                         universal_newlines=True).decode('utf-8')
         log_process_output(output)
         status = 0
     except OSError as error: