8000 DEPR: Bunch o deprecation removals part 2 by jreback · Pull Request #10892 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

DEPR: Bunch o deprecation removals part 2 #10892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 24, 2015
Merged

DEPR: Bunch o deprecation removals part 2 #10892

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
69271b3
DEPR: Remove the table keyword in HDFStore.put/append, in favor of us…
jreback Aug 23, 2015
0068abf
DEPR: Remove unused keyword kind in read_excel/ExcelFile, #4712
jreback Aug 23, 2015
0fde3ba
DEPR: Remove infer_type keyword from pd.read_html as its unused, #477…
jreback Aug 23, 2015
245791c
DEPR: Remove offset and timeRule keywords from Series.tshift/shift, i…
jreback Aug 23, 2015
12e0705
DEPR: Remove pd.load/pd.save aliases in favor of pd.to_pickle/pd.read…
jreback Aug 23, 2015
0774b57
DEPR: WidePanel, LongPanel -> deprecated
jreback Aug 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
DEPR: Remove unused keyword kind in read_excel/ExcelFile, #4712
  • Loading branch information
@jreback
jreback committed Aug 24, 2015
commit 0068abfac87caf509e2bce3b5f6a06988335ccd0
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v0.17.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ Removal of prior version deprecations/changes


- Remove the ``table`` keyword in ``HDFStore.put/append``, in favor of using ``format=`` (:issue:`4645`)

- Remove unused keyword ``kind`` in ``read_excel/ExcelFile`` (:issue:`4712`)


.. _whatsnew_0170.performance:
Expand Down
65 changes: 30 additions & 35 deletions pandas/io/excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,17 @@ def read_excel(io, sheetname=0, **kwds):
and file. For file URLs, a host is expected. For instance, a local
file could be file://localhost/path/to/workbook.xlsx
sheetname : string, int, mixed list of strings/ints, or None, default 0
Strings are used for sheet names, Integers are used in zero-indexed sheet
positions.

Strings are used for sheet names, Integers are used in zero-indexed sheet
positions.

Lists of strings/integers are used to request multiple sheets.

Specify None to get all sheets.

str|int -> DataFrame is returned.
list|None -> Dict of DataFrames is returned, with keys representing sheets.

Available Cases

* Defaults to 0 -> 1st sheet as a DataFrame
Expand Down Expand Up @@ -143,11 +143,6 @@ def read_excel(io, sheetname=0, **kwds):
for more information on when a Dict of Dataframes is returned.

"""
if 'kind' in kwds:
kwds.pop('kind')
warn("kind keyword is no longer supported in read_excel and may be "
"removed in a future version", FutureWarning)

engine = kwds.pop('engine', None)

return ExcelFile(io, engine=engine).parse(sheetname=sheetname, **kwds)
Expand Down Expand Up @@ -207,19 +202,19 @@ def parse(self, sheetname=0, header=0, skiprows=None, skip_footer=0,
Parameters
----------
sheetname : string, int, mixed list of strings/ints, or None, default 0
Strings are used for sheet names, Integers are used in zero-indexed sheet
positions.

Strings are used for sheet names, Integers are used in zero-indexed sheet
positions.

Lists of strings/integers are used to request multiple sheets.

Specify None to get all sheets.

str|int -> DataFrame is returned.
list|None -> Dict of DataFrames is returned, with keys representing sheets.

Available Cases

* Defaults to 0 -> 1st sheet as a DataFrame
* 1 -> 2nd sheet as a DataFrame
* "Sheet1" -> 1st sheet as a DataFrame
Expand Down Expand Up @@ -336,7 +331,7 @@ def _parse_excel(self, sheetname=0, header=0, skiprows=None, skip_footer=0,
def _parse_cell(cell_contents,cell_typ):
"""converts the contents of the cell into a pandas
appropriate object"""

if cell_typ == XL_CELL_DATE:
if xlrd_0_9_3:
# Use the newer xlrd datetime handling.
Expand Down Expand Up @@ -379,9 +374,9 @@ def _parse_cell(cell_contents,cell_typ):
xlrd_0_9_3 = True
else:
xlrd_0_9_3 = False

ret_dict = False

#Keep sheetname to maintain backwards compatibility.
if isinstance(sheetname, list):
sheets = sheetname
Expand All @@ -391,31 +386,31 @@ def _parse_cell(cell_contents,cell_typ):
ret_dict = True
else:
sheets = [sheetname]

#handle same-type duplicates.
sheets = list(set(sheets))

output = {}

for asheetname in sheets:
if verbose:
print("Reading sheet %s" % asheetname)

if isinstance(asheetname, compat.string_types):
sheet = self.book.sheet_by_name(asheetname)
else: # assume an integer if not a string
sheet = self.book.sheet_by_index(asheetname)
else: # assume an integer if not a string
sheet = self.book.sheet_by_index(asheetname)

data = []
should_parse = {}

for i in range(sheet.nrows):
row = []
for j, (value, typ) in enumerate(zip(sheet.row_values(i),
sheet.row_types(i))):
if parse_cols is not None and j not in should_parse:
should_parse[j] = self._should_parse(j, parse_cols)

if parse_cols is None or should_parse[j]:
row.append(_parse_cell(value,typ))
data.append(row)
Expand All @@ -436,14 +431,14 @@ def _parse_cell(cell_contents,cell_typ):
skip_footer=skip_footer,
chunksize=chunksize,
**kwds)

output[asheetname] = parser.read()

if ret_dict:
return output
else:
return output[asheetname]


@property
def sheet_names(self):
Expand Down
0