This is an automated email from the ASF dual-hosted git repository.
robertnishihara pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new fbfd1ff ARROW-4269: [Python] Fix serialization in pandas 0.22
fbfd1ff is described below
commit fbfd1ff8e656f02105a22e3bbf89745234f84b36
Author: Philipp Moritz <[email protected]>
AuthorDate: Tue Jan 15 17:17:58 2019 -0800
ARROW-4269: [Python] Fix serialization in pandas 0.22
Author: Philipp Moritz <[email protected]>
Closes #3410 from pcmoritz/fix-pandas-0.22 and squashes the following
commits:
54f13bb3 <Philipp Moritz> update
dc6ffbde <Philipp Moritz> update
67133d0d <Philipp Moritz> make change consistent
b6cba56a <Philipp Moritz> fix serialization in pandas 0.22
---
python/pyarrow/serialization.py | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/python/pyarrow/serialization.py b/python/pyarrow/serialization.py
index 6bbe1c7..9b261c1 100644
--- a/python/pyarrow/serialization.py
+++ b/python/pyarrow/serialization.py
@@ -174,26 +174,27 @@ def _register_custom_pandas_handlers(context):
custom_serializer=_pickle_to_buffer,
custom_deserializer=_load_pickle_from_buffer)
- if hasattr(pd.core.arrays, 'interval'):
- context.register_type(
- pd.core.arrays.interval.IntervalArray,
- 'pd.core.arrays.interval.IntervalArray',
- custom_serializer=_pickle_to_buffer,
- custom_deserializer=_load_pickle_from_buffer)
-
- if hasattr(pd.core.arrays, 'period'):
- context.register_type(
- pd.core.arrays.period.PeriodArray,
- 'pd.core.arrays.period.PeriodArray',
- custom_serializer=_pickle_to_buffer,
- custom_deserializer=_load_pickle_from_buffer)
-
- if hasattr(pd.core.arrays, 'datetimes'):
- context.register_type(
- pd.core.arrays.datetimes.DatetimeArray,
- 'pd.core.arrays.datetimes.DatetimeArray',
- custom_serializer=_pickle_to_buffer,
- custom_deserializer=_load_pickle_from_buffer)
+ if hasattr(pd.core, 'arrays'):
+ if hasattr(pd.core.arrays, 'interval'):
+ context.register_type(
+ pd.core.arrays.interval.IntervalArray,
+ 'pd.core.arrays.interval.IntervalArray',
+ custom_serializer=_pickle_to_buffer,
+ custom_deserializer=_load_pickle_from_buffer)
+
+ if hasattr(pd.core.arrays, 'period'):
+ context.register_type(
+ pd.core.arrays.period.PeriodArray,
+ 'pd.core.arrays.period.PeriodArray',
+ custom_serializer=_pickle_to_buffer,
+ custom_deserializer=_load_pickle_from_buffer)
+
+ if hasattr(pd.core.arrays, 'datetimes'):
+ context.register_type(
+ pd.core.arrays.datetimes.DatetimeArray,
+ 'pd.core.arrays.datetimes.DatetimeArray',
+ custom_serializer=_pickle_to_buffer,
+ custom_deserializer=_load_pickle_from_buffer)
context.register_type(
pd.DataFrame, 'pd.DataFrame',
