Merge remote-tracking branch 'origin/master' into papeleux

comp.py

@@ -207,7 +207,8 @@ class CompJob(ParametricJob):
 
         # which python?
         out = subprocess.check_output([self.pars['PYTHONEXE'].val, '-c',
-          '        try:
+          'import sys; print(sys.version_info.major)'])
+        try:
             pyver = int(out)
         except:
             self.error('unable to get python version number')