Skip to content

Commit 1a6fec8

Browse files
authored
Fix USGS database for python 2.6 (#111)
1 parent 81f06f2 commit 1a6fec8

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

spectral/database/usgs.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def header(self):
8787
Returns:
8888
String representation of basic meta data.
8989
'''
90-
return '{} Record={}: {} {} {}'.format(self.libname, self.record,
90+
return '{0} Record={1}: {2} {3} {4}'.format(self.libname, self.record,
9191
self.measurement, self.description)
9292

9393
@ classmethod
@@ -110,7 +110,7 @@ def read_from_file(cls, filename):
110110
header_line = readline(f)
111111
if not header_line:
112112
raise Exception(
113-
'{} has empty header line or no lines at all.'.format(filename))
113+
'{0} has empty header line or no lines at all.'.format(filename))
114114
libname, record, measurement_type, unit, spectrometer_name, description = \
115115
SpectrometerData._parse_header(header_line.strip())
116116

@@ -134,7 +134,7 @@ def _find_spectrometer_name(header_line):
134134
return sname
135135

136136
raise Exception(
137-
'Could not find spectrometer for header {}'.format(header_line))
137+
'Could not find spectrometer for header {0}'.format(header_line))
138138

139139
@staticmethod
140140
def _assume_measurement_type(header_line):
@@ -151,7 +151,7 @@ def _assume_measurement_type(header_line):
151151
if 'srf' in header_line:
152152
return 'SRF'
153153
raise Exception(
154-
'Could not assume measurement type for header line {}'.format(header_line))
154+
'Could not assume measurement type for header line {0}'.format(header_line))
155155

156156
@ staticmethod
157157
def _assume_unit(header_line, measurement_type):
@@ -216,7 +216,7 @@ def header(self):
216216
Returns:
217217
String representation of basic meta data.
218218
'''
219-
return '{} Record={}: {} {}{} {}'.format(self.libname, self.record,
219+
return '{0} Record={1}: {2} {3}{4} {5}'.format(self.libname, self.record,
220220
self.description, self.spectrometer,
221221
self.purity, self.measurement_type)
222222

@@ -265,7 +265,7 @@ def read_from_file(cls, filename, chapter=None):
265265
header_line = f.readline()
266266
if not header_line:
267267
raise Exception(
268-
'{} has empty header line or no lines at all.'.format(filename))
268+
'{0} has empty header line or no lines at all.'.format(filename))
269269
libname, record, description, spectrometer, purity, measurement_type = \
270270
SampleData._parse_header(header_line.strip())
271271

@@ -328,7 +328,7 @@ def _assume_wavelength_spectrometer_data_id(self, sampleData):
328328
result = self.cursor.execute(query, (libname, num_values))
329329
rows = result.fetchall()
330330
if len(rows) < 1:
331-
raise Exception('Wavelengths for spectrometer not found, for LibName = {} and NumValues = {}, from file {}'.format(
331+
raise Exception('Wavelengths for spectrometer not found, for LibName = {0} and NumValues = {1}, from file {2}'.format(
332332
libname, num_values, sampleData.file_name))
333333
if len(rows) > 1:
334334
logger.warning('Found multiple spectrometers with measurement_type Wavelengths, '
@@ -578,7 +578,7 @@ def create_envi_spectral_library(self, spectrumIDs, bandInfo):
578578
SELECT a.ValuesArray, b.ValuesArray, a.Description, b.Unit
579579
FROM Samples AS a INNER JOIN SpectrometerData AS b
580580
ON a.AssumedWLSpmeterDataID = b.SpectrometerDataID
581-
WHERE a.SampleID IN ({})'''.format(','.join(['?']*len(spectrumIDs))),
581+
WHERE a.SampleID IN ({0})'''.format(','.join(['?']*len(spectrumIDs))),
582582
spectrumIDs)
583583

584584
names = []

0 commit comments

Comments
 (0)