Skip to content

Commit 2d03fe6

Browse files
authored
Merge branch 'main' into timedelta-null
2 parents f5c69e9 + e78ebd3 commit 2d03fe6

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

doc/source/user_guide/dsintro.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ index will be pulled out.
8787

8888
**From scalar value**
8989

90-
If ``data`` is a scalar value, an index must be
91-
provided. The value will be repeated to match the length of **index**.
90+
If ``data`` is a scalar value, the value will be repeated to match
91+
the length of **index**. If the **index** is not provided, it defaults
92+
to ``RangeIndex(1)``.
9293

9394
.. ipython:: python
9495

pandas/_libs/src/vendored/ujson/python/JSONtoObj.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ Numeric decoder derived from TCL library
3838

3939
// Licence at LICENSES/ULTRAJSON_LICENSE
4040

41-
#include "pandas/vendored/ujson/lib/ultrajson.h"
41+
// clang-format off
4242
#define PY_SSIZE_T_CLEAN
4343
#include <Python.h>
44+
#include "pandas/vendored/ujson/lib/ultrajson.h"
45+
// clang-format on
4446

4547
static int Object_objectAddKey(void *Py_UNUSED(prv), JSOBJ obj, JSOBJ name,
4648
JSOBJ value) {

0 commit comments

Comments
 (0)