Skip to content

Commit 57c5e64

Browse files
committed
COMPAT: fix some warnings with numpy 1.11 with pytables
closes pandas-dev#12792
1 parent be5ccea commit 57c5e64

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

pandas/io/pytables.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -1475,10 +1475,10 @@ def infer(self, handler):
14751475

14761476
def convert(self, values, nan_rep, encoding):
14771477
""" set the values from this selection: take = take ownership """
1478-
try:
1478+
1479+
# values is a recarray
1480+
if values.dtype.fields is not None:
14791481
values = values[self.cname]
1480-
except:
1481-
pass
14821482

14831483
values = _maybe_convert(values, self.kind, encoding)
14841484

@@ -2001,10 +2001,10 @@ def convert(self, values, nan_rep, encoding):
20012001
if we can)
20022002
"""
20032003

2004-
try:
2004+
# values is a recarray
2005+
if values.dtype.fields is not None:
20052006
values = values[self.cname]
2006-
except:
2007-
pass
2007+
20082008
self.set_data(values)
20092009

20102010
# use the meta if needed
@@ -4057,7 +4057,7 @@ def read(self, where=None, columns=None, **kwargs):
40574057
if len(frames) == 1:
40584058
df = frames[0]
40594059
else:
4060-
df = concat(frames, axis=1, verify_integrity=False).consolidate()
4060+
df = concat(frames, axis=1)
40614061

40624062
# apply the selection filters & axis orderings
40634063
df = self.process_axes(df, columns=columns)

pandas/io/tests/test_pytables.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -3001,8 +3001,8 @@ def test_sparse_with_compression(self):
30013001
# GH 2931
30023002

30033003
# make sparse dataframe
3004-
df = DataFrame(np.random.binomial(
3005-
n=1, p=.01, size=(1e3, 10))).to_sparse(fill_value=0)
3004+
arr = np.random.binomial(n=1, p=.01, size=(1000, 10))
3005+
df = DataFrame(arr).to_sparse(fill_value=0)
30063006

30073007
# case 1: store uncompressed
30083008
self._check_double_roundtrip(df, tm.assert_frame_equal,
@@ -3015,7 +3015,7 @@ def test_sparse_with_compression(self):
30153015
check_frame_type=True)
30163016

30173017
# set one series to be completely sparse
3018-
df[0] = np.zeros(1e3)
3018+
df[0] = np.zeros(1000)
30193019

30203020
# case 3: store df with completely sparse series uncompressed
30213021
self._check_double_roundtrip(df, tm.assert_frame_equal,

0 commit comments

Comments
 (0)