Skip to content

Commit ac7dcad

Browse files
committed
fix pylint warnings
1 parent 2cab2d1 commit ac7dcad

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

pyexcel_ods3/__init__.py

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
ODS format plugin for pyexcel
66
7-
:copyright: (c) 2015-2016 -2016 by Onni Software Ltd. & its contributors
7+
:copyright: (c) 2015-2016 by Onni Software Ltd. & its contributors
88
:license: New BSD License
99
"""
1010
import sys
@@ -58,10 +58,10 @@ def time_value(value):
5858
minute = int(value[5:7])
5959
second = int(value[8:10])
6060
if hour < 24:
61-
ret = datetime.time(hour, minute, second)
61+
return datetime.time(hour, minute, second)
6262
else:
63-
ret = datetime.timedelta(hours=hour, minutes=minute, seconds=second)
64-
return ret
63+
return datetime.timedelta(hours=hour, minutes=minute, seconds=second)
64+
6565

6666

6767
def boolean_value(value):
@@ -113,6 +113,21 @@ def boolean_value(value):
113113
ODS_WRITE_FORMAT_COVERSION[unicode] = "string"
114114

115115

116+
def _read_cell(cell):
117+
cell_type = cell.value_type
118+
ret = None
119+
if cell_type in ODS_FORMAT_CONVERSION:
120+
value = cell.value
121+
n_value = VALUE_CONVERTERS[cell_type](value)
122+
ret = n_value
123+
else:
124+
if cell.value is None:
125+
ret = ""
126+
else:
127+
ret = cell.value
128+
return ret
129+
130+
116131
class ODSSheet(SheetReaderBase):
117132
@property
118133
def name(self):
@@ -124,29 +139,15 @@ def to_array(self):
124139
for row in range(self.native_sheet.nrows()):
125140
row_data = []
126141
tmp_row = []
127-
for column, cell in enumerate(self.native_sheet.row(row)):
128-
cell_value = self._read_cell(cell)
142+
for cell in self.native_sheet.row(row):
143+
cell_value = _read_cell(cell)
129144
tmp_row.append(cell_value)
130145
if cell_value is not None and cell_value != '':
131146
row_data += tmp_row
132147
tmp_row = []
133148
if len(row_data) > 0:
134149
yield row_data
135150

136-
def _read_cell(self, cell):
137-
cell_type = cell.value_type
138-
ret = None
139-
if cell_type in ODS_FORMAT_CONVERSION:
140-
value = cell.value
141-
n_value = VALUE_CONVERTERS[cell_type](value)
142-
ret = n_value
143-
else:
144-
if cell.value is None:
145-
ret = ""
146-
else:
147-
ret = cell.value
148-
return ret
149-
150151

151152
class ODSBook(BookReader):
152153

@@ -246,13 +247,13 @@ def close(self):
246247

247248
def save_data(afile, data, file_type=None, **keywords):
248249
if isstream(afile) and file_type is None:
249-
file_type='ods'
250+
file_type = 'ods'
250251
write_data(afile, data, file_type=file_type, **keywords)
251252

252253

253254
def get_data(afile, file_type=None, **keywords):
254255
if isstream(afile) and file_type is None:
255-
file_type='ods'
256+
file_type = 'ods'
256257
return read_data(afile, file_type=file_type, **keywords)
257258

258259

0 commit comments

Comments
 (0)