Skip to content

Commit 9b0ccea

Browse files
committed
PY2 div / int compat
1 parent 2e30a9c commit 9b0ccea

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

pandas/tests/extension/integer/test_integer.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import pytest
55

66
from pandas.tests.extension import base
7+
from pandas.api.types import is_integer
78

89
from pandas.core.arrays import (
910
to_integer_array,
@@ -144,7 +145,7 @@ def compare(self, s, op, other):
144145
expected = getattr(rs, op)(other)
145146

146147
# truediv can make infs
147-
if 'truediv' in op:
148+
if op in ['__truediv__', '__rtruediv__', '__rdiv__', '__div__']:
148149
fill_value = np.nan
149150
else:
150151
fill_value = 0
@@ -359,6 +360,10 @@ def test_conversions(data_missing):
359360
for r, e in zip(result, expected):
360361
if pd.isnull(r):
361362
assert pd.isnull(e)
363+
elif is_integer(r):
364+
# PY2 can be int or long
365+
assert r == e
366+
assert is_integer(e)
362367
else:
363368
assert r == e
364369
assert type(r) == type(e)

0 commit comments

Comments
 (0)