Changeset 680

Show
Ignore:
Timestamp:
10/10/08 16:32:05 (1 month ago)
Author:
laidler
Message:

Working on #52: modified File-related classes in spectrum.py to use os.path.expandvars, which will expand environment variables on posix-compliant systems. Also replaced some .split() manipulations by regular expressions in InterpolatedSpectralElement? constructor.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/pysynphot/lib/spectrum.py

    r679 r680  
    662662  
    663663        """ 
    664         self._readSpectrumFile(filename, fluxname) 
    665         self.name=filename 
     664        self.name = os.path.expandvars(filename) 
     665        self._readSpectrumFile(self.name, fluxname) 
    666666        self.validate_units()  
    667667        self.validate_wavetable() 
    …… 
    12661266 
    12671267        """ 
    1268         self._readThroughputFile(filename, thrucol) 
    1269         self.name=filename 
     1268        self.name=os.path.expandvars(filename) 
     1269        self._readThroughputFile(self.name, thrucol) 
     1270 
    12701271        self.validate_units()  
    12711272        self.validate_wavetable() 
    …… 
    13101311        interpolate between two columns in the file. 
    13111312        ''' 
    1312         self.name = fileName.split('[')[0] 
    1313         colSpec = fileName.split('[')[1][:-1] 
     1313        xre=re.search('\[(?P<col>.*?)\]',fileName) 
     1314        self.name = os.path.expandvars(fileName[0:(xre.start())]) 
     1315        colSpec = xre.group('col') 
     1316 
    13141317 
    13151318        self.interpval = wavelength