Skip to content

Commit 5e806bf

Browse files
committed
DOC: doc build fixes
1 parent 165a94c commit 5e806bf

File tree

3 files changed

+31
-28
lines changed

3 files changed

+31
-28
lines changed

doc/source/timeseries.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ strongly recommended that you switch to using the new offset aliases.
678678
"A\@DEC", "BA\-DEC"
679679
"min", "T"
680680
"ms", "L"
681-
"us": "U"
681+
"us", "U"
682682

683683
As you can see, legacy quarterly and annual frequencies are business quarter
684684
and business year ends. Please also note the legacy time rule for milliseconds

pandas/core/series.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2731,9 +2731,9 @@ def take(self, indices, axis=0, convert=True):
27312731

27322732
def isin(self, values):
27332733
"""
2734-
Return a boolean :ref:`~pandas.Series` showing whether each element in
2735-
the ref:`~pandas.Series` is exactly contained in the passed sequence of
2736-
``values``.
2734+
Return a boolean :class:`~pandas.Series` showing whether each element
2735+
in the :class:`~pandas.Series` is exactly contained in the passed
2736+
sequence of ``values``.
27372737
27382738
Parameters
27392739
----------

pandas/io/json.py

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -101,34 +101,37 @@ def read_json(path_or_buf=None, orient=None, typ='frame', dtype=True,
101101
convert_axes=True, convert_dates=True, keep_default_dates=True,
102102
numpy=False, precise_float=False, date_unit=None):
103103
"""
104-
Convert JSON string to pandas object
104+
Convert a JSON string to pandas object
105105
106106
Parameters
107107
----------
108-
filepath_or_buffer : a VALID JSON string or file handle / StringIO. The
109-
string could be a URL. Valid URL schemes include http, ftp, s3, and
108+
filepath_or_buffer : a valid JSON string or file-like
109+
The string could be a URL. Valid URL schemes include http, ftp, s3, and
110110
file. For file URLs, a host is expected. For instance, a local file
111-
could be file ://localhost/path/to/table.json
112-
orient :
113-
Series :
114-
default is 'index'
115-
allowed values are: {'split','records','index'}
116-
The Series index must be unique for orient 'index'.
117-
118-
DataFrame :
119-
default is 'columns'
120-
allowed values are: {'split','records','index','columns','values'}
121-
The DataFrame index must be unique for orients 'index' and 'columns'.
122-
The DataFrame columns must be unique for orients 'index', 'columns',
123-
and 'records'.
124-
125-
The format of the JSON string
126-
split : dict like
127-
{index -> [index], columns -> [columns], data -> [values]}
128-
records : list like [{column -> value}, ... , {column -> value}]
129-
index : dict like {index -> {column -> value}}
130-
columns : dict like {column -> {index -> value}}
131-
values : just the values array
111+
could be ``file://localhost/path/to/table.json``
112+
113+
orient
114+
115+
* `Series`
116+
117+
- default is ``'index'``
118+
- allowed values are: ``{'split','records','index'}``
119+
- The Series index must be unique for orient ``'index'``.
120+
121+
* `DataFrame`
122+
123+
- default is ``'columns'``
124+
- allowed values are: {'split','records','index','columns','values'}
125+
- The DataFrame index must be unique for orients 'index' and 'columns'.
126+
- The DataFrame columns must be unique for orients 'index', 'columns', and 'records'.
127+
128+
* The format of the JSON string
129+
130+
- split : dict like ``{index -> [index], columns -> [columns], data -> [values]}``
131+
- records : list like ``[{column -> value}, ... , {column -> value}]``
132+
- index : dict like ``{index -> {column -> value}}``
133+
- columns : dict like ``{column -> {index -> value}}``
134+
- values : just the values array
132135
133136
typ : type of object to recover (series or frame), default 'frame'
134137
dtype : boolean or dict, default True

0 commit comments

Comments
 (0)