8
8
9
9
import os
10
10
import abc
11
+ import warnings
11
12
import numpy as np
12
13
13
14
from pandas .core .dtypes .common import (
@@ -193,7 +194,6 @@ def get_writer(engine_name):
193
194
raise ValueError ("No Excel writer '%s'" % engine_name )
194
195
195
196
196
- @deprecate_kwarg ('sheetname' , 'sheet_name' )
197
197
@Appender (_read_excel_doc )
198
198
def read_excel (io , sheet_name = 0 , header = 0 , skiprows = None , skip_footer = 0 ,
199
199
index_col = None , names = None , parse_cols = None , parse_dates = False ,
@@ -202,6 +202,16 @@ def read_excel(io, sheet_name=0, header=0, skiprows=None, skip_footer=0,
202
202
dtype = None , true_values = None , false_values = None , engine = None ,
203
203
squeeze = False , ** kwds ):
204
204
205
+ # Can't use _deprecate_kwarg since sheetname=None has a special meaning
206
+ if sheet_name is 0 and 'sheetname' in kwds :
207
+ # deprecation warning
208
+ warnings .warn ("The `sheetname` keyword is deprecated, use "
209
+ "`sheet_name` instead" , FutureWarning )
210
+ sheet_name = kwds .pop ("sheetname" )
211
+ elif 'sheetname' in kwds :
212
+ raise TypeError ("Cannot specify both `sheet_name` and `sheetname`. "
213
+ "Use just `sheet_name`" )
214
+
205
215
if not isinstance (io , ExcelFile ):
206
216
io = ExcelFile (io , engine = engine )
207
217
0 commit comments