Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions python/pyarrow/scalar.pxi
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,19 @@ cdef class Date32Scalar(Scalar):
else:
return None

def __repr__(self):
try:
return Scalar.__repr__(self)
except OverflowError:
value = frombytes(self.wrapped.get().ToString())
return f'<pyarrow.{self.__class__.__name__}: {value}>'

def __str__(self):
try:
return Scalar.__str__(self)
except OverflowError:
return frombytes(self.wrapped.get().ToString())


cdef class Date64Scalar(Scalar):
"""
Expand Down Expand Up @@ -702,6 +715,19 @@ cdef class Date64Scalar(Scalar):
else:
return None

def __repr__(self):
try:
return Scalar.__repr__(self)
except OverflowError:
value = frombytes(self.wrapped.get().ToString())
return f'<pyarrow.{self.__class__.__name__}: {value}>'

def __str__(self):
try:
return Scalar.__str__(self)
except OverflowError:
return frombytes(self.wrapped.get().ToString())


def _datetime_from_int(int64_t value, TimeUnit unit, tzinfo=None):
if unit == TimeUnit_SECOND:
Expand Down
28 changes: 28 additions & 0 deletions python/pyarrow/tests/test_scalars.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,34 @@ def test_basics_np_required(pickle_module):
assert wr() is None


@pytest.mark.parametrize(('value', 'ty'), [
(-(2 ** 31), pa.date32()),
(2 ** 31 - 1, pa.date32()),
(-(2 ** 63), pa.date64()),
(2 ** 63 - 1, pa.date64()),
])
def test_date_scalar_repr_outside_python_range(value, ty):
scalar = pa.scalar(value, type=ty)
out_of_range = f'<value out of range: {value}>'

assert str(scalar) == out_of_range
assert repr(scalar) == (
f'<pyarrow.{scalar.__class__.__name__}: {out_of_range}>'
)


@pytest.mark.parametrize('ty', [pa.date32(), pa.date64()])
def test_date_scalar_repr_in_python_range(ty):
scalar = pa.scalar(datetime.date(2020, 2, 29), type=ty)

assert str(scalar) == '2020-02-29'
assert repr(scalar) == (
'<pyarrow.{}: datetime.date(2020, 2, 29)>'.format(
scalar.__class__.__name__
)
)


def test_invalid_scalar():
s = pc.cast(pa.scalar(b"\xff"), pa.string(), safe=False)
s.validate()
Expand Down