@@ -779,7 +779,6 @@ def select_as_coordinates(
779
779
where = None ,
780
780
start : Optional [int ] = None ,
781
781
stop : Optional [int ] = None ,
782
- ** kwargs ,
783
782
):
784
783
"""
785
784
return the selection as an Index
@@ -795,7 +794,7 @@ def select_as_coordinates(
795
794
tbl = self .get_storer (key )
796
795
if not isinstance (tbl , Table ):
797
796
raise TypeError ("can only read_coordinates with a table" )
798
- return tbl .read_coordinates (where = where , start = start , stop = stop , ** kwargs )
797
+ return tbl .read_coordinates (where = where , start = start , stop = stop )
799
798
800
799
def select_column (self , key : str , column : str , ** kwargs ):
801
800
"""
@@ -2286,7 +2285,7 @@ def set_atom_data(self, block):
2286
2285
self .typ = self .get_atom_data (block )
2287
2286
self .set_data (block .values .astype (self .typ .type , copy = False ))
2288
2287
2289
- def set_atom_categorical (self , block , items , info = None , values = None ):
2288
+ def set_atom_categorical (self , block , items , info = None ):
2290
2289
# currently only supports a 1-D categorical
2291
2290
# in a 1-D block
2292
2291
@@ -2314,17 +2313,15 @@ def set_atom_categorical(self, block, items, info=None, values=None):
2314
2313
def get_atom_datetime64 (self , block ):
2315
2314
return _tables ().Int64Col (shape = block .shape [0 ])
2316
2315
2317
- def set_atom_datetime64 (self , block , values = None ):
2316
+ def set_atom_datetime64 (self , block ):
2318
2317
self .kind = "datetime64"
2319
2318
self .typ = self .get_atom_datetime64 (block )
2320
- if values is None :
2321
- values = block .values .view ("i8" )
2319
+ values = block .values .view ("i8" )
2322
2320
self .set_data (values , "datetime64" )
2323
2321
2324
- def set_atom_datetime64tz (self , block , info , values = None ):
2322
+ def set_atom_datetime64tz (self , block , info ):
2325
2323
2326
- if values is None :
2327
- values = block .values
2324
+ values = block .values
2328
2325
2329
2326
# convert this column to i8 in UTC, and save the tz
2330
2327
values = values .asi8 .reshape (block .shape )
@@ -2340,11 +2337,10 @@ def set_atom_datetime64tz(self, block, info, values=None):
2340
2337
def get_atom_timedelta64 (self , block ):
2341
2338
return _tables ().Int64Col (shape = block .shape [0 ])
2342
2339
2343
- def set_atom_timedelta64 (self , block , values = None ):
2340
+ def set_atom_timedelta64 (self , block ):
2344
2341
self .kind = "timedelta64"
2345
2342
self .typ = self .get_atom_timedelta64 (block )
2346
- if values is None :
2347
- values = block .values .view ("i8" )
2343
+ values = block .values .view ("i8" )
2348
2344
self .set_data (values , "timedelta64" )
2349
2345
2350
2346
@property
@@ -2532,10 +2528,6 @@ def version(self) -> Tuple[int, int, int]:
2532
2528
def pandas_type (self ):
2533
2529
return _ensure_decoded (getattr (self .group ._v_attrs , "pandas_type" , None ))
2534
2530
2535
- @property
2536
- def format_type (self ) -> str :
2537
- return "fixed"
2538
-
2539
2531
def __repr__ (self ) -> str :
2540
2532
""" return a pretty representation of myself """
2541
2533
self .infer_axes ()
@@ -2633,7 +2625,13 @@ def infer_axes(self):
2633
2625
self .get_attrs ()
2634
2626
return True
2635
2627
2636
- def read (self , ** kwargs ):
2628
+ def read (
2629
+ self ,
2630
+ where = None ,
2631
+ columns = None ,
2632
+ start : Optional [int ] = None ,
2633
+ stop : Optional [int ] = None ,
2634
+ ):
2637
2635
raise NotImplementedError (
2638
2636
"cannot read on an abstract storer: subclasses should implement"
2639
2637
)
@@ -2797,9 +2795,7 @@ def write_index(self, key, index):
2797
2795
self .write_sparse_intindex (key , index )
2798
2796
else :
2799
2797
setattr (self .attrs , f"{ key } _variety" , "regular" )
2800
- converted = _convert_index (
2801
- "index" , index , self .encoding , self .errors , self .format_type
2802
- )
2798
+ converted = _convert_index ("index" , index , self .encoding , self .errors )
2803
2799
2804
2800
self .write_array (key , converted .values )
2805
2801
@@ -2848,9 +2844,7 @@ def write_multi_index(self, key, index):
2848
2844
"Saving a MultiIndex with an extension dtype is not supported."
2849
2845
)
2850
2846
level_key = f"{ key } _level{ i } "
2851
- conv_level = _convert_index (
2852
- level_key , lev , self .encoding , self .errors , self .format_type
2853
- )
2847
+ conv_level = _convert_index (level_key , lev , self .encoding , self .errors )
2854
2848
self .write_array (level_key , conv_level .values )
2855
2849
node = getattr (self .group , level_key )
2856
2850
node ._v_attrs .kind = conv_level .kind
@@ -3190,10 +3184,6 @@ def __init__(self, *args, **kwargs):
3190
3184
def table_type_short (self ) -> str :
3191
3185
return self .table_type .split ("_" )[0 ]
3192
3186
3193
- @property
3194
- def format_type (self ) -> str :
3195
- return "table"
3196
-
3197
3187
def __repr__ (self ) -> str :
3198
3188
""" return a pretty representation of myself """
3199
3189
self .infer_axes ()
@@ -3544,14 +3534,17 @@ def create_index(self, columns=None, optlevel=None, kind=None):
3544
3534
)
3545
3535
v .create_index (** kw )
3546
3536
3547
- def read_axes (self , where , ** kwargs ) -> bool :
3537
+ def read_axes (
3538
+ self , where , start : Optional [int ] = None , stop : Optional [int ] = None
3539
+ ) -> bool :
3548
3540
"""
3549
3541
Create the axes sniffed from the table.
3550
3542
3551
3543
Parameters
3552
3544
----------
3553
3545
where : ???
3554
- **kwargs
3546
+ start: int or None, default None
3547
+ stop: int or None, default None
3555
3548
3556
3549
Returns
3557
3550
-------
@@ -3567,21 +3560,19 @@ def read_axes(self, where, **kwargs) -> bool:
3567
3560
return False
3568
3561
3569
3562
# create the selection
3570
- selection = Selection (self , where = where , ** kwargs )
3563
+ selection = Selection (self , where = where , start = start , stop = stop )
3571
3564
values = selection .select ()
3572
3565
3573
3566
# convert the data
3574
3567
for a in self .axes :
3575
3568
a .set_info (self .info )
3576
- # `kwargs` may contain `start` and `stop` arguments if passed to
3577
- # `store.select()`. If set they determine the index size.
3578
3569
a .convert (
3579
3570
values ,
3580
3571
nan_rep = self .nan_rep ,
3581
3572
encoding = self .encoding ,
3582
3573
errors = self .errors ,
3583
- start = kwargs . get ( " start" ) ,
3584
- stop = kwargs . get ( " stop" ) ,
3574
+ start = start ,
3575
+ stop = stop ,
3585
3576
)
3586
3577
3587
3578
return True
@@ -3636,7 +3627,6 @@ def create_axes(
3636
3627
nan_rep = None ,
3637
3628
data_columns = None ,
3638
3629
min_itemsize = None ,
3639
- ** kwargs ,
3640
3630
):
3641
3631
""" create and return the axes
3642
3632
legacy tables create an indexable column, indexable index,
@@ -3706,9 +3696,7 @@ def create_axes(
3706
3696
3707
3697
if i in axes :
3708
3698
name = obj ._AXIS_NAMES [i ]
3709
- new_index = _convert_index (
3710
- name , a , self .encoding , self .errors , self .format_type
3711
- )
3699
+ new_index = _convert_index (name , a , self .encoding , self .errors )
3712
3700
new_index .axis = i
3713
3701
index_axes_map [i ] = new_index
3714
3702
@@ -3948,11 +3936,7 @@ def create_description(
3948
3936
return d
3949
3937
3950
3938
def read_coordinates (
3951
- self ,
3952
- where = None ,
3953
- start : Optional [int ] = None ,
3954
- stop : Optional [int ] = None ,
3955
- ** kwargs ,
3939
+ self , where = None , start : Optional [int ] = None , stop : Optional [int ] = None ,
3956
3940
):
3957
3941
"""select coordinates (row numbers) from a table; return the
3958
3942
coordinates object
@@ -4061,15 +4045,22 @@ def write(
4061
4045
chunksize = None ,
4062
4046
expectedrows = None ,
4063
4047
dropna = False ,
4064
- ** kwargs ,
4048
+ nan_rep = None ,
4049
+ data_columns = None ,
4050
+ errors = "strict" , # not used hre, but passed to super
4065
4051
):
4066
4052
4067
4053
if not append and self .is_exists :
4068
4054
self ._handle .remove_node (self .group , "table" )
4069
4055
4070
4056
# create the axes
4071
4057
self .create_axes (
4072
- axes = axes , obj = obj , validate = append , min_itemsize = min_itemsize , ** kwargs
4058
+ axes = axes ,
4059
+ obj = obj ,
4060
+ validate = append ,
4061
+ min_itemsize = min_itemsize ,
4062
+ nan_rep = nan_rep ,
4063
+ data_columns = data_columns ,
4073
4064
)
4074
4065
4075
4066
for a in self .axes :
@@ -4219,11 +4210,7 @@ def write_data_chunk(self, rows, indexes, mask, values):
4219
4210
self .table .flush ()
4220
4211
4221
4212
def delete (
4222
- self ,
4223
- where = None ,
4224
- start : Optional [int ] = None ,
4225
- stop : Optional [int ] = None ,
4226
- ** kwargs ,
4213
+ self , where = None , start : Optional [int ] = None , stop : Optional [int ] = None ,
4227
4214
):
4228
4215
4229
4216
# delete all rows (and return the nrows)
@@ -4303,9 +4290,15 @@ def get_object(self, obj):
4303
4290
obj = obj .T
4304
4291
return obj
4305
4292
4306
- def read (self , where = None , columns = None , ** kwargs ):
4293
+ def read (
4294
+ self ,
4295
+ where = None ,
4296
+ columns = None ,
4297
+ start : Optional [int ] = None ,
4298
+ stop : Optional [int ] = None ,
4299
+ ):
4307
4300
4308
- if not self .read_axes (where = where , ** kwargs ):
4301
+ if not self .read_axes (where = where , start = start , stop = stop ):
4309
4302
return None
4310
4303
4311
4304
info = (
@@ -4349,7 +4342,7 @@ def read(self, where=None, columns=None, **kwargs):
4349
4342
else :
4350
4343
df = concat (frames , axis = 1 )
4351
4344
4352
- selection = Selection (self , where = where , ** kwargs )
4345
+ selection = Selection (self , where = where , start = start , stop = stop )
4353
4346
# apply the selection filters & axis orderings
4354
4347
df = self .process_axes (df , selection = selection , columns = columns )
4355
4348
@@ -4573,7 +4566,7 @@ def _set_tz(values, tz, preserve_UTC: bool = False, coerce: bool = False):
4573
4566
return values
4574
4567
4575
4568
4576
- def _convert_index (name : str , index , encoding = None , errors = "strict" , format_type = None ):
4569
+ def _convert_index (name : str , index , encoding = None , errors = "strict" ):
4577
4570
assert isinstance (name , str )
4578
4571
4579
4572
index_name = getattr (index , "name" , None )
0 commit comments