Skip to content

Commit 94226c0

Browse files
committed
code refactoring
1 parent 584f5f4 commit 94226c0

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

pyexcel_xls/xlsr.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,18 @@ def __init__(self):
7979
BookReader.__init__(self)
8080
self._file_content = None
8181

82-
def open(self, file_name, **keywords):
82+
def open(self, file_name, skip_hidden_sheets=True, **keywords):
8383
BookReader.open(self, file_name, **keywords)
84-
self._get_params()
84+
self.__skip_hidden_sheets = skip_hidden_sheets
8585

86-
def open_stream(self, file_stream, **keywords):
86+
def open_stream(self, file_stream, skip_hidden_sheets=True, **keywords):
8787
BookReader.open_stream(self, file_stream, **keywords)
88-
self._get_params()
88+
self.__skip_hidden_sheets = skip_hidden_sheets
8989

90-
def open_content(self, file_content, **keywords):
90+
def open_content(self, file_content, skip_hidden_sheets=True, **keywords):
9191
self._keywords = keywords
9292
self._file_content = file_content
93-
self._get_params()
93+
self.__skip_hidden_sheets = skip_hidden_sheets
9494

9595
def close(self):
9696
if self._native_book:
@@ -114,7 +114,7 @@ def read_all(self):
114114
result = OrderedDict()
115115
self._native_book = self._get_book()
116116
for sheet in self._native_book.sheets():
117-
if self.skip_hidden_sheets and sheet.visibility != 0:
117+
if self.__skip_hidden_sheets and sheet.visibility != 0:
118118
continue
119119
data_dict = self.read_sheet(sheet)
120120
result.update(data_dict)
@@ -141,10 +141,6 @@ def _get_book(self, on_demand=False):
141141
xls_book = xlrd.open_workbook(**xlrd_params)
142142
return xls_book
143143

144-
def _get_params(self):
145-
self.skip_hidden_sheets = self._keywords.get(
146-
'skip_hidden_sheets', True)
147-
148144
def _extract_xlrd_params(self):
149145
params = {}
150146
if self._keywords is not None:

0 commit comments

Comments
 (0)