Starting to work with Python 3 compatibility.

Author: hpparvi

src/__init__.py

@@ -1,4 +1,4 @@
-from ldtk import LDPSetCreator, LDPSet
-from filters import BoxcarFilter, TabulatedFilter
+from ldtk.ldtk import LDPSetCreator, LDPSet
+from ldtk.filters import BoxcarFilter, TabulatedFilter
 
-__all__ = ['LDPSetCreator','LDPSet','BoxcarFilter','TabulatedFilter','ldtk_root']
+__all__ = ['LDPSetCreator','LDPSet','BoxcarFilter','TabulatedFilter']

src/client.py

@@ -20,7 +20,7 @@
 from ftplib import FTP
 from itertools import product
 from tqdm import tqdm
-from core import *
+from ldtk.core import *
 
 class Client(object):
     def __init__(self, limits=None, verbosity=1, update_server_file_list=False, cache=None):
@@ -128,7 +128,7 @@ def download_uncached_files(self, force=False):
                         pb.update(1)
                     else:
                         if self.verbosity > 1:
-                            print 'Skipping an existing file: ', f.name
+                            print('Skipping an existing file: {:s}'.format(f.name))
             ftp.close()
 
 

src/ldtk.py

@@ -23,9 +23,9 @@
 from scipy.interpolate import interp1d
 from scipy.optimize import fmin
 
-from ld_models import LinearModel, QuadraticModel, NonlinearModel, GeneralModel, models
-from client import Client
-from core import *
+from ldtk.ld_models import LinearModel, QuadraticModel, NonlinearModel, GeneralModel, models
+from ldtk.client import Client
+from ldtk.core import *
 
 def load_ldpset(filename):
     with open(filename,'r') as fin:
@@ -257,9 +257,9 @@ def set_lims(ms_or_samples, pts, plims=[0.135,100-0.135] ):
             teff_lims, logg_lims, metal_lims = limits
 
         if verbose:
-            print "Teff limits: ", teff_lims
-            print "logg limits: ", logg_lims
-            print "Fe/H limits: ", metal_lims
+            print("Teff limits: " + str(teff_lims))
+            print("logg limits: " + str(logg_lims))
+            print("Fe/H limits: " + str(metal_lims))
 
         self.client   = c = Client(limits=[teff_lims, logg_lims, metal_lims], cache=cache)
         self.files    = self.client.local_filenames