fixed other python 2/3 compatibility issues by hand

CPU.py

@@ -31,6 +31,8 @@
 
 """
 
+from __future__ import unicode_literals, print_function
+
 # System imports
 import os
 import sys

Makefile

@@ -25,7 +25,7 @@ CC       = gcc
 AR        = ar rv
 
 # (OPT) your python interpreter
-PYTHON = python
+PYTHON ?= python
 
 # your optimization flag
 OPTFLAG = -O4 -ffast-math #-march=native
@@ -60,7 +60,7 @@ EXTERNAL =
 
 # Try to automatically avoid an error 'error: can't combine user with ...'
 # which sometimes happens with brewed Python on OSX:
-CFGFILE=$(shell $(PYTHON) -c "import sys; print sys.prefix+'/lib/'+'python'+'.'.join(['%i' % e for e in sys.version_info[0:2]])+'/distutils/distutils.cfg'")
+CFGFILE=$(shell $(PYTHON) -c "from __future__ import print_function; import sys; print(sys.prefix+'/lib/'+'python'+'.'.join(['%i' % e for e in sys.version_info[0:2]])+'/distutils/distutils.cfg')")
 PYTHONPREFIX=$(shell grep -s "prefix" $(CFGFILE))
 ifeq ($(PYTHONPREFIX),)
 PYTHONFLAGS=--user

external_Pk/generate_Pk_example.py

@@ -1,4 +1,5 @@
 #!/usr/bin/python
+from __future__ import print_function
 import sys
 from math import exp
 

external_Pk/generate_Pk_example_w_tensors.py

@@ -1,4 +1,5 @@
 #!/usr/bin/python
+from __future__ import print_function
 import sys
 from math import exp
 

python/classy.pyx

@@ -33,7 +33,7 @@ DEF _MAXTITLESTRINGLENGTH_ = 8000
 # MontePython to handle things differently.
 class CosmoError(Exception):
     def __init__(self, message=""):
-        self.message = message
+        self.message = message.decode() if isinstance(message,bytes) else message
 
     def __str__(self):
         return '\n\nError in Class: ' + self.message
@@ -158,9 +158,10 @@ cdef class Class:
         i = 0
         for kk in self._pars:
 
-            dumc = kk
+            dumcp = kk.encode()
+            dumc = dumcp
             sprintf(self.fc.name[i],"%s",dumc)
-            dumcp = str(self._pars[kk])
+            dumcp = str(self._pars[kk]).encode()
             dumc = dumcp
             sprintf(self.fc.value[i],"%s",dumc)
             self.fc.read[i] = _FALSE_
@@ -311,7 +312,7 @@ cdef class Class:
             for i in range(self.fc.size):
                 if self.fc.read[i] == _FALSE_:
                     problem_flag = True
-                    problematic_parameters.append(self.fc.name[i])
+                    problematic_parameters.append(self.fc.name[i].decode())
             if problem_flag:
                 raise CosmoSevereError(
                     "Class did not read input parameter(s): %s\n" % ', '.join(

python/extract_errors.py

@@ -1,7 +1,7 @@
 # From the dumped stdout and stderr of a nosetests test_class.py, extract all
 # the failed steps.
 # Usage: python extract_errors.py output
-
+from __future__ import print_function
 import sys
 import os
 

python/interface_generator.py

@@ -1,7 +1,7 @@
 """
 Automatically reads header files to generate an interface
 """
-
+from __future__ import division, print_function
 import sys
 import logging
 try:
@@ -88,7 +88,7 @@ def main():
     for header in headers:
         extract_headers(header, structs, output_file, logger)
     logger.info("Finished extracting headers")
-    for struct_name, struct in list(structs.items()):
+    for struct_name, struct in structs.items():
         create_wrapper_class(struct_name, struct, output_file, logger)
 
     return
@@ -315,7 +315,7 @@ def create_wrapper_class(struct_name, struct, of, logger):
     # Define the array variables for all needed
     array_variables = []
     variables = []
-    for key, value in list(struct.items()):
+    for key, value in struct.items():
         if key != 'init':
             if value[1]:
                 array_variables.append(key)

python/setup.py

@@ -11,7 +11,7 @@
 GCCPATH_STRING = sbp.Popen(
     ['gcc', '-print-libgcc-file-name'],
     stdout=sbp.PIPE).communicate()[0]
-GCCPATH = osp.normpath(osp.dirname(GCCPATH_STRING))
+GCCPATH = osp.normpath(osp.dirname(GCCPATH_STRING)).decode()
 
 # Recover the CLASS version
 with open(os.path.join('..', 'include', 'common.h'), 'r') as v_file:

python/test_class.py

@@ -68,6 +68,7 @@
 matter power spectrum. If the two are not close enough, it will generate a
 PDF plot of this and save it in the 'fail' folder.
 """
+from __future__ import print_function
 from classy import Class
 from classy import CosmoSevereError
 import itertools