Skip to content

Commit 8b4b96d

Browse files
committed
pep8 cleanup
1 parent 1af73b3 commit 8b4b96d

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

pandas/io/sas/sas7bdat.py

+16-8
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,14 @@ def _get_properties(self):
150150
buf = self._read_bytes(const.dataset_offset, const.dataset_length)
151151
self.name = buf.rstrip(b'\x00 ')
152152
if self.convert_header_text:
153-
self.name = self.name.decode(self.encoding or self.default_encoding)
153+
self.name = self.name.decode(
154+
self.encoding or self.default_encoding)
154155

155156
buf = self._read_bytes(const.file_type_offset, const.file_type_length)
156157
self.file_type = buf.rstrip(b'\x00 ')
157158
if self.convert_header_text:
158-
self.file_type = self.file_type.decode(self.encoding or self.default_encoding)
159+
self.file_type = self.file_type.decode(
160+
self.encoding or self.default_encoding)
159161

160162
# Timestamp is epoch 01/01/1960
161163
epoch = pd.datetime(1960, 1, 1)
@@ -184,19 +186,22 @@ def _get_properties(self):
184186
const.sas_release_length)
185187
self.sas_release = buf.rstrip(b'\x00 ')
186188
if self.convert_header_text:
187-
self.sas_release = self.sas_release.decode(self.encoding or self.default_encoding)
189+
self.sas_release = self.sas_release.decode(
190+
self.encoding or self.default_encoding)
188191

189192
buf = self._read_bytes(const.sas_server_type_offset + total_align,
190193
const.sas_server_type_length)
191194
self.server_type = buf.rstrip(b'\x00 ')
192195
if self.convert_header_text:
193-
self.server_type = self.server_type.decode(self.encoding or self.default_encoding)
196+
self.server_type = self.server_type.decode(
197+
self.encoding or self.default_encoding)
194198

195199
buf = self._read_bytes(const.os_version_number_offset + total_align,
196200
const.os_version_number_length)
197201
self.os_version = buf.rstrip(b'\x00 ')
198202
if self.convert_header_text:
199-
self.os_version = self.os_version.decode(self.encoding or self.default_encoding)
203+
self.os_version = self.os_version.decode(
204+
self.encoding or self.default_encoding)
200205

201206
buf = self._read_bytes(const.os_name_offset + total_align,
202207
const.os_name_length)
@@ -208,7 +213,8 @@ def _get_properties(self):
208213
const.os_maker_length)
209214
self.os_name = buf.rstrip(b'\x00 ')
210215
if self.convert_header_text:
211-
self.os_name = self.os_name.decode(self.encoding or self.default_encoding)
216+
self.os_name = self.os_name.decode(
217+
self.encoding or self.default_encoding)
212218

213219
# Read a single float of the given width (4 or 8).
214220
def _read_float(self, offset, width):
@@ -442,7 +448,8 @@ def _process_columntext_subheader(self, offset, length):
442448
self.creator_proc = buf[0:self._lcp]
443449
if self.convert_header_text:
444450
if hasattr(self, "creator_proc"):
445-
self.creator_proc = self.creator_proc.decode(self.encoding or self.default_encoding)
451+
self.creator_proc = self.creator_proc.decode(
452+
self.encoding or self.default_encoding)
446453

447454
def _process_columnname_subheader(self, offset, length):
448455
int_len = self._int_length
@@ -628,7 +635,8 @@ def _chunk_to_dataframe(self):
628635
elif self.column_types[j] == b's':
629636
rslt[name] = self._string_chunk[js, :]
630637
if self.convert_text and (self.encoding is not None):
631-
rslt[name] = rslt[name].str.decode(self.encoding or self.default_encoding)
638+
rslt[name] = rslt[name].str.decode(
639+
self.encoding or self.default_encoding)
632640
if self.blank_missing:
633641
ii = rslt[name].str.len() == 0
634642
rslt.loc[ii, name] = np.nan

pandas/io/tests/sas/test_sas7bdat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def test_encoding_options():
7979
from pandas.io.sas.sas7bdat import SAS7BDATReader
8080
rdr = SAS7BDATReader(fname, convert_header_text=False)
8181
df3 = rdr.read()
82-
for x,y in zip(df1.columns, df3.columns):
82+
for x, y in zip(df1.columns, df3.columns):
8383
assert(x == y.decode())
8484

8585

0 commit comments

Comments
 (0)