From 8b8f5522c0921bbd14f6ccc2511d6d733bc1a892 Mon Sep 17 00:00:00 2001 From: Jan Baykara Date: Thu, 19 Jul 2018 10:32:48 +0100 Subject: [PATCH] Replace deprecated pandas Series.as_matrix() with Series.values() I'm getting this error. Seems as though qpython requires a straight swap from pandas' `Series.as_matrix()` deprecated method to `Series.values()` (suggested in the [docs](https://pandas.pydata.org/pandas-docs/version/0.23/generated/pandas.Series.as_matrix.html)) ``` python3.6/site-packages/qpython/_pandas.py:61: FutureWarning: Method .as_matrix will be removed in a future version. Use .values instead. keys = keys if not isinstance(keys, pandas.Series) else keys.as_matrix() ``` --- qpython/_pandas.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qpython/_pandas.py b/qpython/_pandas.py index 7686125..62b735e 100644 --- a/qpython/_pandas.py +++ b/qpython/_pandas.py @@ -58,8 +58,8 @@ def _read_dictionary(self, qtype = QDICTIONARY): return table else: - keys = keys if not isinstance(keys, pandas.Series) else keys.as_matrix() - values = values if not isinstance(values, pandas.Series) else values.as_matrix() + keys = keys if not isinstance(keys, pandas.Series) else keys.values() + values = values if not isinstance(values, pandas.Series) else values.values() return QDictionary(keys, values) else: return QReader._read_dictionary(self, qtype = qtype) @@ -168,19 +168,19 @@ def _write_pandas_series(self, data, qtype = None): raise QWriterException('Unable to serialize pandas series %s' % data) if qtype == QGENERAL_LIST: - self._write_generic_list(data.as_matrix()) + self._write_generic_list(data.values()) elif qtype == QCHAR: - self._write_string(data.replace(numpy.nan, ' ').as_matrix().astype(numpy.string_).tostring()) + self._write_string(data.replace(numpy.nan, ' ').values().astype(numpy.string_).tostring()) elif data.dtype.type not in (numpy.datetime64, numpy.timedelta64): data = data.fillna(QNULLMAP[-abs(qtype)][1]) - data = data.as_matrix() + data = data.values() if PY_TYPE[qtype] != data.dtype: data = data.astype(PY_TYPE[qtype]) self._write_list(data, qtype = qtype) else: - data = data.as_matrix() + data = data.values() data = data.astype(TEMPORAL_Q_TYPE[qtype]) self._write_list(data, qtype = qtype)