Skip to content

Commit

Permalink
Fix order of parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
thoo committed Nov 10, 2018
1 parent d84ffb2 commit 681d919
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
11 changes: 5 additions & 6 deletions pandas/core/frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -2036,9 +2036,8 @@ def to_parquet(self, fname, engine='auto', compression='snappy',
returns=fmt.return_docstring)
def to_string(self, buf=None, columns=None, col_space=None, header=True,
index=True, na_rep='NaN', formatters=None, float_format=None,
sparsify=None, index_names=True, justify=None,
line_width=None, max_rows=None, max_cols=None,
show_dimensions=False):
sparsify=None, index_names=True, justify=None, max_rows=None,
max_cols=None, show_dimensions=False, line_width=None):
"""
Render a DataFrame to a console-friendly tabular output.
Expand Down Expand Up @@ -2085,9 +2084,9 @@ def to_string(self, buf=None, columns=None, col_space=None, header=True,
returns=fmt.return_docstring)
def to_html(self, buf=None, columns=None, col_space=None, header=True,
index=True, na_rep='NaN', formatters=None, float_format=None,
sparsify=None, index_names=True, justify=None, bold_rows=True,
classes=None, escape=True, max_rows=None, max_cols=None,
show_dimensions=False, notebook=False, decimal='.',
sparsify=None, index_names=True, justify=None, max_rows=None,
max_cols=None, show_dimensions=False, bold_rows=True,
classes=None, escape=True, notebook=False, decimal='.',
border=None, table_id=None):
"""
Render a DataFrame as an HTML table.
Expand Down
2 changes: 1 addition & 1 deletion pandas/core/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -9651,7 +9651,7 @@ def _add_series_or_dataframe_operations(cls):

@Appender(rwindow.rolling.__doc__)
def rolling(self, window, min_periods=None, center=False,
win_type=None, on=None, axis=0, closed=None):
win_type=None, on=None, closed=None, axis=0):
axis = self._get_axis_number(axis)
return rwindow.rolling(self, window=window,
min_periods=min_periods,
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/reshape/pivot.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@ def pivot(data, index=None, columns=None, values=None):
return indexed.unstack(columns)


def crosstab(index, columns, values=None, rownames=None, colnames=None,
aggfunc=None, margins=False, margins_name='All', dropna=True,
def crosstab(index, columns, values=None, aggfunc=None, rownames=None,
colnames=None, margins=False, margins_name='All', dropna=True,
normalize=False):
"""
Compute a simple cross-tabulation of two (or more) factors. By default
Expand Down
2 changes: 1 addition & 1 deletion pandas/io/json/normalize.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ def nested_to_record(ds, prefix="", sep=".", level=0):


def json_normalize(data, record_path=None, meta=None,
meta_prefix=None,
record_prefix=None,
meta_prefix=None,
errors='raise',
sep='.'):
"""
Expand Down
4 changes: 2 additions & 2 deletions pandas/tseries/offsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,6 @@ class CustomBusinessDay(_CustomMixin, BusinessDay):
Parameters
----------
n : int, default 1
offset : timedelta, default timedelta(0)
normalize : bool, default False
Normalize start/end dates to midnight before generating date range
weekmask : str, Default 'Mon Tue Wed Thu Fri'
Expand All @@ -816,6 +815,7 @@ class CustomBusinessDay(_CustomMixin, BusinessDay):
list/array of dates to exclude from the set of valid business days,
passed to ``numpy.busdaycalendar``
calendar : pd.HolidayCalendar or np.busdaycalendar
offset : timedelta, default timedelta(0)
"""
_prefix = 'C'
_attributes = frozenset(['n', 'normalize',
Expand Down Expand Up @@ -958,7 +958,6 @@ class _CustomBusinessMonth(_CustomMixin, BusinessMixin, MonthOffset):
Parameters
----------
n : int, default 1
offset : timedelta, default timedelta(0)
normalize : bool, default False
Normalize start/end dates to midnight before generating date range
weekmask : str, Default 'Mon Tue Wed Thu Fri'
Expand All @@ -967,6 +966,7 @@ class _CustomBusinessMonth(_CustomMixin, BusinessMixin, MonthOffset):
list/array of dates to exclude from the set of valid business days,
passed to ``numpy.busdaycalendar``
calendar : pd.HolidayCalendar or np.busdaycalendar
offset : timedelta, default timedelta(0)
"""
_attributes = frozenset(['n', 'normalize',
'weekmask', 'holidays', 'calendar', 'offset'])
Expand Down
2 changes: 1 addition & 1 deletion pandas/util/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -1201,8 +1201,8 @@ def assert_series_equal(left, right, check_dtype=True,
check_index_type='equiv',
check_series_type=True,
check_less_precise=False,
check_names=True,
check_exact=False,
check_names=True,
check_datetimelike_compat=False,
check_categorical=True,
obj='Series'):
Expand Down

0 comments on commit 681d919

Please sign in to comment.