Skip to content

Commit 72905d3

Browse files
committed
Small changes from code review
1 parent 12c1f97 commit 72905d3

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

pandas/io/sas.py

+10-8
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,13 @@
117117
def read_sas(filepath_or_buffer, format='xport', index=None, encoding='ISO-8859-1',
118118
chunksize=None, iterator=False):
119119

120-
if format.lower() != 'xport':
121-
raise ValueError('only xport format is supported')
120+
format = format.lower()
122121

123-
reader = XportReader(filepath_or_buffer, index=index, encoding=encoding,
124-
chunksize=chunksize)
122+
if format == 'xport':
123+
reader = XportReader(filepath_or_buffer, index=index, encoding=encoding,
124+
chunksize=chunksize)
125+
else:
126+
raise ValueError('only xport format is supported')
125127

126128
if iterator or chunksize:
127129
return reader
@@ -261,12 +263,12 @@ def _read_header(self):
261263
# read file header
262264
line1 = self._get_row()
263265
if line1 != _correct_line1:
264-
raise Exception("Header record is not an XPORT file.")
266+
raise ValueError("Header record is not an XPORT file.")
265267

266268
line2 = self._get_row()
267269
file_info = _split_line(line2, [ ['prefix',24], ['version',8], ['OS',8], ['_',24], ['created',16]])
268270
if file_info['prefix'] != "SAS SAS SASLIB":
269-
raise Exception("Header record has invalid prefix.")
271+
raise ValueError("Header record has invalid prefix.")
270272
file_info['created'] = _parse_date(file_info['created'])
271273
self.file_info = file_info
272274

@@ -277,7 +279,7 @@ def _read_header(self):
277279
header1 = self._get_row()
278280
header2 = self._get_row()
279281
if not header1.startswith(_correct_header1) or not header2 == _correct_header2:
280-
raise Exception("Member header not found.")
282+
raise ValueError("Member header not found.")
281283
fieldnamelength = int(header1[-5:-2]) # usually 140, could be 135
282284

283285
# member info
@@ -325,7 +327,7 @@ def _read_header(self):
325327

326328
header = self._get_row()
327329
if not header == _correct_obs_header:
328-
raise Exception("Observation header not found.")
330+
raise ValueError("Observation header not found.")
329331

330332
self.fields = fields
331333
self.record_length = obs_length

0 commit comments

Comments
 (0)