Skip to content

Commit

Permalink
CLN: remove never-used kwargs, make kwargs explicit (pandas-dev#29873)
Browse files Browse the repository at this point in the history
  • Loading branch information
jbrockmendel authored and proost committed Dec 19, 2019
1 parent f03d78c commit 5678567
Showing 1 changed file with 47 additions and 54 deletions.
101 changes: 47 additions & 54 deletions pandas/io/pytables.py
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,6 @@ def select_as_coordinates(
where=None,
start: Optional[int] = None,
stop: Optional[int] = None,
**kwargs,
):
"""
return the selection as an Index
Expand All @@ -795,7 +794,7 @@ def select_as_coordinates(
tbl = self.get_storer(key)
if not isinstance(tbl, Table):
raise TypeError("can only read_coordinates with a table")
return tbl.read_coordinates(where=where, start=start, stop=stop, **kwargs)
return tbl.read_coordinates(where=where, start=start, stop=stop)

def select_column(self, key: str, column: str, **kwargs):
"""
Expand Down Expand Up @@ -2286,7 +2285,7 @@ def set_atom_data(self, block):
self.typ = self.get_atom_data(block)
self.set_data(block.values.astype(self.typ.type, copy=False))

def set_atom_categorical(self, block, items, info=None, values=None):
def set_atom_categorical(self, block, items, info=None):
# currently only supports a 1-D categorical
# in a 1-D block

Expand Down Expand Up @@ -2314,17 +2313,15 @@ def set_atom_categorical(self, block, items, info=None, values=None):
def get_atom_datetime64(self, block):
return _tables().Int64Col(shape=block.shape[0])

def set_atom_datetime64(self, block, values=None):
def set_atom_datetime64(self, block):
self.kind = "datetime64"
self.typ = self.get_atom_datetime64(block)
if values is None:
values = block.values.view("i8")
values = block.values.view("i8")
self.set_data(values, "datetime64")

def set_atom_datetime64tz(self, block, info, values=None):
def set_atom_datetime64tz(self, block, info):

if values is None:
values = block.values
values = block.values

# convert this column to i8 in UTC, and save the tz
values = values.asi8.reshape(block.shape)
Expand All @@ -2340,11 +2337,10 @@ def set_atom_datetime64tz(self, block, info, values=None):
def get_atom_timedelta64(self, block):
return _tables().Int64Col(shape=block.shape[0])

def set_atom_timedelta64(self, block, values=None):
def set_atom_timedelta64(self, block):
self.kind = "timedelta64"
self.typ = self.get_atom_timedelta64(block)
if values is None:
values = block.values.view("i8")
values = block.values.view("i8")
self.set_data(values, "timedelta64")

@property
Expand Down Expand Up @@ -2532,10 +2528,6 @@ def version(self) -> Tuple[int, int, int]:
def pandas_type(self):
return _ensure_decoded(getattr(self.group._v_attrs, "pandas_type", None))

@property
def format_type(self) -> str:
return "fixed"

def __repr__(self) -> str:
""" return a pretty representation of myself """
self.infer_axes()
Expand Down Expand Up @@ -2633,7 +2625,13 @@ def infer_axes(self):
self.get_attrs()
return True

def read(self, **kwargs):
def read(
self,
where=None,
columns=None,
start: Optional[int] = None,
stop: Optional[int] = None,
):
raise NotImplementedError(
"cannot read on an abstract storer: subclasses should implement"
)
Expand Down Expand Up @@ -2797,9 +2795,7 @@ def write_index(self, key, index):
self.write_sparse_intindex(key, index)
else:
setattr(self.attrs, f"{key}_variety", "regular")
converted = _convert_index(
"index", index, self.encoding, self.errors, self.format_type
)
converted = _convert_index("index", index, self.encoding, self.errors)

self.write_array(key, converted.values)

Expand Down Expand Up @@ -2848,9 +2844,7 @@ def write_multi_index(self, key, index):
"Saving a MultiIndex with an extension dtype is not supported."
)
level_key = f"{key}_level{i}"
conv_level = _convert_index(
level_key, lev, self.encoding, self.errors, self.format_type
)
conv_level = _convert_index(level_key, lev, self.encoding, self.errors)
self.write_array(level_key, conv_level.values)
node = getattr(self.group, level_key)
node._v_attrs.kind = conv_level.kind
Expand Down Expand Up @@ -3190,10 +3184,6 @@ def __init__(self, *args, **kwargs):
def table_type_short(self) -> str:
return self.table_type.split("_")[0]

@property
def format_type(self) -> str:
return "table"

def __repr__(self) -> str:
""" return a pretty representation of myself """
self.infer_axes()
Expand Down Expand Up @@ -3544,14 +3534,17 @@ def create_index(self, columns=None, optlevel=None, kind=None):
)
v.create_index(**kw)

def read_axes(self, where, **kwargs) -> bool:
def read_axes(
self, where, start: Optional[int] = None, stop: Optional[int] = None
) -> bool:
"""
Create the axes sniffed from the table.
Parameters
----------
where : ???
**kwargs
start: int or None, default None
stop: int or None, default None
Returns
-------
Expand All @@ -3567,21 +3560,19 @@ def read_axes(self, where, **kwargs) -> bool:
return False

# create the selection
selection = Selection(self, where=where, **kwargs)
selection = Selection(self, where=where, start=start, stop=stop)
values = selection.select()

# convert the data
for a in self.axes:
a.set_info(self.info)
# `kwargs` may contain `start` and `stop` arguments if passed to
# `store.select()`. If set they determine the index size.
a.convert(
values,
nan_rep=self.nan_rep,
encoding=self.encoding,
errors=self.errors,
start=kwargs.get("start"),
stop=kwargs.get("stop"),
start=start,
stop=stop,
)

return True
Expand Down Expand Up @@ -3636,7 +3627,6 @@ def create_axes(
nan_rep=None,
data_columns=None,
min_itemsize=None,
**kwargs,
):
""" create and return the axes
legacy tables create an indexable column, indexable index,
Expand Down Expand Up @@ -3706,9 +3696,7 @@ def create_axes(

if i in axes:
name = obj._AXIS_NAMES[i]
new_index = _convert_index(
name, a, self.encoding, self.errors, self.format_type
)
new_index = _convert_index(name, a, self.encoding, self.errors)
new_index.axis = i
index_axes_map[i] = new_index

Expand Down Expand Up @@ -3948,11 +3936,7 @@ def create_description(
return d

def read_coordinates(
self,
where=None,
start: Optional[int] = None,
stop: Optional[int] = None,
**kwargs,
self, where=None, start: Optional[int] = None, stop: Optional[int] = None,
):
"""select coordinates (row numbers) from a table; return the
coordinates object
Expand Down Expand Up @@ -4061,15 +4045,22 @@ def write(
chunksize=None,
expectedrows=None,
dropna=False,
**kwargs,
nan_rep=None,
data_columns=None,
errors="strict", # not used hre, but passed to super
):

if not append and self.is_exists:
self._handle.remove_node(self.group, "table")

# create the axes
self.create_axes(
axes=axes, obj=obj, validate=append, min_itemsize=min_itemsize, **kwargs
axes=axes,
obj=obj,
validate=append,
min_itemsize=min_itemsize,
nan_rep=nan_rep,
data_columns=data_columns,
)

for a in self.axes:
Expand Down Expand Up @@ -4219,11 +4210,7 @@ def write_data_chunk(self, rows, indexes, mask, values):
self.table.flush()

def delete(
self,
where=None,
start: Optional[int] = None,
stop: Optional[int] = None,
**kwargs,
self, where=None, start: Optional[int] = None, stop: Optional[int] = None,
):

# delete all rows (and return the nrows)
Expand Down Expand Up @@ -4303,9 +4290,15 @@ def get_object(self, obj):
obj = obj.T
return obj

def read(self, where=None, columns=None, **kwargs):
def read(
self,
where=None,
columns=None,
start: Optional[int] = None,
stop: Optional[int] = None,
):

if not self.read_axes(where=where, **kwargs):
if not self.read_axes(where=where, start=start, stop=stop):
return None

info = (
Expand Down Expand Up @@ -4349,7 +4342,7 @@ def read(self, where=None, columns=None, **kwargs):
else:
df = concat(frames, axis=1)

selection = Selection(self, where=where, **kwargs)
selection = Selection(self, where=where, start=start, stop=stop)
# apply the selection filters & axis orderings
df = self.process_axes(df, selection=selection, columns=columns)

Expand Down Expand Up @@ -4573,7 +4566,7 @@ def _set_tz(values, tz, preserve_UTC: bool = False, coerce: bool = False):
return values


def _convert_index(name: str, index, encoding=None, errors="strict", format_type=None):
def _convert_index(name: str, index, encoding=None, errors="strict"):
assert isinstance(name, str)

index_name = getattr(index, "name", None)
Expand Down

0 comments on commit 5678567

Please sign in to comment.