Jérome Perrin · @jerome · Jérome Perrin · Jérome Perrin · Julien Muchembled · Jérome Perrin
--- a/slapos/collect/temperature/__init__.py
+++ b/slapos/collect/temperature/__init__.py
 from __future__ import print_function

 from multiprocessing import Process, active_children, cpu_count, Pipe
-try:
-  import subprocess32 as subprocess
-except ImportError:
+
+# When we run slapos node on python3 and install some software using python2,
+# subprocess32 will be installed, because the working set is generated for
+# the buildout python and not the python running slapos node instance.
+# To workaround this, we don't check the presence of subprocess32 egg, but
+# the fact that we run on python3.
--- a/slapos/slap/standalone.py
+++ b/slapos/slap/standalone.py
        return
      time.sleep(i * .01)
    raise RuntimeError("SlapOS not started")
+
+  def _getSubprocessEnvironment(self):
+    # Running tests with `python setup.py test` sets a PYTHONPATH that
+    # is suitable for current python, but problematic when this process
+    # runs another version of python in subprocess.
+    if 'PYTHONPATH' in os.environ:
+      self._logger.warning("Removing $PYTHONPATH from environment for subprocess")
+    return {k:v for k, v in os.environ.items() if k != 'PYTHONPATH'}
--- a/slapos/collect/db.py
+++ b/slapos/collect/db.py
      if table not in self.preserve_table_list: 
        self._execute(delete_sql % (table, where_clause))

-    self._execute("VACUUM;")
    self.commit()
+    self._execute("VACUUM;")